centaline-data-driven 1.4.59 → 1.4.61

package/package.json

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

package/src/centaline/css/common.css

@@ -97,6 +97,10 @@ html {
  }
  .cursor{
   cursor: pointer !important;
+  }
+.cursorLink{
+  color: #388cd3;
+  cursor: pointer !important;
 }
  .ct-so .ct-close > .el-select__caret.is-show-close:hover, .ct-tags .ct-close > .el-select__caret.is-show-close:hover {
    color: #909399;

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -9,7 +9,7 @@
           <div class="title">
             <span>{{ model.fields1Dic.StatusName.value }}</span>
             <span class="head-line"></span>
-            <span>{{ model.fields1Dic.EstateName.value }}</span>
+            <span class="cursorLink" @click="fieldClickHandler(model.actionRouterEstate, $event)">{{ model.fields1Dic.EstateName.value }}</span>
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
             <img v-if="model.actionRouterFavorite" :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
@@ -721,6 +721,10 @@ export default {
       }
     },
     fieldClickHandler(field) {
+      if(field == null || field==undefined){
+        return;
+      }
+
       var self = this;
       var callBack = null;
       let submitData = {};
@@ -918,7 +922,11 @@ export default {
           else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
-            window.open(field.action + query, "_blank");
+            let urlTab = field.action + query;
+            if(field.action.indexOf('?')>-1 && query.indexOf('?')>-1){
+              urlTab = field.action + '&' +query.substr(1, query.length);
+            }
+            window.open(urlTab, "_blank");
           } 
           else if (field.isOpenUrlInBrowse) {// 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -9,7 +9,7 @@
           <div class="title">
             <span>{{ model.fields1Dic.StatusName.value }}</span>
             <span class="head-line"></span>
-            <span>{{ model.fields1Dic.EstateName.value }}</span>
+            <span class="cursorLink" @click="fieldClickHandler(model.actionRouterEstate, $event)">{{ model.fields1Dic.EstateName.value }}</span>
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
             <img v-if="model.actionRouterFavorite" :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
@@ -730,6 +730,10 @@ export default {
       }
     },
     fieldClickHandler(field) {
+      if(field == null || field==undefined){
+        return;
+      }
+      
       var self = this;
       var callBack = null;
       let submitData = {};
@@ -927,7 +931,11 @@ export default {
           else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
-            window.open(field.action + query, "_blank");
+            let urlTab = field.action + query;
+            if(field.action.indexOf('?')>-1 && query.indexOf('?')>-1){
+              urlTab = field.action + '&' +query.substr(1, query.length);
+            }
+            window.open(urlTab, "_blank");
           } 
           else if (field.isOpenUrlInBrowse) {// 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -22,7 +22,7 @@
       <div style="padding-left: 20px;padding-right: 20px;">
         <div ref="title" style="margin-top: 18px;">
           <div style="font-weight: Bold;font-size: 16px;color: #333333;display: flex;">
-            <span>{{model.fields1Dic.EstateName.value}}</span>
+            <span class="cursorLink" @click="fieldClickHandler(model.actionRouterEstate, $event)">{{model.fields1Dic.EstateName.value}}</span>
             <span>{{model.fields1Dic.BuildingName.value}}</span>
             <span>{{model.fields1Dic.RoomNo.value}}</span>
             <div style="border: 1px solid #E0E0E0;font-size: 12px;color: #333333;padding-top: 3px;
@@ -293,6 +293,9 @@
         if(this.$refs['popover0']){
           this.$refs['popover0'].doClose();
         }
+        if(field == null || field==undefined){
+          return;
+        }
 
         var self = this;
         var callBack=null;
@@ -321,6 +324,11 @@
             router = this.model.routerForQRCode;
           }
         }
+        if (router == undefined && this.model.actionRouterEstate) {
+          if (field.id === this.model.actionRouterEstate.id) {
+            router = this.model.actionRouterEstate;
+          }
+        }
 
         if(router){
           if(field.isSubmitDataFromSelf){
@@ -433,7 +441,11 @@
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);
-              window.open(field.action + query, "_blank");
+              let urlTab = field.action + query;
+              if(field.action.indexOf('?')>-1 && query.indexOf('?')>-1){
+                urlTab = field.action + '&' +query.substr(1, query.length);
+              }
+              window.open(urlTab, "_blank");
             }
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");

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

@@ -1,49 +1,24 @@
 <template>
-  <div class="magnify-modal" style="width:100%; height:100%;background-color: #1e1e1e">
-    <div class="magnify-stage">
+  <div class="picedit-modal" style="width:100%; height:100%;background-color: #1e1e1e">
+    <div class="picedit-stage">
       <canvas id="drawCanvas" ref="canvas" style="position:absolute;"></canvas>
     </div>
-    <div class="magnify-Original" v-if="flagOriginal">
+    <div class="picedit-Original" v-if="flagOriginal">
       <el-row>
         <el-button type="success" @click="Original()">原图</el-button>
       </el-row>
     </div>
-    <div class="magnify-cropper" v-if="croppShow">
+    <div class="picedit-cropper" v-if="croppShow">
       <el-row>
         <el-button type="success" @click="sureCropper()"><i class="el-icon-check"></i></el-button>
         <el-button type="primary" @click="cancelCropper()"><i class="el-icon-close"></i></el-button>
       </el-row>
     </div>
-    <div class="magnify-footer" v-else>
-      <div class="magnify-toolbar">
-        <a @click="rotLeft" class="magnify-btn" title="左旋转">
-          <span class="el-icon-refresh-left"></span>
+    <div class="picedit-footer" v-else>
+      <div class="picedit-toolbar">
+        <a v-for="(item, index) in bntList" :key="index" @click="handleClick(item.key,index)" :class="['magnify-btn', index==bntindex ? 'active' : '',]" :title="item.name">
+          <span :class="item.ico"></span>
         </a>
-        <a @click="rotRight" class="magnify-btn" title="右旋转">
-          <span class="el-icon-refresh-right"></span>
-        </a>
-        <a @click="Crop" class="magnify-btn" title="裁剪">
-          <span class="el-icon-crop"></span>
-        </a>
-        <a @click="Drag" class="magnify-btn" title="拖动">
-          <span class="el-icon-rank"></span>
-        </a>
-        <a @click="Apply" class="magnify-btn" title="涂抹">
-          <span class="el-icon-brush"></span>
-        </a>
-        <a @click="enlarge" class="magnify-btn" title="放大">
-          <span class="el-icon-zoom-in"></span>
-        </a>
-        <a @click="narrow" class="magnify-btn" title="缩小">
-          <span class="el-icon-zoom-out"></span>
-        </a>
-        <a @click="clear" class="magnify-btn" title="清除">
-          <span class="el-icon-refresh"></span>
-        </a>
-        <a @click="preservation" class="magnify-btn" title="保存">
-          <span class="el-icon-check"></span>
-        </a>
-
       </div>
     </div>
     <div class="stream-total-tips" v-if="progressFlag">
@@ -66,8 +41,8 @@
     props: {
       file: Object,
       api: String,
-      minWidth: Number,
-      minHeight: Number
+      minWidth: String,
+      minHeight: String
     },
     data() {
       return {
@@ -93,6 +68,54 @@
         nt: 0,
         ratio: 0,
         cropBoxResizable: false,
+        bntindex:-1,
+        bntList: [
+          {
+            name: "左旋转",
+            ico: "el-icon-refresh-left",
+            key:"rotLeft",
+          },
+          {
+            name: "右旋转",
+            ico: "el-icon-refresh-right",
+            key: "rotRight",
+          },
+          //{
+          //  name: "裁剪",
+          //  ico: "el-icon-crop",
+          //  key: "Crop",
+          //},
+          {
+            name: "拖动",
+            ico: "el-icon-rank",
+            key: "Drag",
+          },
+          {
+            name: "涂抹",
+            ico: "el-icon-brush",
+            key: "Apply",
+          },
+          {
+            name: "放大",
+            ico: "el-icon-zoom-in",
+            key: "enlarge",
+          },
+          {
+            name: "缩小",
+            ico: "el-icon-zoom-out",
+            key: "narrow",
+          },
+          {
+            name: "清除",
+            ico: "el-icon-refresh",
+            key: "clear",
+          },
+          {
+            name: "保存",
+            ico: "el-icon-check",
+            key: "preservation",
+          },
+        ],
       }
     },
     computed: {
@@ -107,7 +130,6 @@
       if (typeof this.file.originalSavedFileName !== 'undefined' && this.file.originalSavedFileName !== this.file.savedFileName) {
         this.flagOriginal = true;
       }
-      console.log(this.file);
       this.drawCanv();
     },
     methods: {
@@ -235,6 +257,23 @@
         }
         this.isActive = false;
       },
+      handleClick(key, index) {
+        this.bntindex = index;
+        this.canMove = false;
+        this.PaintMove = false;
+        this.isActive = false;
+        switch (key) {
+          case "rotLeft": this.rotLeft(); break;
+          case "rotRight": this.rotRight(); break;
+          case "enlarge": this.scaleDom(this.canvas, "+");; break;
+          case "narrow": this.scaleDom(this.canvas, "-");; break;
+          case "Crop": this.Crop(); break;
+          case "Drag": this.Drag(); break;
+          case "Apply": this.Apply(); break;
+          case "clear": this.clear(); break;
+          case "preservation": this.preservation(); break;
+        }
+      },
 
       enlarge() {
         this.scaleDom(this.canvas, "+");
@@ -316,14 +355,20 @@
         let _this = this
         this.drawCanv()
         this.croppShow = true
+        var w;
+        var h;
+        if (typeof this.minWidth !== 'undefined' && typeof this.minWidth !== 'undefined') {
+          w = parseInt(this.minWidth)
+          h = parseInt(this.minHeight);
+        }
         let cropper = new Cropper(this.$refs.canvas, {
           checkCrossOrigin: true,
           viewMode: 1,
           dragMode: 'move',
           cropBoxResizable: _this.cropBoxResizable,
           data: {
-            width: this.minWidth || 800,
-            height: this.minHeight || 600
+            width: w,
+            height: h
           },
           zoom(e) {
             if (_this.ratio == 0) {
@@ -371,6 +416,9 @@
         this.rot = 0;
         this.nl = 0;
         this.nt = 0;
+        this.canMove = false;
+        this.PaintMove = false;
+        this.isActive = false;
         this.scaleDom(this.canvas, "");
         this.rotate(this.canvas, this.imgObj, this.rot);
       },
@@ -520,7 +568,7 @@
   };
 </script>
 <style>
-  .magnify-stage {
+  .picedit-stage {
     position: absolute;
     left: 0;
     right: 0;
@@ -530,7 +578,7 @@
     overflow: hidden;
   }
 
-  .magnify-footer {
+  .picedit-footer {
     height: 50px;
     bottom: 0;
     position: absolute;
@@ -539,7 +587,7 @@
     color: #fff;
     z-index: 9;
   }
-  .magnify-cropper {
+  .picedit-cropper {
     height: 50px;
     bottom: 0;
     position: absolute;
@@ -548,15 +596,15 @@
     color: #fff;
     z-index: 9;
   }
-  .magnify-Original {
+  .picedit-Original {
     height: 50px;
     top: 50px;
-    right:20px;
+    right: 20px;
     position: absolute;
     color: #fff;
     z-index: 9;
   }
-  .magnify-toolbar {
+  .picedit-toolbar {
     display: inline-block;
     height: 50px;
     background-color: rgba(0, 0, 0, .5);
@@ -565,7 +613,7 @@
     border-radius: 5px 5px 0 0;
   }
 
-    .magnify-toolbar .magnify-btn {
+    .picedit-toolbar .magnify-btn {
       display: inline-block;
       width: 50px;
       height: 50px;
@@ -576,9 +624,13 @@
       font-size: 24px;
       cursor: pointer;
     }
-  .rc-cropper {
-    position: relative;
-  }
+    .picedit-toolbar .active {
+      background-color: #fff;
+      color:#333;
+    }
+    .rc-cropper {
+      position: relative;
+    }
 
   .rc-cropper__iconCrop1 {
     position: absolute;

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -4,6 +4,7 @@
     <template v-if="model.type==51">
       <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
                  :http-request="SliceUpload"
+                  ref="upload"
                  :disabled="model.lock"
                  :accept="model.fileAccept"
                  :on-change="handleChange"
@@ -21,8 +22,8 @@
                  :limit="parseInt(model.max || 999)"
                  :on-exceed="handleExceed">
         <i slot="default" class="el-icon-plus"></i>
-        <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">
-          {{ validMessage }}
+        <div slot="tip" class="el-upload__tip errorMessage" style="white-space:pre-wrap;" v-show="!valid" v-html="validMessage">
+         
         </div>
         <div slot="tip" v-show="model.description" v-html="model.description">
         </div>
@@ -90,6 +91,7 @@
     <!-- 官方上传 -->
     <template v-else>
       <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
+                  ref="upload"
                  :disabled="model.lock"
                  :accept="model.fileAccept"
                  :on-change="handleChange"
@@ -107,8 +109,8 @@
                  :limit="parseInt(model.max || 999)"
                  :on-exceed="handleExceed">
         <i slot="default" class="el-icon-plus"></i>
-        <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">
-          {{ validMessage }}
+        <div slot="tip" class="el-upload__tip errorMessage" style="white-space:pre-wrap;" v-show="!valid" v-html="validMessage">
+          
         </div>
         <div slot="tip" v-show="model.description" v-html="model.description">
         </div>
@@ -290,7 +292,6 @@
                   self.$nextTick(function () {
                     this.model.updateFile(file);
                     self.$common.closeDialog(dialogOption.dialog);
-                    console.log(this.model.fileList);
                   });
                 },
               },
@@ -335,9 +336,10 @@
         this.changeHandler(this.model.value);
       },
       //上传之前的钩子
-      beforeUploadProcess(files) {
+      beforeUploadProcess(file) {
         return true;
       },
+      
       //文件上传时的钩子
       uploadProcess(event, file, fileList) {
         file.progressFlag = true; // 显示进度条
@@ -395,6 +397,8 @@
             return false;
           }
         }
+
+       
         if (this.model.rightDefault && this.model.rightDefault == 1 && eventName == "valid") {
           if (this.model.getfileDefault() <= 0) {
             this.validMessage = "请设置默认封面";
@@ -407,7 +411,54 @@
           this.valid = false;
           return false;
         }
-
+        if (typeof this.model.min2 !== 'undefined' || typeof this.model.max2 !== 'undefined') {
+          var flagSize = true;
+          this.validMessage = "";
+          this.model.fileList.forEach((v, index) => {
+            var flagw = true;
+            var flagh = true;
+            if (typeof this.model.min2 !== 'undefined' && typeof v.width!== 'undefined') {
+              if (v.width < parseInt(this.model.min2)) {
+                flagSize = false;
+                flagw = false;
+              }
+            }
+            if (typeof this.model.max2 !== 'undefined' && typeof v.height !== 'undefined') {
+              if (v.height < parseInt(this.model.max2)) {
+                flagSize = false;
+                flagh = false;
+              }
+            }
+            if (!flagw || !flagh) {
+              this.validMessage = this.validMessage+"第" + (index + 1) + "张图片";
+              if (!flagw && !flagh) {
+                this.validMessage = this.validMessage + "宽高不符合标准";
+              }
+              else if (!flagw) {
+                this.validMessage = this.validMessage + "宽度不符合标准";
+              }
+              else if (!flagh) {
+                this.validMessage = this.validMessage + "高度不符合标准";
+              }
+              this.validMessage = this.validMessage + ",上传图片";
+              if (typeof this.model.min2 !== 'undefined') {
+                this.validMessage = this.validMessage + "宽度不小于" + this.model.min2 + "px ";
+              }
+              if (typeof this.model.max2 !== 'undefined') {
+                this.validMessage = this.validMessage + "高度不小于" + this.model.max2 + "px ";
+              }
+              this.validMessage = this.validMessage + "\r\n";
+              if (this.$refs.upload) {
+                this.$refs.upload.$el.children[0].children[index].style.border = "1px solid #ff0000";
+              }
+            }
+          })
+          if (!flagSize) {
+            this.valid = false;
+            return false;
+          }
+        }
+        
         this.valid = true;
         return this.valid;
       },
@@ -678,5 +729,4 @@
       left: 50%;
       transform: translate(-50%, -50%);
     }
- 
 </style>

package/src/centaline/loader/src/ctl/Detail.js

@@ -285,6 +285,15 @@ const Detail = function (source, para, callBack) {
         }
         return routerPrice;
       },
+      get actionRouterEstate() {
+        let routerPrice = null;
+        if (rtn.actionRoutersAll) {
+          rtn.actionRoutersAll.forEach((v, i) => {
+            if (v.id == 'browseEstate') routerPrice = v;
+          });
+        }
+        return routerPrice;
+      },
       get actionRouterFavorite() {
         if (rtn._actionRouterFavorite !== null) {
           return rtn._actionRouterFavorite;

package/src/centaline/loader/src/ctl/File.js

@@ -271,6 +271,7 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           fileSourceList.push(res.content[0]);
           var data = rtn.getFileData(res.content[0]);
 
+
           Vue.set(file, "url", data.url);
           Vue.set(file, "source", data.source);
           Vue.set(file, "mediaUrl", data.mediaUrl);
@@ -333,11 +334,21 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
         }
         rtn.fileList.push(awaitfile);
       },
-
-      setByPieces(res, Progress, file) {
+      imgFn(url) {
+        return new Promise(function (resolve, reject) {
+          let img = new Image();
+          img.src = url;
+          img.onload = function () {
+            resolve(img);
+          };
+        });
+      },
+      async setByPieces(res, Progress, file) {
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           var data = {};
+          var w;
+          var h;
           if (res.content.finished == 1) {
             //下面的方式绑定，会有一些问题 todo 不强与页面关联
             fileSourceList.push(res.content.media);
@@ -345,7 +356,11 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             data = rtn.getFileData(res.content.media);
             data.progressFlag = false;
             data.loadProgress = 100;
-
+            const img = await this.imgFn(data.mediaUrl);
+            w = img.width;
+            h = img.height ;
+            Vue.set(file, "width", w);
+            Vue.set(file, "height", h);
             Vue.set(file, "url", data.url);
             Vue.set(file, "source", data.source);
             Vue.set(file, "mediaUrl", data.mediaUrl);
@@ -377,6 +392,8 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           if (i === -1) return;
 
           Vue.set(rtn.fileList, i, {
+            width: w,
+            height: h,
             url: data.url,
             source: data.source,
             mediaUrl: data.mediaUrl,

package/src/main.js

@@ -44,7 +44,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPs7MzO7tDpgo2HIKAUWBmBRGO8uxqho_cVr3jN_08Y5w5KiAu4oZXGFnBDKw2RWCStcWcxo6gwJsoJs2iWQ1Vz3ldQQH-_QkkaI3FScwUM7fQLLnj_DfPY34794x_nLtPwmVWXWs-mSBQYhc-ExkLo2CSY706JO3i9AQAA__8._Mi7hEb24cV9OSQp0CR2iKvbIWspEBgTdVKFTeAXyAU',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZxYbndo9MDGz-C3MFdgpURSDTGfxcjdPS-4hWTTGZeMM4BKpAV3NFGa1dwRxstEVsh0-DRikM2XKCSU3RsHJ_rpnCnGjKIjxtUZERKVrWSweCnX8Am528wj_F-ic9_nLtOwzLrOXYqYvEQksWlGNBT2SHHlKSn3Ide4f0BAAD__w.HOklRNVaTrByviaFzKXmF9LGELoOvSJiutmh3TyQoyM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',