centaline-data-driven 1.3.33 → 1.3.36

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

@@ -908,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){
@@ -952,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();
@@ -1063,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");
                 }
@@ -1413,27 +1435,32 @@ export default {
       var self=this;
       if(field.flagAsync){
         if(res.content && res.content.action){
+          console.log(field.pageTitle || field.label)
           var dialogOption = {
-            title: "导入",
+            title: field.pageTitle || field.label,
             content: [{
               component: 'ct-progress',
               attrs: {
                 progressAction: res.content.action,
                 progressKey: res.content.key,
                 progressType:'import',
-                width: '300px',
-                height: '60px'
+                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){

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="field-top">
-    <div style="width:100%;display:block;">
+    <div style="width:100%;" :style="{ display: (model.inputType === 'textarea' ? 'block' : 'flex') }">
     <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div"  style="flex:1;"
     :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
     @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
@@ -24,7 +24,7 @@
       <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" :flagNew="true" @click="quickSelect"></ctQuickInputSos>
     </div>
     <transition name="el-fade-in" class="ct-flex-div-span">
-      <span v-show="!valid" class="errorMessage errorMessageMarginLeft">
+     <span v-show="!valid" class="errorMessage" :class="{ 'errorMessageMarginLeft': model.inputType === 'textarea' }">
         {{validMessage}}
       </span>
     </transition>
@@ -101,7 +101,8 @@
         this.search();
       },
     },
-  }</script>
+  }
+</script>
 <style scoped>
 .errorMessageMarginLeft {
   margin-left: 108px;

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

@@ -19,6 +19,7 @@ const Detail = function (source, para, callBack) {
       _actionRoutersSimple: null,//页面上的动作行为
       _contactApiRouter: null,//查看联系人
       _commissionApiRouter: null,//查看角色
+      _actionRouterFavorite: null,//收藏动作行为
       detailHeight: 750,
       midlWidth: 1200,
       activeIndex1: '0',
@@ -226,14 +227,30 @@ const Detail = function (source, para, callBack) {
         return rtn._actionRoutersShow;
       },
       get actionRouterPrice() {
-        let routerPrice=null; 
+        let routerPrice = null;
         if (rtn.actionRoutersAll) {
           rtn.actionRoutersAll.forEach((v, i) => {
-            if(v.id=='PropertyPriceLog') routerPrice=v;
+            if (v.id == 'PropertyPriceLog') routerPrice = v;
           });
         }
         return routerPrice;
       },
+      get actionRouterFavorite() {
+        if (rtn._actionRouterFavorite !== null) {
+          return rtn._actionRouterFavorite;
+        }
+        else {
+          if (data.favoriteApiRouter) {
+            if (data.favoriteApiRouter.length > 0) {
+              var router = Router(data.favoriteApiRouter[0]);
+              router.is = "ct-btn";
+              router.attrs = { size: "mini" }
+              rtn._actionRouterFavorite = router;
+            }
+          }
+          return rtn._actionRouterFavorite;
+        }
+      },
       get actionRouters() {
         if (rtn._actionRouters !== null) {
           return rtn._actionRouters;
@@ -503,6 +520,26 @@ const Detail = function (source, para, callBack) {
           }
         );
       },
+      loadFavorite() {
+        var action;
+        if (data.favoriteApiRouter.length > 1) {
+          var router = Router(data.favoriteApiRouter[1]);
+          if (router) {
+            action = router.action;
+          }
+        }
+        Vue.prototype.$api.postHandler(common.globalUri(), { action: action, para: para }).then(
+          function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+              if (response.content) {
+                if (response.content.length > 0) {
+                  rtn._actionRouterFavorite = Router(response.content[0]);
+                }
+              }
+            }
+          }
+        );
+      },
     };
     return rtn;
   }

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

@@ -301,7 +301,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 //源数据
                 else {
                     if (rowNum === null && listData.currentRowIndex) {
-                    rowNum = listData.currentRowIndex;
+                      rowNum = listData.currentRowIndex;
                     }
 
                     if (rowNum === 0 || (rowNum && fiedlId)) {
@@ -350,7 +350,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
             //若该行正在编辑，则取编辑状态的。
             if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
-            && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
+            && data.listData.currentRow.data.$sourceIndex ===  data.listData.source.rows[rowNum].$sourceIndex && data.listData.currentRow.isSet) {
               if(fiedlId=='deleted' || fiedlId=='flagDeleted'){
                 return data.listData.currentRow.data.deleted || false;
               }
@@ -396,7 +396,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 }
 
                 //正在编辑的行
-                if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && data.listData.currentRow.data.$sourceIndex === rowNum) {
+              if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+                && data.listData.currentRow.data.$sourceIndex === data.listData.source.rows[rowNum].$sourceIndex) {
                     let currentField = data.listData.currentRow.data[fiedlId];
                     currentField.source[attrName] = value;
                     //校验自己
@@ -577,10 +578,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             data.field = data.listData.currentEventField;
         }
         rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
-
         //若该行正在编辑，则取编辑状态的。
         if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
-        && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
+        && data.listData.currentRow.data.$sourceIndex === data.listData.source.rows[rowNum].$sourceIndex && data.listData.currentRow.isSet) {
             return data.listData.currentRow.data[fiedlId].source[attrName];
         }
         else if (data && data.field) {

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

@@ -136,8 +136,6 @@ const FormList = function (source, master) {
         },
         get deleted() {//是否已删除
           return r.flagDeleted === true;
-        }, get deleted() {//是否已删除
-          return r.flagDeleted === true;
         },
         set deleted(v) {
           if (v) {
@@ -146,13 +144,13 @@ const FormList = function (source, master) {
           else {
             r.flagDeleted = false;
           }
-        }, get $sourceIndex() {//GID
+        }, 
+        get $sourceIndex() {//GID
           return r.$sourceIndex||"";
         },
         set $sourceIndex(v) {//GID
           return r.$sourceIndex=v;
-        }
-        ,
+        },
       };
       //遍历每一列
       let rowIndex = 0;
@@ -324,8 +322,9 @@ const FormList = function (source, master) {
       }).catch(() => {
       });
     },
-    editRow(index, callback) {
+    editRow(sourceIndex, callback) {
       var self = this;
+      let index = source.rows.findIndex(v => v.$sourceIndex === sourceIndex);
       self.currentRowIndex=index;
       var dialogOption = {
         title: '修改',
@@ -351,19 +350,12 @@ const FormList = function (source, master) {
           },
           on: {
             submit: function (ev) {
-              //var row = rtn.rows[index];
-              //var row = rtn.rows[index].field;
+              rtn.rows[rtn.rows.findIndex(v => v.$sourceIndex === sourceIndex)].edited=true;
               var row = source.rows[index].columns;
               let isRepeat = rtn.isDuplicated(rtn.fieldsToTableData(ev.formData.source.fields), index);
 
               if (!isRepeat) {
                 for (let findex = 0; findex < row.length; findex++) {//循环所在行的列
-                  //let field = row[findex];
-                  //field.value = ev.formData.source.Fields[findex].code1;
-                  //field.value1 = field.text = ev.formData.source.Fields[findex].v2;
-
-                  //Vue.set(row[findex], 'value', ev.formData.source.Fields[findex].code1);
-                  //Vue.set(row[findex], 'value1', ev.formData.source.Fields[findex].v2);
                   Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
                   Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
                 }
@@ -507,7 +499,7 @@ const FormList = function (source, master) {
         });
       }
     },
-    insertOrUpdateRow(row) {
+    insertOrUpdateRow(row,flag) {
       if (row) {
         if(rtn.primaryKeys && rtn.primaryKeys.length>0){
           let iRow = rtn.initRow(row);
@@ -543,6 +535,10 @@ const FormList = function (source, master) {
                   }
                 }
                 else{
+                  if(flag && r.edited){
+                    return;
+                  }
+
                   let rowData = rtn.rowsItemToTableData(iRow)
                   iRow.$sourceIndex = r.$sourceIndex;  
                   row.$sourceIndex = r.$sourceIndex;  
@@ -551,11 +547,13 @@ const FormList = function (source, master) {
                   rowData.delete = iRow.delete;
                   source.rows.splice(i, 1,row);
                   rtn._rows.splice(i, 1,iRow);
-                  rtn.tableData.forEach((d,index) => {
-                    if(d.$sourceIndex===r.$sourceIndex){
-                      rtn.tableData.splice(index, 1,rowData);
-                    }
-                  });    
+                  let tableDataIndex=rtn.tableData.findIndex(v => v.$sourceIndex === r.$sourceIndex);
+                  if(tableDataIndex>-1){
+                    rtn.tableData.splice(tableDataIndex, 1,rowData);
+                  }
+                  else{
+                    rtn.tableData.push(rowData);
+                  }
                 }
               }
             }
@@ -612,6 +610,14 @@ const FormList = function (source, master) {
     },
     S4() {
       return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+    },
+    get selectRouter() {
+      if(source.selectRouter){
+        var button = Router(source.selectRouter);
+        button.is = "ct-btn";
+        return button;
+      }
+      return null;
     }
   };
   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,

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

@@ -558,7 +558,11 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var self = this;
         var searchFields = {
           fields: []
-        }; //this.searchModel ? this.searchModel.searchData : { fields: [] };
+        }; 
+        //this.searchModel ? this.searchModel.searchData : { fields: [] };
+        if(this.searchModel && this.searchModel.searchDataOfHide){
+          searchFields=this.searchModel.searchDataOfHide
+        }
         var searchValue1 = router.flagAddRowAfterAction ? rtnData.responseData.content : rtn.listData[rtn.selectIndex][self.primaryKey];
         if (self.primaryKey) {
           searchFields.fields.push({
@@ -835,12 +839,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           }
         });
       },
-      export (btn, submitData) {
-        Vue.prototype.$api.postHandler(common.globalUri(), {
-          action: btn.action,
-          para: submitData
-        });
-      },
       _scripts: null,
       get scripts() {
         if (rtn._scripts !== null) {

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

@@ -1,8 +1,8 @@
 <template>
   <div class="ct-progress">
     <div style="padding: 5px;">
-      <el-progress :text-inside="true" :stroke-width="18" :percentage="percentage"></el-progress>
-      <span style="margin-top: 5px;">{{message}}</span>
+      <el-progress type="circle" :percentage="percentage"></el-progress>
+      <span class="progressMsg">{{ message }}</span>
     </div>
   </div>
 </template>
@@ -50,8 +50,11 @@
             else if(data.rtnMsg){
               self.message = data.rtnMsg;
             }
+            else if(response.rtnMsg){
+              self.message = response.rtnMsg;
+            }
           }
-          if (response.rtnCode === 200) {
+          if (response.rtnCode === 200 && data.rtnCode === 200) {
             this.percentage = data.percentage;
             if (data.flagFinished) {
               if(this.progressType=='export'){
@@ -64,7 +67,7 @@
             }
           }
           else {
-            
+            self.$emit('error',data);
           }
         });
       }
@@ -78,4 +81,12 @@
   }
 </script>
 <style>
+.ct-progress {
+  text-align: center;
+}
+
+.progressMsg {
+  margin-top: 5px;
+  display: block;
+}
 </style>

package/src/centaline/validate/index.js

@@ -74,9 +74,11 @@ const actions = {
     }
     if (v.value === '') {
       return true;
-    } else if (reg.test(v.value)) {
+    } 
+    else if (reg.test(v.value)) {
       return true;
-    } else {
+    } 
+    else {
       v.value = o;
       return true;
     }

package/src/main.js

@@ -13,10 +13,10 @@ Vue.use(ElementUI, { size: 'mini'});
 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.23.22:9999/v1/form/router",
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://10.88.22.69:8080/", 
-  flagRouterSelf: true,
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -43,8 +43,8 @@ Vue.use(centaline, {
       return {
         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',
+        EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE2OGI1YThjLThiZTUtNDQyZi04NTA4LWMyODY4N2NkYmEzMSJ9.Rk26QdZSUzDVdjdRxGxDApOt5W6KYjmyjmsXpWeZb5E5NwZjpXnHYwhYkKjNxIeyg--OV2UrzFa2SxGzZ-Wneg',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作