centaline-data-driven 1.3.32 → 1.3.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.32",
+  "version": "1.3.35",
   "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,12 +200,20 @@ const api = {
             attrs: {
               progressAction: data.content.action,
               progressKey: data.content.key,
-              width: '300px',
-              height: '60px'
+              progressType:'export',
+              width: '350px',
+              height: '165px'
             },
             on: {
               finished() {
                 Vue.prototype.$common.closeDialog(dialogOption.dialog);
+              },
+              error(data) {
+                Vue.prototype.$common.closeDialog(dialogOption.dialog);
+                Vue.prototype.$message({
+                  message: data.rtnMsg,
+                  type: 'info'
+                });
               }
             }
           }]

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>
@@ -413,10 +414,42 @@
               else if (field.isSeeVoice) {//看视频              
                 self.$common.browseVideo(field,submitData)
               }
-              else if (field.isExport) {
+              else if (field.isExport || field.flagAsync) {
                 submitData = field.getActionPara(submitData).para;
                 if(field.flagAsync){
-                  self.model.export(field, submitData);
+                  field.doAction(submitData, (res) => {
+                    if(res.content && res.content.action){
+                      var dialogOption = {
+                        title: field.pageTitle || field.label,
+                        content: [{
+                          component: 'ct-progress',
+                          attrs: {
+                            progressAction: res.content.action,
+                            progressKey: res.content.key,
+                            progressType:'import',
+                            width: '350px',
+                            height: '165px'
+                          },
+                          on: {
+                            finished(data) {
+                              self.$common.closeDialog(dialogOption.dialog);
+                              if(field && field.changeCallBackFunName){
+                                self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
+                              }
+                              else{
+                                self.model.doAction(data);
+                              }
+                            },
+                            error(data) {
+                              self.$common.closeDialog(dialogOption.dialog);
+                              self.$message.warning(data.rtnMsg);
+                            }
+                          }
+                        }]
+                      };
+                      self.$common.openDialog(dialogOption);
+                    }
+                  });
                 }
                 else{
                   field.doAction(submitData, (data) => {
@@ -484,11 +517,47 @@
         }
       },
       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: field.pageTitle || field.label,
+              content: [{
+                component: 'ct-progress',
+                attrs: {
+                  progressAction: res.content.action,
+                  progressKey: res.content.key,
+                  progressType:'import',
+                  width: '350px',
+                  height: '165px'
+                },
+                on: {
+                  finished(data) {
+                    self.$common.closeDialog(dialogOption.dialog);
+                    if(field && field.changeCallBackFunName){
+                      self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
+                    }
+                    else{
+                      self.model.doAction(data);
+                    }
+                  },
+                  error(data) {
+                    self.$common.closeDialog(dialogOption.dialog);                    
+                    self.$message.warning(data.rtnMsg);
+                  }
+                }
+              }]
+            };
+            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: [] },
             ];
@@ -909,9 +908,36 @@ export default {
             };
             self.$common.openDialog(dialogOption);
           }
-          else if (field.isExport) {
+          else if (field.isExport || field.flagAsync) {
             if(field.flagAsync){
-              self.model.export(field, submitData);
+              field.doAction(submitData, (res) => {
+                if(res.content && res.content.action){
+                  var dialogOption = {
+                    title: field.pageTitle || field.label,
+                    content: [{
+                      component: 'ct-progress',
+                      attrs: {
+                        progressAction: res.content.action,
+                        progressKey: res.content.key,
+                        progressType:'import',
+                        width: '350px',
+                        height: '165px'
+                      },
+                      on: {
+                        finished() {
+                          self.$common.closeDialog(dialogOption.dialog);
+                          self.getPage(1);
+                        },
+                        error(data) {
+                          self.$common.closeDialog(dialogOption.dialog);
+                          self.$message.warning(data.rtnMsg);
+                        }
+                      }
+                    }]
+                  };
+                  self.$common.openDialog(dialogOption);
+                }
+              });
             }
             else{
               if(field.action.indexOf("http://")===0 || field.action.indexOf("https://")===0){
@@ -953,42 +979,40 @@ export default {
                       submit(ev) {
                         if (ev.responseData.notification == 24) {
                           //更新列
-                            self.model.selectIndex=0;
-                            if (self.currentRow !== null) {
-                              for (var i = 0; i < self.currentRow.children.length; i++) {
-                                self.currentRow.children[i].classList.remove("select");
-                              }
+                          self.model.selectIndex=0;
+                          if (self.currentRow !== null) {
+                            for (var i = 0; i < self.currentRow.children.length; i++) {
+                              self.currentRow.children[i].classList.remove("select");
+                            }
+                          }
+                          if (typeof self.$refs.tableParent !== "undefined") {
+                        self.$refs.tableParent.scrollTop = 0;
+                        self.$refs.tableParent.scrollLeft = 0;
+                        self.scrollTop = 0;
+                        self.scrollLeft = 0;
+                          }
+                          self.$forceUpdate();
+                          self.$nextTick(() => {
+                            if (
+                              self.$refs.tableParent.scrollHeight <=
+                              self.$refs.tableParent.offsetHeight
+                            ) {
+                              self.tableLoading = true;
+                              self.model.nextPage(next);
+                            } else {
+                              self.tableLoading = false;
+                              self.rowColorChange();
+                              self.resetScroll();
+                              self.calculatingRowHeight();
+                              self.getScrollAttr();
                             }
-                             if (typeof self.$refs.tableParent !== "undefined") {
-                            self.$refs.tableParent.scrollTop = 0;
-                            self.$refs.tableParent.scrollLeft = 0;
-                            self.scrollTop = 0;
-                            self.scrollLeft = 0;
-                             }
-                            self.$forceUpdate();
-                            self.$nextTick(() => {
-                              if (
-                                self.$refs.tableParent.scrollHeight <=
-                                self.$refs.tableParent.offsetHeight
-                              ) {
-                                self.tableLoading = true;
-                                self.model.nextPage(next);
-                              } else {
-                                self.tableLoading = false;
-                                self.rowColorChange();
-                                self.resetScroll();
-                                self.calculatingRowHeight();
-                                self.getScrollAttr();
-                              }
-                              self.setfixedSize();
-                            });
+                            self.setfixedSize();
+                          });
                           self.loaderObj.SearchTable(self.api,self.load,self.model.searchModel,true);
                           self.$common.closeDialog(dialogOption.dialog);
-                        } else {
-                          if (
-                            !field.flagFreshCurrentRow &&
-                            !field.flagAddRowAfterAction
-                          ) {
+                        } 
+                        else {
+                          if (!field.flagFreshCurrentRow &&!field.flagAddRowAfterAction) {
                             self.model.doAction(ev);
                           }
                           self.$forceUpdate();
@@ -1064,10 +1088,7 @@ export default {
               self.operationLoading = true;
               field.doAction(submitData, (data) => {
                 self.operationLoading = false;
-                if (
-                  !field.flagFreshCurrentRow &&
-                  !field.flagAddRowAfterAction
-                ) {
+                if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                   self.model.doAction({ responseData: data });
                   self.$emit("refreshRowHandle");
                 }
@@ -1410,8 +1431,45 @@ export default {
         );
       }
     },
-    importComplete(res) {
-      this.model.doAction(res);
+    importComplete(res,field) {
+      var self=this;
+      if(field.flagAsync){
+        if(res.content && res.content.action){
+          console.log(field.pageTitle || field.label)
+          var dialogOption = {
+            title: field.pageTitle || field.label,
+            content: [{
+              component: 'ct-progress',
+              attrs: {
+                progressAction: res.content.action,
+                progressKey: res.content.key,
+                progressType:'import',
+                width: '350px',
+                height: '165px'
+              },
+              on: {
+                finished() {
+                  self.$common.closeDialog(dialogOption.dialog);
+                  self.getPage(1);
+                },
+                error(data) {
+                  self.$common.closeDialog(dialogOption.dialog);
+                  self.$message.warning(data.rtnMsg);
+                }
+              }
+            }]
+          };
+          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/SearchScreen.js

@@ -148,8 +148,7 @@ const SearchScreen = function (source, callBack, screenPara) {
         });
       },
       //如果是复选框则searchValue1格式为 1,2
-      get searchData() {
-      
+      get searchData() {      
         let that=this;
         var rtn = {
           fields: []
@@ -157,19 +156,16 @@ const SearchScreen = function (source, callBack, screenPara) {
         this.screen.forEach((v) => {
           var tempObj = common.deepClone(v.searchObj);          
           if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-            if(that.isHandle(v.type))
-            {
+            if(that.isHandle(v.type)){
               tempObj.searchValue1=that.getNewSearchValue(tempObj); 
             }
-            rtn.fields.push(tempObj);
-           
+            rtn.fields.push(tempObj);           
           }
         });
         this.highScreen.forEach((v) => {
           var tempObj = common.deepClone(v.searchObj);
           if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-            if(that.isHandle(v.type))
-            {
+            if(that.isHandle(v.type)){
               tempObj.searchValue1=that.getNewSearchValue(tempObj); 
             }
             rtn.fields.push(tempObj);
@@ -177,6 +173,35 @@ const SearchScreen = function (source, callBack, screenPara) {
         });
         return rtn;
       },
+      get searchDataOfHide() {      
+        let that=this;
+        var rtn = {
+          fields: []
+        };
+        this.screen.forEach((v) => {
+          if(v.type===Enum.ControlType.Hidden){
+            var tempObj = common.deepClone(v.searchObj);          
+            if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+              if(that.isHandle(v.type)){
+                tempObj.searchValue1=that.getNewSearchValue(tempObj); 
+              }
+              rtn.fields.push(tempObj);           
+            }
+          }
+        });
+        this.highScreen.forEach((v) => {
+          if(v.type===Enum.ControlType.Hidden){
+            var tempObj = common.deepClone(v.searchObj);
+            if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+              if(that.isHandle(v.type)){
+                tempObj.searchValue1=that.getNewSearchValue(tempObj); 
+              }
+              rtn.fields.push(tempObj);
+            }
+          }
+        });
+        return rtn;
+      },
       getNewSearchValue(tempObj)
       {
           let codeList=JSON.parse(tempObj.searchValue1);
@@ -264,13 +289,6 @@ const SearchScreen = function (source, callBack, screenPara) {
         });
       },
       export(btn, submitData) {
-        //Axios.post(common.globalUri(), { action: btn.action, search: this.searchData }).then((response) => {
-        //  var fileName = response.data.content.fieldName1;
-        //  var fileContent = window.atob(response.data.content.code1);
-        //  common.saveFile(fileName, fileContent);
-        //}).catch((ex) => {
-        //  console.log(ex);
-        //});
         Vue.prototype.$api.postHandler(common.globalUri(),
           {
             action: btn.action,