centaline-data-driven 1.5.30 → 1.5.32

package/package.json

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

package/release-log.md

@@ -1,27 +1,40 @@
-## v1.5.29
-2023-07-10
+## v1.5.32
+2023-07-11
 
-优化
+bug修复
 
-树组件右键样式与逻辑优化
+快捷跟进保存后会关闭tab处理
 
-## v1.5.29
-2023-07-07
+## v1.5.31
+2023-07-11
+
+新增
+
+树组件删除节点后触发下一节点事件
 
 优化
 
-树组件新增右键增改删逻辑优化
+商铺实勘提示与被遮挡住了一部分问题
 
-ccai通过js给input输入框value赋值，v-model绑定值不同步问题
+## v1.5.30
+2023-07-11
 
-## v1.5.29
-2023-07-04
+新增
+
+搜索按钮增加搜索条件保存
 
 优化
 
+树组件右键样式与逻辑优化
+
+树组件新增右键增改删逻辑优化
+
+ccai通过js给input输入框value赋值，v-model绑定值不同步问题
+
 树组件新增右键增改删功能
 
 修改上传图片修改和删除图标的颜色
+
 ## v1.5.29
 2023-06-30
 

package/src/SearchList.vue

@@ -6,7 +6,7 @@
     
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
 
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist> -->
 
 
     <!-- <ct-searchlist :apiParam="para"
@@ -70,7 +70,7 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist>
     
     <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 

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

@@ -115,7 +115,7 @@
       <div ref="shortcutFollow"
         v-if="!model.flagHiddenSensitiveInfo && model.shortcutFollowForm !== undefined && model.shortcutFollowForm !== null"
         class="shortcutFollow" style="margin-top: 16px;">
-        <ct-form :source="model.shortcutFollowForm" @submit="saveShortcutFollow"></ct-form>
+        <ct-form :source="model.shortcutFollowForm" @submit="saveShortcutFollow" :openType="'detail'"></ct-form>
       </div>
       <div v-if="!model.flagHiddenSensitiveInfo" class="tablist-info base-box">
         <div class="details-tabs-box">

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

@@ -808,6 +808,10 @@
       },
       changeHandler(field) {
         var self = this;
+
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        
         if (typeof field.change !== 'undefined') {
           if (typeof this.model.scripts !== 'undefined') {
             this.model.scripts.formData.setExcuteListData(this.model.fields);
@@ -817,8 +821,6 @@
         }
 
         self.model.isChanged = true;
-        self.model.hiddenHandle(field);
-        self.model.requiredHandle(field);
         //self.model.validMrf(field);
 
         if (field.onAfterChanged && field.type !== 4) {
@@ -1131,6 +1133,7 @@
 
   .ct-collapse-item-title .el-collapse-item__header {
     color: #303133 !important;
+    line-height: normal;
   }
 
   .el-collapse-saveLine .ct-collapse-item-title:last-child .el-collapse-item__wrap {

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -111,24 +111,26 @@
       validExcute() {
         var self = this;
         var rtnBool = true;
-        if (!self.fieldsValidExcute()) {
-          rtnBool = false;
-        }
-        else if (this.model.tableData.length < this.model.min) {
-          self.$message({
-            message: this.model.title + " 最少需要" + this.model.min+"条数据",
-            type: 'warning',
-            showClose: true,
-          });
-          rtnBool = false;
-        }
-        if (rtnBool && self.model.required && this.model.tableData.length === 0) {
-          self.$message({
-            message: this.model.title + " 表格不能为空",
-            type: 'warning',
-            showClose:true,
-          });
-          rtnBool = false;
+        if (this.model.show) {
+          if (!self.fieldsValidExcute()) {
+            rtnBool = false;
+          }
+          else if (this.model.tableData.length < this.model.min) {
+            self.$message({
+              message: this.model.title + " 最少需要" + this.model.min + "条数据",
+              type: 'warning',
+              showClose: true,
+            });
+            rtnBool = false;
+          }
+          if (rtnBool && self.model.required && this.model.tableData.length === 0) {
+            self.$message({
+              message: this.model.title + " 表格不能为空",
+              type: 'warning',
+              showClose: true,
+            });
+            rtnBool = false;
+          }
         }
         return rtnBool;
       },

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

@@ -11,7 +11,7 @@
                    @click="clickHandler(col)" @change="changeHandler(col,$event)" @SaveSearchWhere="SaveSearchWhere" @SearchWhereManage="SearchWhereManage" @clichSearchWhere="clichSearchWhere"></component>
       </div>
       <div class="shortcutFollow max-shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
-        <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
+        <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut" :openType="'detail'"></ct-form>
       </div>
       <div class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-show="highScreen" trigger="click" visible-arrow="false">
         <div style="width:100%">

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue

@@ -65,6 +65,10 @@
       flagPopupSearchlist:{
         Boolean,
         default:false,
+      },      
+      openMultiListIndex:{
+        Number,
+        default: -1,
       },
     },
     created() {
@@ -73,6 +77,9 @@
       if(this.apiParam && this.apiParam.isIframe && this.apiParam.isIframe=='true'){
         this.isIframe=true;
       }
+      if(this.openMultiListIndex>-1){
+        this.activeIndex=this.openMultiListIndex;
+      }
     },
     activated() {
       this.$nextTick(() => {
@@ -117,9 +124,9 @@
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
               self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
-              self.categorySource.selectItems1[0].screenPara=parm;
+              self.categorySource.selectItems1[self.activeIndex].screenPara=parm;
               self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
-              self.categorySource.selectItems1[0].loaded=true;              
+              self.categorySource.selectItems1[self.activeIndex].loaded=true;              
               window.addEventListener("resize", (ev) => {
                 self.resize();
               });
@@ -131,6 +138,12 @@
         );
       },
       categorychangeHandler() {
+        if(this.categorySource.routerKey && this.categorySource.routerKey=='openMultiList1212'){
+          this.activeIndex=this.openMultiListIndex>-1?this.openMultiListIndex:0;
+          this.$common.getDataDrivenOpts().handler.openTabRouter('ofi_propertyList', '');
+          return;
+        }
+
         let i = this.activeIndex;
         let parm={};
         parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;

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

@@ -1,7 +1,7 @@
 <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-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' }">
@@ -40,7 +40,7 @@ export default {
         key: 'Key',
         children: 'children',
         isLeaf: "isLeaf",
-        id: 'code'
+        id: 'code',
       },
       searchStatus: [],
       loading: true,
@@ -51,6 +51,7 @@ export default {
       currentData: {},// 定义变量接收该节点所对应的对象
       currentNode: {},
       formActionRouter: {},
+      currentNodeIndex: 0,// 当前节点索引
     };
   },
 
@@ -92,7 +93,6 @@ export default {
 
       let self = this;
       if (node.level === 0) {
-
         self.treeNode = node;
         self.treeResolve = resolve;
         return self.loadtreeData(resolve);
@@ -115,7 +115,6 @@ export default {
       var self = this;
       self.model = data;
       self.model.$vue = self;
-      console.log('self.model.actionRouter', self.model.actionRouter);
       var treeResolve = resolve || self.treeResolve;
       treeResolve(data.modeltree);
       if (self.searchStatus.length > 0) {
@@ -136,6 +135,8 @@ export default {
     handleNodeClick(data) {
       this.foo();
       var self = this;
+      self.currentNodeKey = data.code
+      self.$refs.Tree.setCurrentKey(data.code)
       if (self.LastClickNode != data) {
         self.LastClickNode = data;
         var rowRouter = self.model.rowSelectRouter;
@@ -148,16 +149,15 @@ export default {
           newdata.rowRouter = rowdata
           self.$emit('loaded', newdata);
         });
-
       }
     }
     ,
-    rightClick(event, object, Node, element) { // event、object该节点所对应的对象、节点对应的 Node、节点组件本身
+    rightClick(event, object, Node) { // event、object该节点所对应的对象、节点对应的 Node、节点组件本身
 
       this.currentData = object  // 定义变量接收该节点所对应的对象
 
       this.currentNode = Node // 定义变量接收该节点对应的 Node
- 
+
       if (Node.level === 1) { // 判断节点是否为第一层节点  
 
         this.firstLevel = true // 是的话显示同级添加选项
@@ -186,11 +186,8 @@ export default {
 
     foo() {
       this.menuVisible = false
-
       //  要及时关掉监听，不关掉的是一个坑，不信你试试，虽然前台显示的时候没有啥毛病，加一个alert你就知道了
-
       document.removeEventListener('click', this.foo)
-
     },
     // 打开弹层
     openDialog(field, apiParam, callBack) {
@@ -249,10 +246,10 @@ export default {
       }
 
     },
+    // 菜单路由
     routerClickHandler(action) {
       let self = this;
       var actionRouterData = {};
-
       action.submitFormField.forEach(v => {
         actionRouterData[v] = self.currentData[v];
       })
@@ -264,27 +261,40 @@ export default {
       })
     },
     //删除树节点
-    remove(newData){ 
+    remove(newData) {
       let self = this;
+      self.getNextClickNode()
       this.$refs.Tree.remove(self.currentNode);
-
     },
     //新增树节点
-    add(newData){ let self = this;
-     this.$refs.Tree.append(newData,self.currentNode)
-
+    add(newData) {
+      let self = this;
+      this.$refs.Tree.append(newData, self.currentNode)
+      this.handleNodeClick(newData)
     },
     //修改树节点
-    update(newData){
-      let self = this; 
+    update(newData) {
+      let self = this;
       for (let key in newData) {
-             if (typeof newData[key] === 'object') {
-              self.$set(self.currentData, key, { ...self.currentData[key], ...newData[key] });
-             } else {
-              self.$set(self.currentData, key, newData[key]);
-             }
-          }
+        if (typeof newData[key] === 'object') {
+          self.$set(self.currentData, key, { ...self.currentData[key], ...newData[key] });
+        } else {
+          self.$set(self.currentData, key, newData[key]);
+        }
+      }
+      this.handleNodeClick(newData)
     },
+    getNextClickNode() {
+      const tree= this.$refs.Tree;
+      const node = tree.getNode(this.currentData.code);
+     if (node.nextSibling) {
+      this.handleNodeClick(node.nextSibling.data)
+     } else if(node.previousSibling) {
+      this.handleNodeClick(node.previousSibling.data)
+     }else if(node.parent){
+      this.handleNodeClick(node.parent.data)
+     }
+    }
   },
   created() {
     this.model = this.vmodel;
@@ -298,9 +308,8 @@ export default {
 
 .mytree .el-tree-node.is-current>.el-tree-node__content {
   color: var(--centalineBlue) !important;
+  background-color: #f5f7fa;
 }
-
-
 .tree-line:first-child div {
   overflow: hidden;
 }
@@ -442,12 +451,15 @@ export default {
     cursor: pointer;
   }
 }
-.box-menu .opertion{
+
+.box-menu .opertion {
   cursor: pointer;
-line-height: 30px;
+  line-height: 30px;
 }
-.box-menu .opertion:hover{
+
+.box-menu .opertion:hover {
   color: var(--btnHoverRed);
 }
+
 </style>
 

package/src/main.js

@@ -14,7 +14,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
+  baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
@@ -23,7 +23,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://10.58.2.108:8080/",
-  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
   flagRouterSelf: true,
   zindex: 999,
@@ -37,6 +37,9 @@ Vue.use(centaline, {
     openTabSearch: function (field, submitData) {
       alert("打开tab页Search:" + field.action)
     },
+    openTabRouter: function (action) {
+      alert("打开tab页:" + action)
+    },
     openDetail: function (action) {
       alert("打开tab页:" + action)
     },
@@ -55,7 +58,7 @@ Vue.use(centaline, {
       return {
         oldToken: 'f9baa4f5-069e-4bae-8438-a89365fb067e',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO-ydVbyZ22v08WbpOEQyCFGChUiiQRC3J0ghY6eV0zxipl5wrwOUEPLjSLpLUpnHFIbHDZ9YEzCrJIJlhIf4w7-iC9HrSkG7TtsYhAkTxZZC6OQF-rbzkpqoYJyv0Kt_dYejbGqgikvu1COP2Kdy-1QHv84d1mmbVaz8jmbM2blA1IeMw4jFSTjHBNTUOoErzcAAAD__w.G0v6h6v6Lns3jQ3YdJBc8hy4mdJVKnqd5t4YZ50aQT4"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy9p-x7tKxttYfEjSFsgwckIJBrjv6tRN3fPcIeznHsT655FIyK3kkKPEDpdA0VbQ9tbBh-YpdcWyfPgPsCP-TIoRc4q00HrbAAyhMAqMAQygfrYYfBRVGK6nESjDDulsSZXiSVtbyHRqpfY1-l8mK7_OHfclmc2jSMpqQ1kxBkIZ4JckgPUxaXMXEptxf0BAAD__w.yb_P0UjgJEHUMipFMJIHEge9cR5lopQH8Wvz1qvQQos"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',