centaline-data-driven 1.6.35 → 1.6.37

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "marscode.chatLanguage": "cn"
+}

package/package.json

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

package/release-log.md

@@ -1,3 +1,17 @@
+# v1.6.37
+2024-02-14
+
+优化
+
+列表添加行样式字段rowStyle，支持自定义行样式、行字体样式
+
+# v1.6.36
+2024-01-17
+
+bug
+
+粘贴上传，exce单元格会识别成图片上图
+ 
 # v1.6.35
 2024-01-08
 

package/src/SearchList.vue

@@ -79,6 +79,10 @@
 
     <!-- <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist> -->
 
+    <!-- <ct-searchlist :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"
+      ></ct-searchlist> -->
+
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -52,8 +52,7 @@
               <tr v-for="(row,rowindex) in model.listData" :key="rowindex"
                   v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
                   :ref="'rows.'+rowindex" @click="rowClickHandle($event,rowindex)"
-                  class="ct-tr"
-                  :style="row.$style">
+                  class="ct-tr">
                 <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass]" align="center">
                   <label v-if="!model.rightMulti || row[model.rightMulti] == 1" class="el-checkbox is-checked"><span class="el-checkbox__input" :class="rowCheckClass(row)">
                     <span class="el-checkbox__inner"></span>

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" :uploadStatus="!disableUpload&&!model.lock?'upload':'lock'">
+        :on-exceed="handleExceed" :uploadStatus="!disableUpload && !model.lock ? 'upload' : 'lock'">
         <template slot="default">
           <i class="el-icon-plus"></i>
         </template>
@@ -18,10 +18,9 @@
         </div>
         <div slot="tip" v-show="model.description" v-html="model.description">
         </div>
-        <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 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' }">
@@ -75,7 +74,7 @@
               </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)">
@@ -156,8 +155,7 @@
         :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"
-        :uploadStatus="!disableUpload&&!model.lock?'upload':'lock'"
-        >
+        :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">
@@ -330,16 +328,16 @@ export default {
       return this.$common.getDataDrivenOpts().zindex + 100;
     },
   },
-  deactivated() { 
-    document.addEventListener('paste', this.ListenerPaste); 
+  deactivated() {
+    document.addEventListener('paste', this.ListenerPaste);
 
-    },
-  mounted() { 
-    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);
@@ -351,8 +349,8 @@ export default {
         });
       }
       this.disableUpload = this.model.lock;
-     
-      
+
+
     });
   },
   methods: {
@@ -722,7 +720,7 @@ export default {
 
       var refupload = this.$refs.refupload;
       if (refupload) {
-        if (flagError) { 
+        if (flagError) {
           this.$message({
             message: res,
             type: 'error',
@@ -860,30 +858,44 @@ 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;
+
+        //检测是否全是文件才上传
+        let fileSum = 0;
+
         for (let index in items) {
-          const item = items[index];
+          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();
+            ++fileSum;
+          }
+        }
+        
+        if (fileSum == items.length) {
+
+          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) { 
+    ListenerPaste(event) {
       let self = this;
-      if (!self.model.locked&&!self.disableUpload) {
+      if (!self.model.locked && !self.disableUpload) {
         var target = event.target;
         const uploads = document.querySelectorAll('[uploadStatus="upload"]');
 
@@ -896,7 +908,7 @@ export default {
 
           if (window.uploads.count == window.uploads.length) {
             window.uploads = null;
-          
+
             self.$message({
               message: "存在多个上传组件，请点击上传！",
               type: 'info',
@@ -909,7 +921,7 @@ export default {
           window.uploads = null;
           self.PasteUpload(event);
         }
-      } 
+      }
     }
   },
   beforeDestroy() {

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

@@ -75,7 +75,7 @@
             <!--可视区域的行数据-->
             <tr v-for="(row, rowindex) in model.listData" :key="rowindex"
               v-if="from == 'form' || pageRowMin <= rowindex && rowindex <= pageRowMax" :ref="'rows.' + rowindex"
-              @click="rowClickHandle($event, rowindex)" class="ct-tr" :style="row.$style">
+              @click="rowClickHandle($event, rowindex)" class="ct-tr" :style="row.rowStyle">
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td"
                 :class="[model.tdClass, rowindex === model.selectIndex ? 'select' : null,]" align="center">
                 <label v-if="!model.rightMulti || $common.getDataOfUpperLower(row, model.rightMulti) == 1"
@@ -2537,6 +2537,10 @@ export default {
   background-color: #ddd !important;
 }
 
+.ct-searchtable .ct-tr{
+  background-color: #ffffff; 
+}
+
 .ct-searchtable .ct-tr>.ct-td {
   /*border: 1px solid #e7e8eb;
     border-bottom: 1px solid #e7e8eb;
@@ -2544,7 +2548,7 @@ export default {
     border-left: 1px solid #e7e8eb;*/
   padding: 2px 20px;
   cursor: default;
-  background-color: #ffffff;
+  /* background-color: #ffffff; */
   // color: var(--centalineBlack);
 }
 
@@ -2694,10 +2698,12 @@ export default {
 
 .ct-table .left-fixation {
   position: sticky;
+  background-color: inherit;
 }
 
 .ct-table .right-fixation {
   position: sticky;
+  background-color: inherit;
 }
 
 .ct-table .left-fixation-th {

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -1,7 +1,8 @@
 <template>
   <div class='mytree' id="mytree" style="overflow:auto" v-loading="loading">
     <el-tree class="tree-line" :props="defaultProps" :load="loadNode" :indent="0" :expand-on-click-node="false"
-      @node-click="handleNodeClick" lazy ref="Tree" @node-contextmenu="rightClick" node-key="code" current-node-key="currentNodeKey">
+      @node-click="handleNodeClick" lazy ref="Tree" @node-contextmenu="rightClick" node-key="code"
+      current-node-key="currentNodeKey">
     </el-tree>
     <div class="box-menu" v-if="menuVisible && model.actionRouter"
       :style="{ left: menu_left + 'px', top: menu_top + 'px' }">
@@ -51,7 +52,7 @@ export default {
     };
   },
   mounted() {
- 
+
   },
   methods: {
     search(m) {
@@ -62,8 +63,8 @@ export default {
         clearTimeout(timer);
         self.searchStatus.push(1);
         self.treeNode.childNodes = [];
-        self.searchComplate(m, undefined, self.treeResolve,true);
-       
+        self.searchComplate(m, undefined, self.treeResolve, true);
+
       }
       else {
         timer = setTimeout(() => {
@@ -91,14 +92,14 @@ export default {
       if (node.level === 0) {
         self.treeNode = node;
         self.treeResolve = resolve;
-        return self.loadtreeData(resolve,true);
+        return self.loadtreeData(resolve, true);
       }
       if (node.level >= 1) {
         return self.getChildByList(node.data.code, resolve, node.data);
       }
     },
-    loadtreeData(resolve,firstLoad) {      // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
-      this.searchComplate(undefined, undefined, resolve,firstLoad);
+    loadtreeData(resolve, firstLoad) {      // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
+      this.searchComplate(undefined, undefined, resolve, firstLoad);
     },
     getChildByList(_parentID, resolve,) {     // 获取子节点请求
       var fields = this.model.searchData("code", _parentID, 9, 3);
@@ -107,7 +108,7 @@ export default {
       };
       this.searchComplate(model, undefined, resolve);
     },
-    async load(data, resolve,firstLoad) {
+    async load(data, resolve, firstLoad) {
       var self = this;
       self.model = data;
       self.model.$vue = self;
@@ -119,33 +120,32 @@ export default {
       self.loading = false;
       self.LastResolve = treeResolve;
       self.menuVisible = false;
-      if(firstLoad)
-      {
-       self.$nextTick(() => {
-        if (self.model.modeltree&&self.model.modeltree[0]&&self.model.modeltree[0].code) {
-          self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code)
+      if (firstLoad) {
+        self.$nextTick(() => {
+          if (self.model.modeltree && self.model.modeltree[0] && self.model.modeltree[0].code) {
+            self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code)
+          }
+        });
+        if (self.model.modeltree && self.model.modeltree[0]) {
+          self.handleNodeClick(self.model.modeltree[0], true);
         }
-     });
-    if (self.model.modeltree&&self.model.modeltree[0]) {
-      self.handleNodeClick(self.model.modeltree[0],true);
-    }
 
       }
-  
+
     },
-    searchComplate(m, defaultSearch, resolve,firstLoad) {
+    searchComplate(m, defaultSearch, resolve, firstLoad) {
       var self = this;
       this.$nextTick(function () {
         if (typeof self.api !== 'undefined') {
-          self.loaderObj.Tree(self.api, self.load, m, defaultSearch, resolve,firstLoad);
+          self.loaderObj.Tree(self.api, self.load, m, defaultSearch, resolve, firstLoad);
         }
       });
     },
-    handleNodeClick(data,formType) {
+    handleNodeClick(data, formType) {
       this.foo();
-      var self = this; 
-      if(data&&formType){
-      self.$refs.Tree.setCurrentKey(data.code)
+      var self = this;
+      if (data && formType) {
+        self.$refs.Tree.setCurrentKey(data.code)
       }
       if (self.LastClickNode != data) {
         self.LastClickNode = data;
@@ -186,30 +186,30 @@ export default {
         this.model.actionRouter.forEach(v => {
           if (this.currentData[v.rightField] == '1') {
             this.menuVisible = true //显示增删改的div
-            actionIndex +=1;  
+            actionIndex += 1;
           }
         })
       }
       document.addEventListener('click', this.foo)  // 监听事件鼠标点击事件，若点击则隐藏菜单
-     //  获取树状图的高度
+      //  获取树状图的高度
       let treeHeight = document.getElementById("mytree").offsetHeight;
-         // 获取文本内容的宽高
-         let mainHeight = document.getElementById("app-Tree").offsetHeight;
-        let mainWidth = document.getElementById("app-Tree").offsetWidth;
-        // 10是padding 获取查询条件高度
-        let screenHeight = document.getElementById("mytree").parentElement.offsetHeight - treeHeight - 10;
-        let windowWidth = window.innerWidth;  
-       let windowHeight = window.innerHeight;
-       // 将菜单显示在鼠标点击旁边定位
-       this.menu_left = event.clientX -( windowWidth - mainWidth);
-       // 18是节点文本的高度
-       this.menu_top =event.clientY - ( windowHeight -mainHeight) - screenHeight + actionIndex*30  +18;
+      // 获取文本内容的宽高
+      let mainHeight = document.getElementById("app-Tree").offsetHeight;
+      let mainWidth = document.getElementById("app-Tree").offsetWidth;
+      // 10是padding 获取查询条件高度
+      let screenHeight = document.getElementById("mytree").parentElement.offsetHeight - treeHeight - 10;
+      let windowWidth = window.innerWidth;
+      let windowHeight = window.innerHeight;
+      // 将菜单显示在鼠标点击旁边定位
+      this.menu_left = event.clientX - (windowWidth - mainWidth);
+      // 18是节点文本的高度
+      this.menu_top = event.clientY - (windowHeight - mainHeight) - screenHeight + actionIndex * 30 + 18;
       //  微调
-       if (document.getElementById("uplink")) {
-        this.menu_top = this.menu_top -8;
-       } else if(document.getElementById("onecard")){
-        this.menu_top = this.menu_top +10;
-       }
+      if (document.getElementById("uplink")) {
+        this.menu_top = this.menu_top - 8;
+      } else if (document.getElementById("onecard")) {
+        this.menu_top = this.menu_top + 10;
+      }
     },
     foo() {
       this.menuVisible = false
@@ -297,7 +297,7 @@ export default {
     add(newData) {
       let self = this;
       this.$refs.Tree.append(newData, self.currentNode)
-      this.handleNodeClick(newData,true)
+      this.handleNodeClick(newData, true)
     },
     //修改树节点
     update(newData) {
@@ -309,20 +309,20 @@ export default {
           self.$set(self.currentData, key, newData[key]);
         }
       }
-      this.handleNodeClick(newData,true)
+      this.handleNodeClick(newData, true)
     },
     getNextClickNode() {
-      const tree= this.$refs.Tree;
-      const node = tree.getNode(this.currentData.code); 
-      let data={};
-     if (node.nextSibling) {
-     data=node.nextSibling.data;
-     } else if(node.previousSibling) {
-     data=node.previousSibling.data;
-     }else if(node.parent){
-     data=node.parent.data;
-     }
-      this.handleNodeClick(data,true)
+      const tree = this.$refs.Tree;
+      const node = tree.getNode(this.currentData.code);
+      let data = {};
+      if (node.nextSibling) {
+        data = node.nextSibling.data;
+      } else if (node.previousSibling) {
+        data = node.previousSibling.data;
+      } else if (node.parent) {
+        data = node.parent.data;
+      }
+      this.handleNodeClick(data, true)
     }
   },
   created() {
@@ -334,26 +334,33 @@ export default {
 .mytree {
   height: 100%;
 }
+
 .mytree .el-tree {
   min-width: 100%;
   display: inline-block;
 }
+
 .mytree::-webkit-scrollbar-thumb {
-  background-color: #bebebe;/* 设置滚动条滑块颜色 */
-    height: 5px;
-    border-radius: 4px;
-    display: block;
+  background-color: #bebebe;
+  /* 设置滚动条滑块颜色 */
+  height: 5px;
+  border-radius: 4px;
+  display: block;
 }
+
 .mytree::-webkit-scrollbar {
-    width: 6px;  
-    height: 6px;   /* 设置滚动条高度 */
-    background-color: #f1f1f1;
-    display: block;
+  width: 6px;
+  height: 6px;
+  /* 设置滚动条高度 */
+  background-color: #f1f1f1;
+  display: block;
 }
+
 .mytree .el-tree-node.is-current>.el-tree-node__content {
   color: var(--centalineBlue) !important;
   background-color: #f5f7fa;
 }
+
 .tree-line:first-child div {
   overflow: hidden;
 }
@@ -504,6 +511,4 @@ export default {
 .box-menu .opertion:hover {
   color: var(--btnHoverRed);
 }
-
 </style>
-

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

@@ -789,11 +789,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       //设置行样式
       setStyleRow(rows) {
         rows.forEach((row) => {
-          if (!row.$style) {
-            row.$style = {};
-          }
           if (rtn.rowColorColumn && row[rtn.rowColorColumn]) {
-            row.$style.color = row[rtn.rowColorColumn];
+            row.rowStyle = row.rowStyle + ";color:" + row[rtn.rowColorColumn] + ";";
           }
         });
       },

package/src/main.js

@@ -76,7 +76,7 @@ Vue.use(centaline, {
         estateId: '',
 
         authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"588NJK","time":1733886962541,"sign":"7cb413ac60ed50fe406c9b91c8d4a836","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc5ZThjMmI3LTg5NmUtNDc5MS1iZmYxLWM5YWE2NzhlMWZmYiJ9.CRhyx5tOWgVA5l5wmcjIuAyjAlgN9zCAvLoDQ9xjHbW9iLfdz8_fjhbe3QwoS4nQ7tzrzPu97PfVZNw0mQP6cA',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImIyYzIyYTNkLWZhOGQtNDIwZi1hMTQ3LTIzN2I5OWY1NTQyNSJ9.tyabbMCMbIcy5orjkpiO6ShZeZGIiNirKBKgdiqMPYvBfRCNTMYbsamHNe5rCtOSB6t5KA-Fwsv_GA6ENoJ1Lg',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作