centaline-data-driven 1.3.33 → 1.3.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.33",
+  "version": "1.3.36",
   "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/task'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/commissionmanage/apply'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,12 +14,8 @@
     data() {
       return {
         apiParam:{
-actionType: "1",
-businessId: "1550013042447081473",
-pageOnly: "true",
-pageStyle: "2",
-stepId: "1550014106894327810"
-          }
+          
+        }
       }
     },
     activated(){

package/src/centaline/api/index.js

@@ -201,12 +201,19 @@ const api = {
               progressAction: data.content.action,
               progressKey: data.content.key,
               progressType:'export',
-              width: '300px',
-              height: '60px'
+              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/common/index.js

@@ -328,15 +328,23 @@ const common = {
     if (parent) {
       if (parent.$options.name === 'ElTabPane') {
         return parent;
-      } else if (evControl.$options.name === 'ctDialog') {
+      } 
+      else if (evControl.$options.name === 'ctDialog') {
         return evControl.vmodel.pane;
-      } else if (parent.$options.name === 'DataDrivenSearch') {
+      } 
+      else if (parent.$options.name === 'DataDrivenSearch') {
         return parent;
-      } else if (parent.$options.name === 'DataDrivenForm') {
+      } 
+      else if (parent.$options.name === 'DataDrivenForm') {
         return parent;
-      } else if (parent.$options.name === 'DataDrivendetail') {
+      } 
+      else if (parent.$options.name === 'DataDrivendetail') {
         return parent;
-      } else {
+      } 
+      else if (parent.$options.name === 'App') {
+        return parent;
+      } 
+      else {
         return this.getParentPane(parent);
       }
     }
@@ -364,7 +372,8 @@ const common = {
     if (window.attachEvent && !window.opera) {
       //ie
       execScript(code);
-    } else {
+    } 
+    else {
       //not ie
       window.eval(code);
     }

package/src/centaline/dialogList/src/dialog.vue

@@ -151,7 +151,7 @@
                                     if(item.attrs.height){
                                       ph=parseInt(item.attrs.height.replace('px',''));
                                     }
-                                    if(self.vmodel.pane && self.vmodel.pane.$el.clientHeight<ph){
+                                    if(self.vmodel.pane && self.vmodel.pane.$el && self.vmodel.pane.$el.clientHeight<ph){
                                       item.attrs.height=(self.vmodel.pane.$el.clientHeight-40)+'px';
                                     }
                                     

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -10,7 +10,7 @@
             <span>{{ model.fields1Dic.EstateName.value }}</span>
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
-            <img :src="model.fields1Dic.FavoriteUrl.value" alt="" class="collection"/>
+            <img :src="model.fields1Dic.FavoriteUrl.value" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
           </div>
           <div class="title-other">
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
@@ -235,8 +235,9 @@
                   </el-tabs>
                   <div class="more-dropdown">
                     <el-dropdown trigger="click" placement="bottom">
-                      <span class="el-dropdown-link">
-                        <div class="my-icon-more"></div>
+                      <span class="el-dropdown-link svgIcon">
+                        <!-- <div class="my-icon-more"></div> -->
+                        <img :src="iconSort" alt="" width="100%" />
                       </span>
                       <el-dropdown-menu slot="dropdown" class="tabsMore">
                         <el-dropdown-item
@@ -579,6 +580,7 @@ export default {
       showData: [],
       FlagStatistics: false,
       dropDownSelected: false,
+	  iconSort: require("../../../assets/sort.png"),
     };
   },
   mounted() {
@@ -761,6 +763,9 @@ export default {
     loadBaseInfo() {
       this.model.loadBaseInfo();
     },
+    loadFavorite() {
+      this.model.loadFavorite();
+    },
     handleClick(tab, event) {
       let i = tab.index;
       if (this.model.tags2 && this.model.tags2[i]) {
@@ -828,31 +833,42 @@ export default {
         });
         callBack = "loadOperation";
       }
+      if (router == undefined && this.model.actionRouterFavorite) {
+        if (field.id === this.model.actionRouterFavorite.id) {
+          router = this.model.actionRouterFavorite;
+        }
+      }
 
       if (router) {
         if (field.isSubmitDataFromSelf) {
           router.submitFormField.forEach((v) => {
             submitData[v] = field.list[field.listIndex].code;
           });
-        } 
+        }
         else {
           router.submitFormField.forEach((v) => {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
-        if(router.id=="PropertyEdit"){
-          callBack="loadBaseInfo"
+        if (router.id == "PropertyEdit") {
+          callBack = "loadBaseInfo"
+        }
+        else if (router.id == "Favorite") {
+          callBack = "loadFavorite"
         }
       }
 
       if (callBack) {
-        if(callBack=='loadOperation'){
+        if (callBack == 'loadOperation') {
           this.routerClickHandler(router, submitData, self.loadOperation);
         }
-        else if(callBack=='loadBaseInfo'){
+        else if (callBack == 'loadBaseInfo') {
           this.routerClickHandler(router, submitData, self.loadBaseInfo);
         }
-      } 
+        else if (callBack == 'loadFavorite') {
+          this.routerClickHandler(router, submitData, self.loadFavorite);
+        }
+      }
       else {
         this.routerClickHandler(router, submitData);
       }
@@ -925,6 +941,11 @@ export default {
                       });
                       self.$common.closeDialog(dialogOption.dialog);
                     },
+                    closeDialog(ev) {
+                      if (field.id == "Favorite" && callBack) {
+                        callBack();
+                      }
+                    }
                   },
                 },
               ],
@@ -1805,7 +1826,7 @@ export default {
   height: 20px;
   text-align: left;
   top: 13px;
-  right: -2px;
+  right: -1px;
 }
 .el-dropdown-menu--mini .el-dropdown-menu__item {
   font-size: 14px;
@@ -1830,6 +1851,11 @@ export default {
 >>> .el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
+.svgIcon {
+  width: 16px;
+  text-align: center;
+  cursor: pointer;
+}
 </style>
 
 

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

@@ -414,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) => {
@@ -489,25 +521,29 @@
         if(field.flagAsync){
           if(res.content && res.content.action){
             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(data) {
                     self.$common.closeDialog(dialogOption.dialog);
                     if(field && field.changeCallBackFunName){
-                      self.changeCallBackHandler(field, field.changeCallBackFunName, data.content.content);
+                      self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
                     }
                     else{
                       self.model.doAction(data);
                     }
+                  },
+                  error(data) {
+                    self.$common.closeDialog(dialogOption.dialog);                    
+                    self.$message.warning(data.rtnMsg);
                   }
                 }
               }]
@@ -592,11 +628,36 @@
       popupSearchListHandler(singleSelectio, field, router, callBack) {
         var self = this;
         var submitData = {};
+        var verified = true;
         var tempFormData = self.model.getFormObj();
 
         var check = true;
         var checkMsg;
         router.submitFormField.forEach((v) => {
+          self.$refs.Fields.forEach((f) => {
+            if(f.model && f.model.id===v){
+              if (typeof f.validExcute !== 'undefined'){
+                if (!f.validExcute()){
+                  if(f.validMessage){
+                    if(f.validMessage=='必填'){
+                      self.$message.error('【'+f.model.label+'】'+f.validMessage);
+                    }
+                    else{
+                      self.$message.error(f.validMessage);
+                    }
+                  }
+                  else{
+                    self.$message.error('【'+f.model.label+'】不能为空！');
+                  }
+                  verified=false;
+                  return;
+                }
+              }
+            }
+          });
+          if(!verified){
+            return;
+          }
           submitData[v] = self.$common.getDataOfUpperLower(tempFormData,v);
           if (typeof tempFormData[v] === "undefined") {
             if (self.model.fieldsDic[v]) {
@@ -609,6 +670,9 @@
           }
         });
 
+        if(!verified){
+          return;
+        }
         if (!check) {
           self.$message.warning(checkMsg);
           return;

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

@@ -4,6 +4,7 @@
       <h5>{{model.title}}</h5>
     </div>
     <div class="list-button">
+      <component v-if="model.selectRouter !== null" :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
       <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
         新增
       </el-button>
@@ -12,7 +13,8 @@
     <div id="listTable">
       <el-row>
         <el-col :span="24">
-          <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
+          <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border 
+            style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
             <!--数据列-->
             <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false">
               <template slot="header" slot-scope="scope">
@@ -41,7 +43,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" fixed="right">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}
@@ -104,8 +106,7 @@
         itemKey: Math.random()
       }
     },
-    created() {
-      
+    created() {      
       let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;
@@ -180,6 +181,7 @@
               }
 
               row.isSet = false;
+              app.model.rows[app.model.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex)].edited=true;
               app.model.currentRow.isSet = false;
               app.itemKey = Math.random();
               this.model.change = this.model.formListChange;
@@ -215,12 +217,12 @@
           self.$emit('change');
         });
       },
-      editRow(index) {
+      editRow(sourceIndex) {
         var self = this;
-        this.model.editRow(index, () => {
+        this.model.editRow(sourceIndex, () => {
           self.$forceUpdate();
           self.$refs.FieldsLabel.forEach((fd) => {
-            if (fd.rowNum === index) {
+            if (fd.rowNum === sourceIndex) {
               fd.$forceUpdate();
             }
           });
@@ -259,7 +261,7 @@
       changeHandler(field, index) {
         var self = this;
         this.model.change = field.change;
-        this.model.currentRowIndex = index;
+        this.model.currentRowIndex = this.model.source.rows.findIndex(v => v.$sourceIndex === index);
         this.model.currentEventField = field;
         self.$emit('change');
 
@@ -269,7 +271,7 @@
       inputHandler(field, index) {
         var self = this;
         this.model.input = field.input;//当前小组件事件作为大组件事件
-        this.model.currentRowIndex = index;
+        this.model.currentRowIndex = this.model.source.rows.findIndex(v => v.$sourceIndex === index);
         this.model.currentEventField = field;
 
         self.$emit('input');
@@ -277,22 +279,31 @@
         //如果有汇总列，触发重新计算汇总
         this.recalculationSummary();
       },
-      //如果有汇总列，触发重新计算汇总
-      recalculationSummary() {
-        if (this.model.showSummary) {
-          this.model.tableData.push({});
-          this.model.tableData.pop();
-        }
-      },
       buttonClick(row, button) {
         var submitData = {};
         button.submitFormField.forEach((v) => {
           submitData[v] = row[v].value;
         });
-        this.model.currentRowIndex = row.$sourceIndex;
+        this.model.currentRowIndex = this.model.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 
         this.$emit('tableButtonClick', button, submitData);
       },
+      popupSearchListHandle(field) {
+        if(field.isSearchPageWithList){
+          var self = this;       
+          self.$emit('popupSearchList', false, self.model, field, (data) => {
+            if (data && data.length>0) {
+              data.forEach((v) => {
+                if(v.code){
+                  self.model.insertOrUpdateRow(JSON.parse(v.code),true);
+                  // self.recalculationSummary();
+                  // self.$emit('change');
+                }
+              });
+            }
+          });
+        }
+      },
       rolRouterClickHandler(field, rowData,rowindex) {
         if(this.$refs['popover'+rowindex]){
           this.$refs['popover'+rowindex][0].doClose();
@@ -305,6 +316,13 @@
 
         this.$emit('tableButtonClick', field, submitData);
       },
+      //如果有汇总列，触发重新计算汇总
+      recalculationSummary() {
+        if (this.model.showSummary) {
+          this.model.tableData.push({});
+          this.model.tableData.pop();
+        }
+      },
       //汇总行 计算
       getSummaries(param) {
         const self = this;
@@ -338,7 +356,6 @@
                   return Number(prev);
                 }
               }, 0);
-              //sums[index] += ' 元';
               if (data[0][column.property].decimals && data[0][column.property].decimals > 0) {
                 sums[index] = sums[index].toFixed(data[0][column.property].decimals);
               }

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -22,8 +22,8 @@
             <span class="el-select__tags-text">{{item}}</span>
           </span>
         </span>
-        <label v-else class="ct-lable">
-          {{model.labelValue}}
+        <label v-else class="ct-lable" :class="{ isWidth: model.labelValue.length > 30 }">
+               <span :class="{ isEllipsis: model.labelValue.length > 30 }"> {{ model.labelValue }}</span>
         </label>
         <span slot="suffix" v-if="model.unitName" class="ct-unitnameLable">{{model.unitName}}</span>
         <span v-if="model.sufLabel" style="width:auto" class="spanMessage">{{model.sufLabel}}</span>
@@ -52,3 +52,16 @@
       }
     }
 }</script>
+<style scoped>
+.isWidth {
+  width: 60%;
+  display: flex;
+}
+.isEllipsis {
+  width: auto;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+}
+</style>

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue

@@ -3,8 +3,11 @@
     <div v-if="model !== null && !loading" class="ct-form">
       <div class="ct-ptb5 max-flex">
         <template v-for="(col, index) in model.fields" v-if="col.show !== false">
-          <br v-if="col.is === 'ct-linefeed'" />
-          <component ref="Fields" :is="col.is" v-bind="col.listBind" :vmodel="col" :api="model.optionApi" @click="getClickHandler(col.action)"></component>
+         <!-- <br v-if="col.is === 'ct-linefeed'" /> -->
+          <div v-if="col.is === 'ct-linefeed'" style="width: 100%;">
+            <el-divider></el-divider>
+          </div>
+          <component v-else ref="Fields" :is="col.is" v-bind="col.listBind" :vmodel="col" :api="model.optionApi" @click="getClickHandler(col.action)"></component>
         </template>
       </div>
       <ct-popupSearchListTable ref="table" :api="searchDataApi" :jumpBtnName="jumpBtnName" :filterBtnName="filterBtnName"
@@ -67,7 +70,6 @@
           this.$refs.table.searchComplate(this.model,this.model.flagSearch);
         });
         this.loading = false;
-        
         //通知父组件加载完成
         this.$emit('loaded');
       },
@@ -146,12 +148,19 @@
     }
   }
 </script>
-<style>
+<style scoped>
 .max-flex{
   display: flex;
-
+flex-wrap: wrap;
 }
 .max-flex .field-top{
   margin-right: 10px;
 }
+.el-divider {
+  background-color: #fff;
+}
+
+.el-divider--horizontal {
+  margin: 5px 0;
+}
 </style>

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -55,14 +55,12 @@
         loading: true,
         jumpStr: ''
       }
-    },
-   
+    },   
     methods: {
       load(data) {
         this.model = data;
         this.loadFields();
         this.loading = false;
-        //this.
         this.resetTabelWidth();
 
         //通知父组件加载完成