centaline-data-driven 1.6.33 → 1.6.35

package/package.json

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

package/release-log.md

@@ -1,3 +1,31 @@
+# v1.6.35
+2024-01-08
+
+优化
+
+列表新增和修改页面引用的父页面的表单项将以label的形式展现在表单的最上面，多个用逗号（,） 分隔
+
+onAfterChanged找不到路由后，支持直接执行脚本
+
+表单列表弹层支持修改必填required到行数据上
+
+BUG
+
+文件预览，部分发票PDF，内容显示不全，前端更新pdf.js必须更新SDK版本
+
+# v1.6.34
+2024-12-30
+
+优化
+
+树组件增加拖拽改变宽度
+
+附件上传组件增加粘贴上传功能
+
+BUG
+
+下拉搜索框修复在拼音打汉字过快时会出现拼音的bug
+
 # v1.6.33
 2024-11-22
 

package/src/SearchList.vue

@@ -31,7 +31,7 @@
 
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist>
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'"  :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'"  :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
@@ -40,6 +40,8 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/EntranceNoticeInfoList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/EntranceNoticeInfoList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/commissionquery/properformanceszjjbreport/getLayoutOfSearch'"  :searchDataApi="'/commissionquery/properformanceszjjbreport/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -106,6 +108,8 @@
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist> -->
     
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> -->
+ 
+    <!-- <ct-searchlist :apiParam="para" :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyRealLookList/getLayoutOfSearch'" :searchDataApi="'/PropertyRealLookList/getListOfSearchModel'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterList/getListOfSearchModel'"></ct-searchlist> -->
 
@@ -155,9 +159,18 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          type
-: 
-"top"
+          type: "top",
+  "deleteRight": 0,
+  "editRight": 0,
+  "browseRight": 0,
+  "auditRight": 0,
+  "addRight": 0,
+  "deptId": "E5A389CB-8665-4BFD-8C97-3A70CEA28604",
+  "cityName": "深圳",
+  "name": "深圳中原",
+  "path": "001",
+  "code": "001",
+  "new": false
         },
       }
     },

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

@@ -8,7 +8,7 @@
         :file-list="model.fileList" :multiple="true" :auto-upload="true" :action="model.action" :data="model.uploadData"
         :headers="headers" :before-upload="beforeUploadProcess" :on-success="handleAvatarSuccess"
         :on-error="handleAvatarError" :on-progress="uploadProcess" :limit="parseInt(model.max || 999)"
-        :on-exceed="handleExceed">
+        :on-exceed="handleExceed" :uploadStatus="!disableUpload&&!model.lock?'upload':'lock'">
         <template slot="default">
           <i class="el-icon-plus"></i>
         </template>
@@ -18,8 +18,11 @@
         </div>
         <div slot="tip" v-show="model.description" v-html="model.description">
         </div>
-        <img class="qrcode-target" @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"
-          :src="require('../../../assets/serw1.png')" style="width: 35px;height: 35px;" alt="扫码上传" title="扫码上传">
+        <div class="qrcode-target"  v-if="model.QRCodeAction">
+          <img @click.stop="qrcodeFn" ref="QRCodeRef"
+            :src="require('../../../assets/serw1.png')" style="width: 35px;height: 35px;float: right;" alt="扫码上传"
+            title="扫码上传">
+        </div>
         <div class="ScanUploadPhoto" v-if="qrcodeVisible" @click.stop="qrcodeVisible = true"
           :style="{ top: QRCodeRefTop + 'px', left: QRCodeRefLeft + 'px' }">
           <div style="border-bottom:none">
@@ -44,14 +47,14 @@
           <span v-if="model.lock" class="el-dropdown-link">
             <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
               model.mediaLabe.mediaLabelName
-              }}</span>
+            }}</span>
           </span>
           <!--复杂分类-->
           <span v-else-if="model.isComplexClassify" class="el-dropdown-link"
             @click.stop="classifyFormClickHandle(model.mediaLabe)">
             <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
               model.mediaLabe.mediaLabelName
-              }}</span>
+            }}</span>
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <!--简单分类-->
@@ -62,7 +65,7 @@
             <span class="el-dropdown-link" @click.stop="classifyClickHandle">
               <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
                 model.mediaLabe.mediaLabelName
-                }}</span>
+              }}</span>
               <i class="el-icon-arrow-down el-icon--right" style="color: #fff;"></i>
             </span>
             <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
@@ -72,15 +75,13 @@
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-        </span>
-
-
+        </span> 
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
             <div @click="viewerfile(file)">
-              <div v-if="file.progressFlag"  v-loading="file.progressFlag"  style="width: 100px; height: 100px" 
-              element-loading-spinner="el-icon-loading">
-              </div> 
+              <div v-if="file.progressFlag" v-loading="file.progressFlag" style="width: 100px; height: 100px"
+                element-loading-spinner="el-icon-loading">
+              </div>
               <el-image v-else fit="fill"
                 :src="file.url ? file.url : file.mediaUrl ? file.mediaUrl + '/100/100' : require('../../../assets/blank.png')"
                 style="width: 100px; height: 100px" :z-index="previewZIndex">
@@ -154,7 +155,9 @@
         :accept="model.fileAccept" :on-change="handleChange" list-type="picture-card" :file-list="model.fileList"
         :multiple="true" :auto-upload="true" :action="model.action" :data="model.uploadData" :headers="headers"
         :before-upload="beforeUploadProcess" :on-success="handleAvatarSuccess" :on-error="handleAvatarError"
-        :on-progress="uploadProcess" :limit="parseInt(model.max || 999)" :on-exceed="handleExceed">
+        :on-progress="uploadProcess" :limit="parseInt(model.max || 999)" :on-exceed="handleExceed"
+        :uploadStatus="!disableUpload&&!model.lock?'upload':'lock'"
+        >
         <i slot="default" class="el-icon-plus"></i>
         <div slot="tip" class="el-upload__tip errorMessage" style="white-space:pre-wrap;" v-show="!valid"
           v-html="validMessage">
@@ -162,8 +165,11 @@
         </div>
         <div slot="tip" v-show="model.description" v-html="model.description">
         </div>
-        <img class="qrcode-target" @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"
-          :src="require('../../../assets/serw1.png')" style="width: 35px;height: 35px;" alt="扫码上传" title="扫码上传">
+        <div class="qrcode-target">
+          <img @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"
+            :src="require('../../../assets/serw1.png')" style="width: 35px;height: 35px;float: right;" alt="扫码上传"
+            title="扫码上传">
+        </div>
         <div class="ScanUploadPhoto" v-if="qrcodeVisible" @click.stop="qrcodeVisible = true"
           :style="{ top: QRCodeRefTop + 'px', left: QRCodeRefLeft + 'px' }">
           <div style="border-bottom:none">
@@ -186,13 +192,13 @@
           <!--锁定-->
           <span v-if="model.lock" class="el-dropdown-link">
             <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
-              model.mediaLabe.mediaLabelName}}</span>
+              model.mediaLabe.mediaLabelName }}</span>
           </span>
           <!--复杂分类-->
           <span v-else-if="model.isComplexClassify" class="el-dropdown-link"
             @click.stop="classifyFormClickHandle(model.mediaLabe)">
             <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
-              model.mediaLabe.mediaLabelName}}</span>
+              model.mediaLabe.mediaLabelName }}</span>
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <!--简单分类-->
@@ -202,7 +208,7 @@
 
             <span class="el-dropdown-link" @click.stop="classifyClickHandle">
               <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
-                model.mediaLabe.mediaLabelName}}</span>
+                model.mediaLabe.mediaLabelName }}</span>
               <i class="el-icon-arrow-down el-icon--right" style="color: #fff;"></i>
             </span>
             <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
@@ -217,13 +223,13 @@
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
             <div @click="viewerfile(file)">
-              <div v-if="file.progressFlag"  v-loading="file.progressFlag"  style="width: 100px; height: 100px" 
-              element-loading-spinner="el-icon-loading">
-              </div> 
-                <el-image v-else fit="fill"
-                  :src="file.url ? file.url : file.mediaUrl ? file.url : require('../../../assets/blank.png')"
-                  style="width: 100px; height: 100px" :z-index="previewZIndex">
-                </el-image>
+              <div v-if="file.progressFlag" v-loading="file.progressFlag" style="width: 100px; height: 100px"
+                element-loading-spinner="el-icon-loading">
+              </div>
+              <el-image v-else fit="fill"
+                :src="file.url ? file.url : file.mediaUrl ? file.url : require('../../../assets/blank.png')"
+                style="width: 100px; height: 100px" :z-index="previewZIndex">
+              </el-image>
             </div>
             <span class="cover-list-item-span-Default"
               v-if="(model.lock && file.flagDefault) || (model.rightDefault && model.rightDefault == 1 && file.mediaTypeID == 2)">
@@ -324,8 +330,16 @@ export default {
       return this.$common.getDataDrivenOpts().zindex + 100;
     },
   },
+  deactivated() { 
+    document.addEventListener('paste', this.ListenerPaste); 
+
+    },
+  mounted() { 
+    document.addEventListener('paste', this.ListenerPaste); 
+
+  },
   created() {
-    var self = this;
+    var self = this; 
     this.$nextTick(function () {
       if (self.vmodel) {
         self.load(self.vmodel);
@@ -337,6 +351,8 @@ export default {
         });
       }
       this.disableUpload = this.model.lock;
+     
+      
     });
   },
   methods: {
@@ -477,7 +493,7 @@ export default {
     },
     handleDownload(file) {
     },
-    handleChange(file, fileList) { 
+    handleChange(file, fileList) {
       this.changeHandler(this.model.value);
     },
     //上传之前的钩子
@@ -706,7 +722,7 @@ export default {
 
       var refupload = this.$refs.refupload;
       if (refupload) {
-        if (flagError) {
+        if (flagError) { 
           this.$message({
             message: res,
             type: 'error',
@@ -844,11 +860,63 @@ export default {
         }
         self.QRCodeRefLeft = QRCodeRef.getBoundingClientRect().left + QRCodeRefWith + 20;
       }
+    },  
+    PasteUpload(event) {
+      let self = this;
+      if (!self.model.locked && !self.disableUpload) {
+        // 获取粘贴板中的图片
+        const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
+        const items = clipboardDatas.items;
+        for (let index in items) {
+          const item = items[index];
+          if (item.kind === 'file') {
+            const file = item.getAsFile();
+            let uid = self.uploadguid();
+            file.uid = file.uid || uid;
+            self.$refs.upload.handleStart(file);
+            // 提交上传队列
+            self.$refs.upload.submit();
+          }
+        }
+      }
+
     },
+    ListenerPaste(event) { 
+      let self = this;
+      if (!self.model.locked&&!self.disableUpload) {
+        var target = event.target;
+        const uploads = document.querySelectorAll('[uploadStatus="upload"]');
+
+        if (!window.uploads) {
+          window.uploads = { count: 0, length: uploads.length };
+        }
+        if (uploads.length > 1) {
+          window.uploads.count = window.uploads.count + 1;
+          window.uploads.length = uploads.length;
+
+          if (window.uploads.count == window.uploads.length) {
+            window.uploads = null;
+          
+            self.$message({
+              message: "存在多个上传组件，请点击上传！",
+              type: 'info',
+              showClose: true,
+            });
+            return false;
+          }
+        }
+        else if (uploads.length == 1) {
+          window.uploads = null;
+          self.PasteUpload(event);
+        }
+      } 
+    }
   },
   beforeDestroy() {
     clearTimeout(this.qrtimer);
     window.removeEventListener('scroll', this.QRCodeLocate, true)
+    //销毁粘贴事件监听器 
+    document.removeEventListener('paste', this.ListenerPaste)
   },
 
 };
@@ -1012,10 +1080,12 @@ export default {
 
 .qrcode-target {
   position: absolute;
-  top: 3px;
   right: 3px;
   width: 35px;
   height: 35px;
+  color: red;
+  text-align: right;
+  top: 0px;
 }
 
 .Public-classification {

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -11,6 +11,21 @@
           <span style="font-weight:bold">{{model.title}}</span>
         </div>
 
+        <!--relationParentFormFields-->
+        <el-row v-if="relationParentFormFields.length > 0">
+          <template v-for="(col, index) in relationParentFormFields">
+            <el-col :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
+                        :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
+                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
+                        @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
+                        @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                        @popupLocation="popupLocationHandler"
+                        @tableButtonClick="clickHandler"></component>
+              </el-col>
+          </template>
+        </el-row>
+
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <template v-for="(col, index) in collapseFieldsRow[0]">
@@ -208,6 +223,12 @@
         Boolean,
         default: false,
       },
+      relationParentFormFields: {
+        Array,
+        default: function () {
+          return [];
+        },
+      },
     },
     data() {
       return {
@@ -1167,7 +1188,16 @@
           var router = self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
           });
-          self.clickHandler(router);
+          if(router){
+            self.clickHandler(router);
+          }
+          else{
+            if (typeof this.model.scripts !== 'undefined') {
+              this.model.scripts.formData.setExcuteListData(this.model.fields);
+            }
+            this.model.scripts.$fd = field.id;
+            this.$common.excute.call(this.model.scripts, field.onAfterChanged);
+          }
         }
 
         self.$forceUpdate();
@@ -1177,8 +1207,17 @@
         if (field.onAfterChanged) {
           var router = self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
-          });
-          self.clickHandler(router);
+          });          
+          if(router){
+            self.clickHandler(router);
+          }
+          else{
+            if (typeof this.model.scripts !== 'undefined') {
+              this.model.scripts.formData.setExcuteListData(this.model.fields);
+            }
+            this.model.scripts.$fd = field.id;
+            this.$common.excute.call(this.model.scripts, field.onAfterChanged);
+          }
         }
         self.$forceUpdate();
       },

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

@@ -795,8 +795,14 @@ import dynamicElement from '../../mixins/dynamicElement';
         if (field.onAfterChanged && field.type !== 4) {
           var router = self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
-          });
-          self.clickHandlerfield(router);
+          });          
+          if(router){
+            self.clickHandlerfield(router);
+          }
+          else{
+            this.model.scripts.$fd = field.id;
+            this.$common.excute.call(this.model.scripts, field.onAfterChanged);
+          }
         }
 
         self.$forceUpdate();

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -12,7 +12,7 @@
               <div>
                 <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
               </div>
-              <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+              <ctSelectOptionVertical :model="model" @click="selectOption($event)" @dataUpdated="dataUpdated()"></ctSelectOptionVertical>
             </div>
             <input slot="reference" v-bind="model.attrs" readonly="readonly" v-model="model.text" :placeholder="soPlaceholder"
                    ref="ct-input" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
@@ -140,17 +140,17 @@
     mounted() {
       var self = this;
       this.$nextTick(function () {
-        var dropdown = self.$refs["pop"];
-        this.unwatch1=self.$watch('model.options', function (newVal, oldVal) {
-          self.$nextTick(() => {
-            if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
-              dropdown.popperJS.destroy();
-              dropdown.popperJS = null;
-              dropdown.updatePopper();
-            }
-            self.$refs["searchInput"].$el.querySelector("input").focus();
-          });
-        }, { deep: true, immediate: true });
+        // var dropdown = self.$refs["pop"];
+        // this.unwatch1=self.$watch('model.options', function (newVal, oldVal) {
+        //   self.$nextTick(() => {
+        //     if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
+        //       // dropdown.popperJS.destroy();
+        //       // dropdown.popperJS = null;
+        //       // dropdown.updatePopper();
+        //     }
+        //     // self.$refs["searchInput"].$el.querySelector("input").focus();
+        //   });
+        // }, { deep: true, immediate: true });
       });
     },
     methods: {
@@ -274,6 +274,14 @@
             self.getOptions(self.searchText);
           }
         }, self.model.searchTick);
+      },
+      dataUpdated: function () {
+        this.$nextTick(function () {
+          var dropdown = this.$refs["pop"];
+          if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
+            dropdown.updatePopper();
+          }
+        });
       }
     }
   }

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -22,7 +22,7 @@
                 <div>
                   <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
                 </div>
-                <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+                <ctSelectOptionVertical :model="model" @click="selectOption($event)" @dataUpdated="dataUpdated()"></ctSelectOptionVertical>
               </div>
               <input slot="reference" v-bind="model.attrs" :placeholder="tagsPlaceholder"
                      ref="ct-input" class="" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
@@ -141,14 +141,14 @@
     mounted() {
       var self = this;
       this.$nextTick(function () {
-        var dropdown = self.$refs["pop"];
+        // var dropdown = self.$refs["pop"];
         this.unwatch=self.$watch('model.options', function (newVal, oldVal) {
           self.$nextTick(() => {
-            if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
-              dropdown.popperJS.destroy();
-              dropdown.popperJS = null;
-              dropdown.updatePopper();
-            }
+            // if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
+            //   dropdown.popperJS.destroy();
+            //   dropdown.popperJS = null;
+            //   dropdown.updatePopper();
+            // }
             this.setToGlobalOptions();
             self.$refs["searchInput"].$el.querySelector("input").focus();
 
@@ -367,6 +367,14 @@
             self.globalOptions.push(v);
           }
         });
+      },
+      dataUpdated: function () {
+        this.$nextTick(function () {
+          var dropdown = this.$refs["pop"];
+          if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
+            dropdown.updatePopper();
+          }
+        });
       }
     },
     watch: {