centaline-data-driven 1.3.32 → 1.3.33

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/task'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,7 +14,11 @@
     data() {
       return {
         apiParam:{
-originalTraId:"1541678215431274497",actionType:3,pageStyle:2,pageTitle:"成交报告",pageOnly:true
+actionType: "1",
+businessId: "1550013042447081473",
+pageOnly: "true",
+pageStyle: "2",
+stepId: "1550014106894327810"
           }
       }
     },

package/src/centaline/api/index.js

@@ -200,6 +200,7 @@ const api = {
             attrs: {
               progressAction: data.content.action,
               progressKey: data.content.key,
+              progressType:'export',
               width: '300px',
               height: '60px'
             },

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

@@ -74,6 +74,7 @@
             <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
         </el-row>
+        <div v-if="isScroll" style="height: 34px;"></div>
       </component>
     </div>
     <div style="min-height:200px" v-if="loading"></div>
@@ -484,11 +485,43 @@
         }
       },
       importComplete(res,field) {
-        if(field && field.changeCallBackFunName){
-          this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+        var self=this;
+        if(field.flagAsync){
+          if(res.content && res.content.action){
+            var dialogOption = {
+              title: "导入",
+              content: [{
+                component: 'ct-progress',
+                attrs: {
+                  progressAction: res.content.action,
+                  progressKey: res.content.key,
+                  progressType:'import',
+                  width: '300px',
+                  height: '60px'
+                },
+                on: {
+                  finished(data) {
+                    self.$common.closeDialog(dialogOption.dialog);
+                    if(field && field.changeCallBackFunName){
+                      self.changeCallBackHandler(field, field.changeCallBackFunName, data.content.content);
+                    }
+                    else{
+                      self.model.doAction(data);
+                    }
+                  }
+                }
+              }]
+            };
+            self.$common.openDialog(dialogOption);
+            }
         }
         else{
-          this.model.doAction(res);
+          if(field && field.changeCallBackFunName){
+            this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+          }
+          else{
+            this.model.doAction(res);
+          }
         }
       },
       changeHandler(field) {

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

@@ -71,7 +71,7 @@
   var ctSpan = {//临时的span组件对象，用于vue双向绑定，强制更新
     props: {
       vmodel: Object,
-      rowNum: Number,
+      rowNum: String,
     },
     data: function () {
       return {
@@ -105,6 +105,7 @@
       }
     },
     created() {
+      
       let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;

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

@@ -842,8 +842,7 @@ export default {
           else if (field.isSeeVoice) {//看视频
             self.$common.browseVideo(field, submitData);
           } 
-          else if (field.isBrowseAttachment) {
-		   //浏览附件
+          else if (field.isBrowseAttachment) {//浏览附件
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
             ];
@@ -1410,8 +1409,40 @@ export default {
         );
       }
     },
-    importComplete(res) {
-      this.model.doAction(res);
+    importComplete(res,field) {
+      var self=this;
+      if(field.flagAsync){
+        if(res.content && res.content.action){
+          var dialogOption = {
+            title: "导入",
+            content: [{
+              component: 'ct-progress',
+              attrs: {
+                progressAction: res.content.action,
+                progressKey: res.content.key,
+                progressType:'import',
+                width: '300px',
+                height: '60px'
+              },
+              on: {
+                finished() {
+                  self.$common.closeDialog(dialogOption.dialog);
+                  self.getPage(1);
+                }
+              }
+            }]
+          };
+          self.$common.openDialog(dialogOption);
+          }
+      }
+      else{
+        if(field && field.changeCallBackFunName){
+          this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+        }
+        else{
+          this.model.doAction(res);
+        }
+      }
     },
     tdRowspan(column, row) {
       if (!column.show) {

package/src/centaline/dynamicSearchList/src/dynamicTableToolbar.vue

@@ -62,8 +62,8 @@ export default {
       }
       return this.searchModel ? this.searchModel.searchData : {};
     },
-    importComplete(res) {
-      this.$emit("importComplete", res);
+    importComplete(res,field) {
+      this.$emit("importComplete", res,field);
     }
   }
 };

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

@@ -116,9 +116,10 @@ const FormList = function (source, master) {
         this._rows = [];
         //遍历每一行
         source.rows.forEach((r) => {
+          var gid = rtn.guid();
+          r.$sourceIndex = gid;
           var row = rtn.initRow(r);
-          this._rows.push(row);
-          rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
+          this._rows.push(row); 
         });
         return this._rows;
       }
@@ -135,6 +136,8 @@ const FormList = function (source, master) {
         },
         get deleted() {//是否已删除
           return r.flagDeleted === true;
+        }, get deleted() {//是否已删除
+          return r.flagDeleted === true;
         },
         set deleted(v) {
           if (v) {
@@ -143,7 +146,13 @@ const FormList = function (source, master) {
           else {
             r.flagDeleted = false;
           }
+        }, get $sourceIndex() {//GID
+          return r.$sourceIndex||"";
+        },
+        set $sourceIndex(v) {//GID
+          return r.$sourceIndex=v;
         }
+        ,
       };
       //遍历每一列
       let rowIndex = 0;
@@ -179,8 +188,8 @@ const FormList = function (source, master) {
         var row = {};
         for (let i = 1; i < rows.length; i++) {//遍历每一行
           if (!rows[i].deleted) {
-            row = {};
-            Vue.set(row, '$sourceIndex', i);
+            row = {}; 
+            Vue.set(row, '$sourceIndex', rows[i].$sourceIndex);
             for (let j = 0; j < rows[i].field.length; j++) {//遍历每一列
               Vue.set(row, field[j].id, rows[i].field[j]);
             }
@@ -208,12 +217,20 @@ const FormList = function (source, master) {
     },
     getCloneRowData(index) {
       let row = {};
-      let sourceRow = source.rows[index];
+      let sourceRow = {}; 
+      if (typeof index == "number") {
+        sourceRow = source.rows[index];
+      }
+      else {
+        let i = source.rows.findIndex(v => v.$sourceIndex ===index);
+        sourceRow = source.rows[i];
+      }
+
       let rowData = rtn.initRow(JSON.parse(JSON.stringify(sourceRow)));
       for (let j = 0; j < rowData.field.length; j++) {//遍历每一列
         row[rowData.field[j].id] = rowData.field[j];
       }
-      row.$sourceIndex = index;
+      row.$sourceIndex =  sourceRow.$sourceIndex+"";
       return row;
     },
     fieldsToTableData(fields) {
@@ -235,7 +252,11 @@ const FormList = function (source, master) {
     updateListField(refs, rowNum, fiedlId) {
       if (refs) {
         let ref = refs.find((v) => {
-          return v.rowNum === rowNum && v.vmodel.id === fiedlId;
+          try {
+            return v.rowNum === rowNum && v.vmodel.id === fiedlId;
+          }
+          catch (e) { 
+          }
         });
         if (ref) {
           ref.$forceUpdate();
@@ -250,12 +271,11 @@ const FormList = function (source, master) {
     //是否是复制的
     isDuplicated(row, index) {
       let isDuplicated = false;
-
       if (rtn.primaryKeys && rtn.primaryKeys.length > 0) {
         for (let i = 1; i < source.rows.length; i++) {//遍历数据源的每一行
           let srow = source.rows[i].columns;
           if (!source.rows[i].flagDeleted) {//该行已删除，跳过
-            if (index === -1 || i !== index) {
+            if (index === -1 || source.rows[i].$sourceIndex !== index) {
               let temp = 0;
               let tempLabel = '';
               for (let j = 0; j < srow.length; j++) {//遍历数据源每一列
@@ -358,7 +378,7 @@ const FormList = function (source, master) {
             setValueByFieldName:function(id, attrKey, attrValue){
               return self.$self.parentModel.setValueByFieldName(id, attrKey, attrValue);
             },
-            getListFieldValue:function(tableName, rowNum, fiedlId, attrName, defaultValue){
+            getListFieldValue: function (tableName, rowNum, fiedlId, attrName, defaultValue) {
               return self.$self.parentModel.getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue);
             },
           }
@@ -367,18 +387,20 @@ const FormList = function (source, master) {
       common.openDialog(dialogOption);
     },
     addSourceRow(row) {
+      var gid = rtn.guid();
       let sourceRow = JSON.parse(JSON.stringify(source.rows[0]));
       for (let k in sourceRow.columns) {
         sourceRow.columns[k] = row[sourceRow.columns[k].fieldName1].source;
       };
+      sourceRow.$sourceIndex = gid;
       source.rows.push(sourceRow);
       let iRow = this.initRow(sourceRow);
       iRow.isNewFlag = true;
-      rtn._rows.push(iRow);
-      rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
+      rtn._rows.push(iRow); 
       Vue.set(row, 'edit', iRow.edit);
       Vue.set(row, 'delete', iRow.delete);
-      row.$sourceIndex = rtn._rows.length - 1;
+      row.$sourceIndex =gid;
+
     },
     addRow(callback) {
       var self = this;
@@ -419,8 +441,9 @@ const FormList = function (source, master) {
               if (!isRepeat) {
                 source.rows.push(row);
                 rtn.rows.push(rowItem);
-                rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
-                rowData.$sourceIndex = source.rows.length - 1;                
+                var gid = rtn.guid();
+                rtn._rows[rtn._rows.length - 1].$sourceIndex =gid;
+                rowData.$sourceIndex =gid;                
                 rowData.edit = rowItem.edit;
                 rowData.delete = rowItem.delete;
                 rowItem.isNewFlag = true;
@@ -435,7 +458,7 @@ const FormList = function (source, master) {
             setValueByFieldName:function(id, attrKey, attrValue){
               return self.$self.parentModel.setValueByFieldName(id, attrKey, attrValue);
             },
-            getListFieldValue:function(tableName, rowNum, fiedlId, attrName, defaultValue){
+            getListFieldValue: function (tableName, rowNum, fiedlId, attrName, defaultValue) {
               return self.$self.parentModel.getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue);
             },
           }
@@ -472,11 +495,12 @@ const FormList = function (source, master) {
           rtn._rows.push(iRow);
           Vue.set(r, 'edit', iRow.edit);
           Vue.set(r, 'delete', iRow.delete);
-          rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
-          r.$sourceIndex = rtn._rows.length - 1;
+          var gid = rtn.guid();
+          rtn._rows[rtn._rows.length - 1].$sourceIndex = gid;
+          r.$sourceIndex = gid;
 
           let rowData = rtn.rowsItemToTableData(iRow)
-          rowData.$sourceIndex = rtn._rows.length - 1;      
+          rowData.$sourceIndex = gid;      
           rowData.edit = iRow.edit;
           rowData.delete = iRow.delete;
           rtn._tableData.push(rowData);
@@ -484,7 +508,7 @@ const FormList = function (source, master) {
       }
     },
     insertOrUpdateRow(row) {
-      if(row){
+      if (row) {
         if(rtn.primaryKeys && rtn.primaryKeys.length>0){
           let iRow = rtn.initRow(row);
           let flagAdd=true;
@@ -520,7 +544,8 @@ const FormList = function (source, master) {
                 }
                 else{
                   let rowData = rtn.rowsItemToTableData(iRow)
-                  iRow.$sourceIndex=r.$sourceIndex;
+                  iRow.$sourceIndex = r.$sourceIndex;  
+                  row.$sourceIndex = r.$sourceIndex;  
                   rowData.$sourceIndex=r.$sourceIndex;    
                   rowData.edit = iRow.edit;
                   rowData.delete = iRow.delete;
@@ -581,6 +606,13 @@ const FormList = function (source, master) {
         });
       }
     },
+    guid() {
+      return (rtn.S4() + rtn.S4() + '-' + rtn.S4() + '-' + rtn.S4() + '-' + rtn.S4() + '-' + rtn.S4() + rtn.S4() + rtn.S4()
+      );
+    },
+    S4() {
+      return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+    }
   };
   return rtn;
 };

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

@@ -914,7 +914,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       }
     );
-  } else {
+  } 
+  else {
     return init(data);
   }
 }

package/src/centaline/progress/src/progress.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="ct-progress">
-    <div>
+    <div style="padding: 5px;">
       <el-progress :text-inside="true" :stroke-width="18" :percentage="percentage"></el-progress>
-      <span>{{message}}</span>
+      <span style="margin-top: 5px;">{{message}}</span>
     </div>
   </div>
 </template>
@@ -13,6 +13,10 @@
     props: {
       progressAction: String,
       progressKey: String,
+      progressType:  {
+        type: String,
+        default: 'export'
+      },
     },
     data() {
       return {
@@ -39,14 +43,21 @@
 
         this.$api.postHandler(this.$common.globalUri(), params, null).then((response) => {
           const data = response.content;
-          if (data && data.rtnMsg) {
-            self.message = data.rtnMsg;
+          if (data) {
+            if(data.processTaskName){
+              self.message = data.processTaskName;
+            }
+            else if(data.rtnMsg){
+              self.message = data.rtnMsg;
+            }
           }
           if (response.rtnCode === 200) {
             this.percentage = data.percentage;
             if (data.flagFinished) {
-              window.open(data.content, "_blank");
-              setTimeout(() => { self.$emit('finished'); }, 800);
+              if(this.progressType=='export'){
+                window.open(data.content, "_blank");
+              }
+              setTimeout(() => { self.$emit('finished',data); }, 800);
             }
             else {
               setTimeout(() => { self.getApiData() }, 1000);

package/src/main.js

@@ -14,8 +14,8 @@ Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  baseUrl: "http://10.88.22.69:8080/", 
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://10.88.22.69:8080/", 
   flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '6c09a5a6-8bb2-46af-beed-9efd51a28263',
+        oldToken: 'a0c6a2be-f79e-47ea-8490-212d5f4f4ff4',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYzMzZiMDJiLTZjOGEtNDIzNC05MGQ5LTliYWI2MTIyNTQzNyJ9.hOxMvGLm03QMPu9C4lgRzkEHC7ECqxJ_L6mfqQRqv39xJ42I8gzSRO-E68vWp-A99ewnxnqvTZ6H_6fOQ9DljQ',