333

a2a408b6 · 张超军 · 3f64db40 · 3eb90fd9 · a2a408b6 · a2a408b6
Commit a2a408b6 authored Nov 08, 2021 by 张超军
8 changed files
--- a/public/image-edit/css/service-basic.css
+++ b/public/image-edit/css/service-basic.css
-.border{border:1px solid black;}.body-container{width:520px;height:520px;}.tui-image-editor-controls{min-height:250px;}.menu{padding:0;margin-bottom:5px;text-align:center;color:#544b61;font-weight:400;list-style-type:none;user-select:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;}.logo{margin:0 auto;width:300px;vertical-align:middle;}.header .name{padding:10px;line-height:50px;font-size:30px;font-weight:100;vertical-align:middle;}.header .menu{display:inline-block;}.menu-item{padding:10px;display:inline-block;cursor:pointer;vertical-align:middle;}.menu-item a{text-decoration:none;}.menu-item.no-pointer{cursor:default;}.menu-item.active,.menu-item:hover{background-color:#f3f3f3;}.menu-item.disabled{cursor:default;color:#bfbebe;}.align-left-top{text-align:left;vertical-align:top;}.range-narrow{width:80px;}.sub-menu-container{font-size:14px;margin-bottom:1em;display:none;}.tui-image-editor{height: 520px;;width: 520px;}.tui-image-editor-canvas-container{top:0;height:520px;width:520px;max-height:520px !important;overflow:hidden;}.tui-colorpicker-container{margin:5px auto 0;}.tui-colorpicker-palette-toggle-slider{display:none;}.input-wrapper{position:relative;}.input-wrapper input{cursor:pointer;position:absolute;font-size:999px;left:0;top:0;opacity:0;width:100%;height:100%;overflow:hidden;}.btn-text-style{padding:5px;margin:3px 1px;border:1px dashed #bfbebe;outline:0;background-color:#eee;cursor:pointer;}.icon-text{font-size:20px;}.select-line-type{outline:0;vertical-align:middle;}#tui-color-picker{display:inline-block;vertical-align:middle;}#tui-text-palette{display:none;position:absolute;padding:10px;border:1px solid #bfbebe;background-color:#fff;z-index:9999;}
+.border {
+  border: 1px solid black;
+}
+.body-container {
+  width: 520px;
+  height: 520px;
+}
+.tui-image-editor-controls {
+  min-height: 250px;
+}
+.menu {
+  padding: 0;
+  margin-bottom: 5px;
+  text-align: center;
+  color: #544b61;
+  font-weight: 400;
+  list-style-type: none;
+  user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+}
+.logo {
+  margin: 0 auto;
+  width: 300px;
+  vertical-align: middle;
+}
+.header .name {
+  padding: 10px;
+  line-height: 50px;
+  font-size: 30px;
+  font-weight: 100;
+  vertical-align: middle;
+}
+.header .menu {
+  display: inline-block;
+}
+.menu-item {
+  padding: 10px;
+  display: inline-block;
+  cursor: pointer;
+  vertical-align: middle;
+}
+.menu-item a {
+  text-decoration: none;
+}
+.menu-item.no-pointer {
+  cursor: default;
+}
+.menu-item.active,
+.menu-item:hover {
+  background-color: #f3f3f3;
+}
+.menu-item.disabled {
+  cursor: default;
+  color: #bfbebe;
+}
+.align-left-top {
+  text-align: left;
+  vertical-align: top;
+}
+.range-narrow {
+  width: 80px;
+}
+.sub-menu-container {
+  font-size: 14px;
+  margin-bottom: 1em;
+  display: none;
+}
+.tui-image-editor {
+  height: 520px;
+  width: 520px;
+}
+.tui-image-editor-canvas-container {
+  top: 0;
+  height: 520px;
+  width: 520px;
+  max-height: 520px !important;
+  overflow: hidden;
+}
+.tui-colorpicker-container {
+  margin: 5px auto 0;
+}
+.tui-colorpicker-palette-toggle-slider {
+  display: none;
+}
+.input-wrapper {
+  position: relative;
+}
+.input-wrapper input {
+  cursor: pointer;
+  position: absolute;
+  font-size: 999px;
+  left: 0;
+  top: 0;
+  opacity: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+.btn-text-style {
+  padding: 5px;
+  margin: 3px 1px;
+  border: 1px dashed #bfbebe;
+  outline: 0;
+  background-color: #eee;
+  cursor: pointer;
+}
+.icon-text {
+  font-size: 20px;
+}
+.select-line-type {
+  outline: 0;
+  vertical-align: middle;
+}
+#tui-color-picker {
+  display: inline-block;
+  vertical-align: middle;
+}
+#tui-text-palette {
+  display: none;
+  position: absolute;
+  padding: 10px;
+  border: 1px solid #bfbebe;
+  background-color: #fff;
+  z-index: 9999;
+}
--- a/public/image-edit/js/fabric-v4.2.0.js
+++ b/public/image-edit/js/fabric-v4.2.0.js
@@ -11128,7 +11128,7 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
     * @type String
     * @default
     */
-    hoverCursor:            'move',
+    hoverCursor:            'default',

    /**
     * Default cursor value used when moving an object on canvas
@@ -11336,9 +11336,6 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
        this.clearContext(this.contextTop);
        this.contextTopDirty = false;
      }
-      if (this.hasLostContext) {
-        this.renderTopLayer(this.contextTop);
-      }
      var canvasToDrawOn = this.contextContainer;
      this.renderCanvas(canvasToDrawOn, this._chooseObjectsToRender());
      return this;
@@ -11365,11 +11362,12 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
     * @chainable
     */
    renderTop: function () {
+      //选中框
      var ctx = this.contextTop;
      this.clearContext(ctx);
-      this.renderTopLayer(ctx);
-      this.fire('after:render');
-      return this;
+      // this.renderTopLayer(ctx);
+      // this.fire('after:render');
+      // return this;
    },

    /**
@@ -11634,6 +11632,7 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
        return;
      }
      ctx.lineWidth = this.selectionLineWidth;
+      console.log(this.selectionBorderColor,3333333333,this.selectionLineWidth)
      ctx.strokeStyle = this.selectionBorderColor;

      // selection border
@@ -13342,7 +13341,6 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
     * @param {Event} e mouse event
     */
    _groupSelectedObjects: function (e) {
-
      var group = this._collectObjects(e),
          aGroup;

@@ -14142,7 +14140,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
     * @type Boolean
     * @default
     */
-    selectable:               true,
+    selectable:               false,

    /**
     * When set to `false`, an object can not be a target of events. All events propagate through it. Introduced in v1.3.4
@@ -19961,7 +19959,6 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
        this.setPositionByOrigin({ x: left, y: top }, 'left', 'top');
      }
    },
-
    /* _TO_SVG_START_ */
    /**
     * Returns svg representation of an instance
@@ -20076,7 +20073,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     * @return {Object} thisArg
     */
    initialize: function(objects, options) {
-      options = options || {};
+      options = options || {}; 
      this._objects = objects || [];
      for (var i = this._objects.length; i--; ) {
        this._objects[i].group = this;

--- a/public/index.html
+++ b/public/index.html
 <!--
 * @Author: your name
 * @Date: 2021-09-07 09:58:13
- * @LastEditTime: 2021-11-05 21:05:18
+ * @LastEditTime: 2021-11-08 20:01:13
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\public\index.html
@@ -26,9 +26,20 @@
  body {
    height: 200px;
  }
+  * {
+    padding: 0;
+    margin: 0 auto;
+    -moz-user-select: none;
+    -o-user-select: none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    cursor: default;
+}
 </style>

-<body>
+<body οndragstart="return false">
  <noscript>
    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
        Please enable it to continue.</strong>

--- a/src/App.vue
+++ b/src/App.vue
 <!--
 * @Author: your name
 * @Date: 2021-09-07 09:58:13
- * @LastEditTime: 2021-11-01 15:54:45
+ * @LastEditTime: 2021-11-06 15:23:43
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\src\App.vue
@@ -21,6 +21,7 @@ export default {
  },
  mounted () {
    console.log(this.$route);
+    
    // zoom('app')
    // window.addEventListener('resize', function () {
    //   zoom('app')

--- a/src/components/ImageEd.vue
+++ b/src/components/ImageEd.vue
 <!--
 * @Author: your name
 * @Date: 2021-09-09 09:28:46
- * @LastEditTime: 2021-11-06 16:19:57
+ * @LastEditTime: 2021-11-08 20:01:12
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
@@ -1830,8 +1830,14 @@ export default {
     * @description: 橡皮擦
     * @param {*}
     * @return {*}
-     */
-    xpcChange () {
+     */    
+    xpcChange() {
+      console.log(this.imageEditor._graphics)
+      // const canvas = new fabric.Canvas('c');
+      // console.log(canvas)
+      // canvas.freeDrawingBrush = new fabric.EraserBrush(canvas);
+      // canvas.freeDrawingBrush.width = 10;
+      // canvas.isDrawingMode = true;
    },
    /**
     * @description: 缩略图

--- a/src/views/Editor/modules/imageEdAJ.vue
+++ b/src/views/Editor/modules/imageEdAJ.vue
 <!--
 * @Author: your name
 * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2021-11-08 19:43:48
+ * @LastEditTime: 2021-11-08 20:01:25
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -1198,7 +1198,7 @@ export default {
      self.isTpdr_flag = true

      file = event.target.files[0];
-      console.log(file);
+      console.log(file,222222222);
      imageEditor.loadImageFromFile(file).then(function (result) {
        console.log(result);
        self.newHeight = result.newHeight

--- a/vue.config.js
+++ b/vue.config.js
 /*
 * @Author: your name
 * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-11-06 16:41:48
+ * @LastEditTime: 2021-11-08 20:01:14
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\vue.config.js

--- a/yarn.lock
+++ b/yarn.lock