centaline-data-driven 1.4.63 → 1.4.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.63",
+  "version": "1.4.65",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/dynamicEditPictures/src/dynamicEditPictures.vue

@@ -161,7 +161,8 @@
           height: true,
           infoTrue: true, // true 为展示真实输出图片宽高 false 展示看到的截图框宽高
           enlarge: 1, // 图片根据截图框输出比例倍数
-          //mode: 'cover', // 图片默认渲染方式
+          mode: 'cover', // 图片默认渲染方式
+          maxImgSize: 6000 // 限制图片最大宽度和高度
         },
       }
     },
@@ -175,9 +176,6 @@
       width = width > 1160 ? 1160 : width;
       this.bodywidth = width;
       this.bodyheight = parseInt(window.document.body.clientHeight * 0.8);
-      if (typeof this.minWidth !== 'undefined' && typeof this.minWidth !== 'undefined') {
-        this.cropBoxResizable = true;
-      }
       if (typeof this.file.originalSavedFileName !== 'undefined' && this.file.originalSavedFileName !== this.file.savedFileName) {
         this.flagOriginal = true;
       }
@@ -226,8 +224,19 @@
           this.canvas.addEventListener("pointermove", _this.draw, false);
           this.canvas.addEventListener("pointerup", _this.endDraw, false);
           this.canvas.addEventListener("pointerout", _this.outdraw, false);
+          this.canvas.addEventListener("mousewheel", _this.onMousewheel, false);
         })
       },
+      //滚动缩放
+      onMousewheel(e) {
+        if (e.wheelDelta > 0) {
+          // 放大
+          this.scaleDom(this.canvas, "+");
+        } else {
+          // 缩小
+          this.scaleDom(this.canvas, "-")
+        }
+      },
       outdraw() {
         this.isActive = false;
       },
@@ -333,9 +342,12 @@
       //放大缩小
       scaleDom(canvas, type) {
         if (type == "-") {
-          this.scale += -0.1;
+          if (this.scale - 0.05 < 0) {
+            return;
+          }
+          this.scale += -0.05;
         } else if (type == "+") {
-          this.scale += 0.1;
+          this.scale += 0.05;
         }
         else {
           this.scale = 1;
@@ -391,17 +403,17 @@
         img.style.display = "none";
         this.scaleDomSize(canvas);
       },
+      //开始裁剪
       Crop() {
-      
-        if (typeof this.minWidth !== 'undefined' && typeof this.minWidth !== 'undefined') {
+        if (typeof this.minWidth !== 'undefined' && typeof this.minHeight !== 'undefined') {
+          this.cropBoxResizable = true;
           if (parseInt(this.minWidth) > this.bodywidth || parseInt(this.minHeight) > this.bodyheight) {
             this.options.enlarge = 2;
-            this.options.autoCropWidth = parseInt(this.minWidth)/2;
-            this.options.autoCropHeight = parseInt(this.minHeight)/2;
           }
-          else {
-            this.options.autoCropWidth = parseInt(this.minWidth);
-            this.options.autoCropHeight = parseInt(this.minHeight);
+          this.options.autoCropWidth = parseInt(this.minWidth) / this.options.enlarge;
+          this.options.autoCropHeight = parseInt(this.minHeight) / this.options.enlarge;
+          if (this.canvas.width < parseInt(this.minWidth) || this.canvas.height < parseInt(this.minHeight)) {
+            this.options.mode = this.canvas.width / this.options.enlarge + "px auto";
           }
         }
         this.canvasImg = this.canvas.toDataURL('image/jpeg');

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -98,11 +98,9 @@
         return val.split('.').reduce((data, currentVal) => {
           var rtn = data[currentVal];
           if (typeof rtn !== 'undefined') {
-            if (rtn.toString().indexOf('"') != -1) {
-              rtn = rtn.replace(/"/g, "'");
-              rtn = rtn.replace(/>/g, ">");
-              rtn = rtn.replace(/</g, "&lt;");
-            }
+            rtn = rtn.replace(/"/g, "'");
+            rtn = rtn.replace(/>/g, "&gt;");
+            rtn = rtn.replace(/</g, "&lt;");
           }
           else {
             rtn = "";

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -219,6 +219,10 @@
             this.flagSideBar=false;
           }
 
+          if(document.body.clientWidth && document.body.clientWidth<1024){
+            this.flagSideBar=false;
+          }
+
           if(this.flagSideBar){
             this.selectIndex=-1;
             if(this.flagDefaultDisplaySideBar && !this.sideBarStatus){
@@ -285,6 +289,7 @@
             }
           }
         }
+        this.$refs.table.setTableHeight();
       },
       closeSideHandler() {
         this.$refs.sideMenu.clickHandler();

package/src/main.js

@@ -47,7 +47,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZxYbndo9MDGz-C3MFdgpURSDTGfxcjdPS-4hWTTGZeMM4BKpAV3NFGa1dwRxstEVsh0-DRikM2XKCSU3RsHJ_rpnCnGjKIjxtUZERKVrWSweCnX8Am528wj_F-ic9_nLtOwzLrOXYqYvEQksWlGNBT2SHHlKSn3Ide4f0BAAD__w.HOklRNVaTrByviaFzKXmF9LGELoOvSJiutmh3TyQoyM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjkEKwjAQRe-StQNJZiYz6S5tmo2HkMZWqCuxLSji3a14CLePz3v_ZZatmsZgKy1nFgiJCcj3BJqlAIVMklVKl-gUCmfvRQClKHTOInifMtjvFDPGIPaUKSb1hLAj3E2uB20xgWdSwsIUhc3BTI-baVwQdYzk9WDmYf0Bu1u-YFum-3F6_uPcdZ337Og4ajgTTJdQgWwYYdCqMNpYeajjhSOb9wcAAP__.FwJrqBiqDn1H2KI7t-vmBjLQYadNyXFFaId5kR1WL_8',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',