centaline-data-driven 1.5.3 → 1.5.5

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/tran-comm-adjust/create'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/agenttrans/transaction/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -11,21 +11,8 @@
     name: 'DataDrivenForm',
     data() {
       return {
-        apiParam:{actionType
-: 
-"2",
-commAdjustCategory
-: 
-"CC01020020",
-originalTraId
-: 
-"1650403741662187522",
-pageOnly
-: 
-"true",
-pageStyle
-: 
-"2"
+        apiParam:{
+          propertyId: "202107291113120FACCA4E24992E8B26", actionType: 2
         },
         topHeight:10,
       }

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

@@ -144,7 +144,7 @@
       },
       //添加账号
       addRow() {
-          var app = this;
+        var app = this;
         if (app.model.dialogEdit) {
           app.model.addRow(() => {
             app.$forceUpdate();

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

@@ -779,6 +779,22 @@ export default {
         self.scrollTop = self.$refs.tableParent.scrollTop;
       }
     },
+    resetScrollActivated: function () {
+      if(this.$refs.tableParent){
+        if(this.scrollTop>this.$refs.tableParent.scrollTop) {  
+          this.$refs.tableParent.scrollTop = this.scrollTop;
+        }
+        else if(this.model.selectIndex > 5  && this.$refs.tableParent.scrollTop===0){
+          let index = 0;
+          let topHeigth = 0;
+          for (; index < this.model.selectIndex; index++) {
+            topHeigth = topHeigth + (this.model.listData[index].$heigth ? this.model.listData[index].$heigth : 31);
+          }
+          this.scrollTop = topHeigth;
+          this.$refs.tableParent.scrollTop = this.scrollTop;
+        }
+      }
+    },
     rowKeyDownHandle(ev, action) {
       var self = this;
       if (action === 1) {

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

@@ -191,6 +191,11 @@
           this.$refs.table.setTableHeight();
         }
       },
+      resetScrollActivated() {
+        if(this.$refs.table){
+          this.$refs.table.resetScrollActivated();
+        }
+      },
       resizeSearchList() {
         if(this.flagSideBar && this.flagSideBarOfData){
           if(this.sideBarStatus=='open' && this.$refs.main){

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

@@ -22,7 +22,7 @@
       <div v-if="categorySource" class="el-tabs__content">
         <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
           <ct-searchlistOne v-if="col.loaded" :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
-            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="screenPara" @tableLoaded="tableLoaded">
+            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="col.screenPara" @tableLoaded="tableLoaded">
           </ct-searchlistOne>
         </div>
       </div>
@@ -76,10 +76,8 @@
     },
     activated() {
       this.$nextTick(() => {
-        if(this.$refs.detail){
-          if(this.$refs.detail.$children && this.$refs.detail.$children.length>0){
-            this.$refs.detail.$children[0].refreshPage();
-          }
+        if(this.categorySource) {    
+          this.$refs['searchlist'+this.activeIndex][0].resetScrollActivated();
         }
       })
     },
@@ -119,7 +117,7 @@
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
               self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
-              self.screenPara=parm;
+              self.categorySource.selectItems1[0].screenPara=parm;
               self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
               self.categorySource.selectItems1[0].loaded=true;
             }
@@ -136,9 +134,10 @@
         this.label=this.categorySource.selectItems1[i].displayName;
         if(this.categorySource.selectItems1[i].loaded){
           this.$refs['searchlist'+i][0].resize();
+          this.$refs['searchlist'+i][0].resetScrollActivated();
         }
         else {
-          this.screenPara=parm;
+          this.categorySource.selectItems1[i].screenPara=parm;
           this.categorySource.selectItems1[i].loaded=true;
           this.isLoading=true;
         };

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

@@ -1,6 +1,6 @@
 <template>
   <div class='mytree' style="overflow:auto" :style="{height:treeHeight}">
-      <el-tree :data="treeData" class="tree-line" :props="defaultProps" :load="loadNode" :indent="0"
+      <el-tree  class="tree-line" :props="defaultProps" :load="loadNode" :indent="0"
         :expand-on-click-node="false" @node-click="handleNodeClick" lazy ref="Tree">
       </el-tree>
   </div>
@@ -26,7 +26,8 @@ export default {
       LastClickNode: {},
       para: {},
       filterText: '',
-      treeData: [],      // 树节点
+
+      lastData:[],
       defaultProps: {
         label: 'name',
         key: 'Key',
@@ -34,7 +35,8 @@ export default {
         isLeaf: "isLeaf",
         id: 'code'
       },
-      treeHeight:'100%'
+      treeHeight:'100%', 
+      searchStatus:[]
     };
   },
   methods: {
@@ -42,12 +44,36 @@ export default {
     this.treeHeight='100%';
     },
     search(m) {
-      this.treeNode.childNodes = [];
-      this.searchComplate(m, undefined, this.treeResolve);
+      var self=this; 
+      var timer=null; 
+          if(self.loadComplate()&&self.searchStatus.length==0)
+          { 
+            clearTimeout(timer);
+            self.searchStatus.push(1); 
+            self.treeNode.childNodes = [];
+            self.searchComplate(m, undefined, self.treeResolve);
+          }
+          else{
+             timer = setTimeout(() => { 
+                   self.search();
+              },200);
+          }
+    },
+    loadComplate(){
+      var flag=false;
+       this.treeNode.childNodes.forEach((item, index) => {
+        if(item.data.code==this.model.modeltree[index].code){
+          flag=true;
+          return;
+        }   
+      });
+      return  flag;
     },
     loadNode(node, resolve) {        // 加载 树数据
+    
       let self = this;
       if (node.level === 0) {
+        
         self.treeNode = node;
         self.treeResolve = resolve;
         return self.loadtreeData(resolve);
@@ -66,14 +92,17 @@ export default {
       };
       this.searchComplate(model, undefined, resolve);
     },
-    load(data, resolve) {
+  async  load(data, resolve) { 
       var self = this;
       self.model = data;
       var treeResolve = resolve || self.treeResolve;
-      treeResolve(data.modeltree);
+     treeResolve(data.modeltree);
+     if(self.searchStatus.length>0)
+      {
+         self.searchStatus=self.searchStatus.slice(1)
+      }
       self.LastResolve = treeResolve;
 
-      
     },
     searchComplate(m, defaultSearch, resolve) {
       var self = this;

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

@@ -361,7 +361,7 @@ const FormList = function (source, master) {
       self.currentRowIndex=index;
       var dialogOption = {
         title: '修改',
-        pane: common.getParentPane(self.$self),
+        pane: common.getParentPane(self),
         content: [{
           component: 'ct-form',
           attrs: {
@@ -451,8 +451,8 @@ const FormList = function (source, master) {
                 }
               ]
             },
-            width: '500px',
-            height: '400px'
+            width: rtn.pageWidth+'px',
+            height: rtn.pageHeight+'px'
           },
           on: {
             submit: function (ev) {

package/src/main.js

@@ -17,6 +17,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
   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",
+  // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
@@ -49,7 +50,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '9dac5622-e8b2-46c4-aa90-b5bfd0d1b1e8',
+        oldToken: '7227389b-a6c5-4c0a-bc24-d629eaece3cb',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjr0OgjAURt-lMzdpe3_KZYPSLj4EAQIJTkYg0RjfXY26uXuGbzjL-W5m3QdTGZSgdRIHkakEEseglDNEK6KYLWLbdvoBfsyXjkLUuk4ByDYClDmB-pgBlZuWUh3aJKYw0-VkKielF0JkV5il396CWfQl9nU6H6brP84dt-WZ1ZFtL0TAQRGoVw9D8Aw0DzzPOgYUNfcHAAAA__8.sJA4ggjcul71iwN0kmGK210TEUKaipDHTsvmEHQSHBM',
         
         originalRequestURL: 'http://10.88.22.67:8080',