centaline-data-driven 1.6.8 → 1.6.10

package/package.json

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

package/release-log.md

@@ -1,3 +1,37 @@
+# v1.6.10
+2024-06-25
+
+优化
+
+数字区间组件新增负值最小值判断
+
+数字区间组件清空时inputOld值设为空
+
+数字中间隐藏显示组件行高不同导致表单换行
+
+表单列表添加工具栏按钮
+
+# v1.6.9
+2024-06-12
+
+优化
+
+图片选择控件，没锁定且没权限时，默认项显示
+
+表单列表弹层onAfterChanged支持调用actionRouters
+
+表单列表选择数据后，再次编辑行数据后，没有触发数据统计bug处理
+
+表单列表路由删除操作支持刷新整个表单
+
+表单列表弹层新增修改时，支持弹层的路由操作可以取到父表单的数据
+
+列表：查询条件加载完成后，数据还没有加载完成，查询条件可以选择的bug处理
+
+标题栏 按钮（居右排列）
+
+优化弹窗关闭符号和新增帮助符号
+
 # v1.6.8
 2024-05-08
 

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="'/salemanage/ContractByPoint/readDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/invoicemanage/invoicingRelContract/readDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "commissionMode":2,"contractId":"240403142141DC5F9DCDA2A244BCA381","propertyId":"231128145050EB00D506577A4DF09BB5","searchFields":{"fields":[{"fieldName1":"CompanyPath","groupName":"CompanyPath","operation":1,"searchDataType":1,"searchValue1":"009"},{"fieldName1":"EmpID","groupName":"EmpID","operation":1,"searchDataType":1,"searchValue1":"20201030134831BAA0AC5CDC9344B21E"},{"fieldName1":"DeptPath","groupName":"DeptPath","operation":1,"searchDataType":1,"searchValue1":"009.007"},{"fieldName1":"type","groupName":"type","operation":1,"searchDataType":1,"searchValue1":"left"},{"fieldName1":"EstateID","groupName":"EstateID","operation":2,"searchDataType":3,"searchValue1":"23112217144782E4C3D5F8164CB2AE3E"},{"fieldName1":"ContractDateStar","fieldName2":"ContractDateEnd","groupName":"ContractDateStar","operation":5,"searchDataType":4,"searchValue1":"2024-04-01","searchValue2":""}]},"pageAttribute":{"pageIndex":1},"columnName":"contractDate","actionType":3
+          "actionType":2,"jsonData":{"invoice_ID":"322"}
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -29,9 +29,12 @@
 
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/distribution/standing-book/layout'"  :searchDataApi="'/api/distribution/standing-book/list'"></ct-searchlist> -->
 
-
+    <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
-
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'"  :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
+    <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
@@ -68,11 +71,11 @@
 
     <!-- <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :appRootUrl="appRootUrl"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
@@ -138,7 +141,7 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          "type":"batchConfirmtion"
+          "type":"left"
         },
       }
     },

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

@@ -10,7 +10,9 @@
         dialogTableVisible: true,
         contentLeft: 0,
         contentTop: 0,
-        pane:null
+        pane:null,
+        captionBarButtons:[],
+        modelSelf:null,
       };
     },
     activated(){
@@ -123,17 +125,52 @@
                                   },
                                   this.vmodel.title),
                                 h('i', {
-                                  class: ['el-icon', 'el-icon-close'],
+                                  class: ['el-icon', 'close-mark','cursor'],
                                   style: {
                                     'position': 'absolute',
                                     'right': '8px',
-                                    'top':'7px',
-                                    'font-size':'22px'
+                                    'top':'10px',
+                                    'font-size':'24px',
                                   },
                                   on: {
                                     click: (event) => { this.close(event); }
                                   }
-                                })
+                                }),
+                                // h('i', {
+                                //   class: ['el-icon', 'question-mark'],
+                                //   style: {
+                                //     'position': 'absolute',
+                                //     'right': '35px',
+                                //     'top':'10px',
+                                //     'font-size':'24px',
+                                //   },
+                                //   on: {
+                                //     click: (event) => { this.close(event); }
+                                //   }
+                                // })
+                                h('div',{
+                                  style: {
+                                    'display':'inline-block',
+                                    'position': 'absolute',
+                                    'right': '44px',
+                                    'top':'10px',
+                                  }
+                                },this.captionBarButtons.map((item,index) => {
+                                  let mySelf = this;
+                                  if(item.show){
+                                    return h('ct-btn', {
+                                            props: {
+                                              key:index,
+                                              vmodel:item
+                                            },
+                                            on: {
+                                              click(ev) {
+                                                mySelf.modelSelf.self.fieldClickHandler(item)
+                                              }
+                                            }
+                                          }, [])
+                                  }
+                                }))
                               ])
                           ]),
                           h('tr', {}, [
@@ -147,6 +184,10 @@
                                     if (typeof item.on.loaded === "undefined") {
                                       item.on.loaded = (model) => {
                                         mySelf.vmodel.title = (model && model.title) ? model.title : mySelf.vmodel.title
+                                        if(model.captionBarButtons){
+                                          mySelf.captionBarButtons = model.captionBarButtons
+                                        }
+                                        mySelf.modelSelf = model
                                       }
                                     }
 
@@ -263,5 +304,28 @@
     border-top:initial;
     border-bottom: initial;
   }
-
+  .question-mark { 
+    background: url(../../../assets/question.png) no-repeat;
+    background-size: 100% 100%;
+    height: 22px;
+    width: 22px;
+    display: inline-block;
+    font-weight: bold;
+  } 
+  .question-mark:hover {
+    background-color: #e4624c;
+    color: fff;
+  } 
+  .close-mark{
+    background: url(../../../assets/close.png) no-repeat;
+    background-size: 100% 100%;
+    height: 26px;
+    width: 26px;
+    display: inline-block;
+    font-weight: bold;
+  }
+  .close-mark:hover {
+    background-color: #e4624c;
+    color: fff;
+  }
 </style>

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -22,6 +22,7 @@
              :headers="headers"
              :multiple="false"
              :show-file-list="false"
+             :before-upload="handleAvatarBeforeUpload"
              :on-success="handleAvatarSuccess"
              :on-error="handleAvatarError">
     <el-button size="mini" type="primary">{{model.label}}</el-button>
@@ -108,6 +109,7 @@
       rowindex:Number,
       flagAppMode: Boolean,
       actionRouters: Array,
+      parentModel: Object,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -163,6 +165,19 @@
       }
     },
     methods: {
+      handleAvatarBeforeUpload(file) {
+        if(this.parentModel && this.parentModel.is && this.parentModel.is=="ct-form-list-table" && this.parentModel.$self){
+          let submitData = this.parentModel.$self.getFileData(this.vmodel);
+          for (var key in submitData) {
+            if (typeof submitData[key] === "object") {
+              this.uploadData[key] = JSON.stringify(submitData[key]);
+            }
+            else {
+              this.uploadData[key] = submitData[key];
+            }
+          }
+        }
+      },
       handleAvatarSuccess(res) {
         let self = this;
         this.$api.postThenHandler({ data: res}).then(function () {

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

@@ -134,7 +134,7 @@
         </el-row>
         <el-row v-if="model.buttons.findIndex((v)=>{return v.show}) > -1" :class="isScroll?'ccai button-absolute':'button-initial'"
                 :style="{'max-width':pageWidth?(pageWidth-20)+'px':'100%'}">
-          <el-col :span="24" style="text-align:center;padding-bottom: 1px;padding-left: 5px;padding-right: 5px;" class="btnPadBom">
+          <el-col :span="24" style="display: flex;align-items: center;justify-content: center;height: 40px ;padding-bottom: 1px;padding-left: 5px;padding-right: 5px;" class="btnPadBom">
             <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"
               :style="{'float':btn.isCheckbox ? btn.alignCss:''}"></component>
           </el-col>
@@ -682,13 +682,15 @@
                     },
                     on: {
                       submit(ev) {
+                        // if(ev.responseData
+                        // && ev.responseData.clientActionType 
+                        // && ev.responseData.clientActionType === 2 
+                        // && ev.responseData.content){
+                        //   self.$common.excuteFunStr.call(self.model.scripts, ev.responseData.content);
+                        // }
+                        // else 
                         if (ev.responseData && ev.responseData.notification === 10) {
-                          self.collapse.splice(0, self.collapse.length);
-                          self.collapseActiveNames.splice(0, self.collapseActiveNames.length);
-                          self.collapseFieldsRow.splice(0, self.collapseFieldsRow.length);
-                          self.independentItem.splice(0, self.independentItem.length);
-                          self.load(self.loaderObj.Form(ev.responseData.content));
-                          self.formKey = self.formKey + 1;
+                          self.init();
                         }
                         else {
                           self.model.updateFields(ev, () => {
@@ -963,13 +965,8 @@
                     if (field && field.changeCallBackFunName) {
                       self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
                     }
-                    else if (field.isRefersh) {
-                      self.collapse.splice(0, self.collapse.length);
-                      self.collapseActiveNames.splice(0, self.collapseActiveNames.length);
-                      self.collapseFieldsRow.splice(0, self.collapseFieldsRow.length);
-                      self.independentItem.splice(0, self.independentItem.length);
-                      self.load(self.loaderObj.Form(data.content));
-                      self.formKey = self.formKey + 1;
+                    else if (field.isRefersh || data.notification === 10) {
+                      self.init();
                     }
                     else {
                       self.model.doAction(data);
@@ -1403,6 +1400,11 @@
           if (field.submitFormField) {
             field.submitFormField.forEach((v) => {
               submitData[v] = self.$common.getDataOfUpperLower(tempFormData, v);
+              if(submitData[v]==undefined || submitData[v]==null || submitData[v]==''){
+                if(self.parentModelForm){
+                  submitData[v] = self.parentModelForm.getFormObj()[v];
+                }
+              }
             });
           }
         }

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

@@ -3,12 +3,21 @@
     <div v-if="model.title" class="list-title">
       <h5>{{model.title}}</h5>
     </div>
-    <div v-else-if="model.create || (model.selectRouter && model.selectRouter.id)" class="list-title"></div>
+    <div v-else-if="model.create || (model.selectRouter && model.selectRouter.id) || model.toolButtonsShow.length>0" class="list-title"></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" :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
-        {{model.createText}}
-      </el-button>
+      <ul>
+        <li v-for="(v,i) in model.toolButtonsShow" >
+          <component :is="v.is" :vmodel="v" :parentModel="model" @click="toolButtonsClick" @importComplete="importComplete" @change="toolButtonsChangeHandler(v,$event)"></component>
+        </li>
+        <li v-if="model.selectRouter!==null">
+          <component :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
+        </li>
+        <li v-if="model.create" >
+          <el-button :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+            {{model.createText}}
+          </el-button>
+        </li>
+      </ul>
     </div>
 
     <div id="listTable">
@@ -313,6 +322,8 @@
               fd.$forceUpdate();
             }
           });
+          //如果有汇总列，触发重新计算汇总
+          self.recalculationSummary();
         });
       },
       fieldsValidExcute() {
@@ -375,6 +386,20 @@
 
         this.$emit('tableButtonClick', button, submitData);
       },
+      toolButtonsClick(field) {
+        this.$emit('tableButtonClick', field, null);
+      },
+      toolButtonsChangeHandler(field) {
+        this.$emit('change', field);
+      },
+      importComplete(res, button) {
+        this.$emit('importComplete', res, button);
+      },
+      getFileData(field) {
+        var submitData = {};
+        submitData = this.parentModel.self.getFileData(field);
+        return submitData;
+      },
       popupSearchListHandle(field) {
         if(field.isSearchPageWithList){
           var self = this;       
@@ -529,4 +554,16 @@
 .el-table .cell {
   text-overflow: clip;
 }
+
+.list-button ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: auto;
+}
+.list-button ul li {
+  margin-right: 5px;
+  float: left;
+}
+
 </style>

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -94,7 +94,12 @@
         if (this.model.max1 !== "" && parseFloat(this.model.value1) > parseFloat(this.model.max1)) {
           this.model.value1 = this.inputOld1;
         }
-
+        if (this.model.min !== "" && parseFloat(this.model.value) < parseFloat(this.model.min)) {
+          this.model.value = this.inputOld;
+        }
+        if (this.model.min1 !== "" && parseFloat(this.model.value1) < parseFloat(this.model.min1)) {
+          this.model.value1 = this.inputOld1;
+        }
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);//todo input事件里要不要加这个事件
       },
@@ -128,6 +133,8 @@
       },
       clearClickHandle: function (event,id) {
         this.model.reset();
+        this.inputOld='';
+        this.inputOld1='';
         this.isShowClear(id);
       },
       mouseOverHandle: function (id) {

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -27,7 +27,7 @@
             </span>
             <span
               class="cover-list-item-span-delete"
-              v-if="!model.lock"
+              v-if="!model.lock&& item.rightDel"
             >
               <i class="el-icon-delete" @click="handleRemove(item,index)"></i>
             </span>
@@ -36,15 +36,16 @@
                 <span style="width: 80px; height: 26px; display: inline-flex;">
                 &nbsp;{{ item.mediaLabelName }} </span>
               </span>
-              <template v-if="model.lock">
-              <span v-if="item.flagDefault &&(item.flagDefault == true || item.flagDefault == 'true')"
-                class="checked isradio"> 
-              </span>
-             </template>
-              <span v-else-if="item.rightDefault==true||item.rightDefault=='true'"
+            
+              <span v-if="item.rightDefault==true||item.rightDefault=='true'"
                :class="[item.flagDefault &&(item.flagDefault == true || item.flagDefault == 'true')? 'checked': 'Unchecked','isradio',]"
                 @click="radiochecked(photoList, item)">
               </span>
+              <template v-else>
+              <span v-if="item.flagDefault &&(item.flagDefault == true || item.flagDefault == 'true')"
+                class="checked isradio">
+              </span>
+            </template>
             </span>
           </div>
         </li>

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -29,7 +29,7 @@
               </span>
             </span>
             <div class="p-2 text-center">
-              <i class="max-view" @click="viewerOpen(imageList,index)"></i>
+              <i class="max-view" @click="viewerfile(imageList,index)"></i>
               <i class="max-success" @click="choose(item)" :class="{'ischeck': item.ischeck }"></i>
 
               <!-- <el-tag type="danger" effect="dark" size="mini" >1</el-tag> -->

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

@@ -174,6 +174,7 @@
         if(this.from && this.from=='detail'){
           this.screenTop=this.$refs.screen.$el.offsetTop;
         }
+        this.pageDisabled=true;
         this.$refs.table.searchComplate(this.$refs.screen.model, defaultSearch);
  
         this.$emit('loaded', this.$refs.screen.model);
@@ -314,6 +315,7 @@
           this.$refs.screen.LoadLayout();
         }
 
+        this.pageDisabled=false;
         this.flagSideBar=this.$refs.table.model.flagSideBar;
         this.flagDefaultDisplaySideBar=this.$refs.table.model.flagDefaultDisplaySideBar;
         if(this.$refs.table.model.rowSelectRouter){

package/src/centaline/dynamicSensitiveEye/src/dynamicSensitiveEye.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
+  <div class="field-top el-text-eye">
+    <div v-if="model !== null" class="ct-text ct-flex-div el-text-lineHeight" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
@@ -63,6 +63,15 @@
   .eyelabel {
     min-width:80px;
   }
+  .el-text-lineHeight{
+    line-height: 26px;
+    display: inline-flex;
+  }
+  .el-text-eye{
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+  }
   .el-icon-eye:before {
     background: url("../../../assets/icon-eye.png") no-repeat;
     content: '';
@@ -71,5 +80,6 @@
     height: 16px;
     font-size: 16px;
     background-size: 16px;
+    margin-bottom: -3px;
   }
 </style>

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

@@ -150,6 +150,23 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           return rtn._actionRouters;
         }
       },
+      _captionBarButtons: null,
+      get captionBarButtons() {
+        if (rtn._captionBarButtons !== null) {
+          return rtn._captionBarButtons;
+        }
+        else {
+          rtn._captionBarButtons = [];
+          if (source.captionBarButtons) {
+            source.captionBarButtons.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              rtn._captionBarButtons.push(button);
+            });
+          }
+          return rtn._captionBarButtons;
+        }
+      },
       get optionApi() {
         return source.parameterAction;
       },
@@ -462,35 +479,45 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           let listData = this.excuteListData.find((v) => {
             return v.id === tableId;
           });
-          listData[attrName] = attrValue
+          if(listData){
+            listData[attrName] = attrValue
+          }
         },
         //新增表格数据
-        insertRow(tableId,rows) {    
+        insertRow(tableId,rows) {
           let listData = this.excuteListData.find((v) => {
               return v.id === tableId;
           });
-          listData.insertRow(rows);
+          if(listData){
+            listData.insertRow(rows);
+          }
         },
         //新增或替换表格数据
-        insertOrUpdateRow(tableId,row) {    
+        insertOrUpdateRow(tableId,row) {
           let listData = this.excuteListData.find((v) => {
             return v.id === tableId;
           });
-          listData.insertOrUpdateRow(row);
+          if(listData){
+            listData.insertOrUpdateRow(row);
+          }
         },
         //删除表格数据
-        deleteRow(tableId,row) {    
+        deleteRow(tableId,row) {
           let listData = this.excuteListData.find((v) => {
             return v.id === tableId;
           });
-          listData.delRow(row);
+          if(listData){
+            listData.delRow(row);
+          }
         },
         //清空表格数据
         clear(tableId) {
           let listData = this.excuteListData.find((v) => {
             return v.id === tableId;
           });
-          listData.deleteAll();
+          if(listData){
+            listData.deleteAll();
+          }
         },
 
         //获取后台数据，并返回脚本。