centaline-data-driven 1.6.39 → 1.6.41

package/package.json

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

package/release-log.md

@@ -1,3 +1,23 @@
+# v1.6.41
+2024-05-07
+
+优化
+
+附件上传添加上传文件大小的限制[code2,单位M]，默认不限制
+
+# v1.6.40
+2024-04-10
+
+优化
+
+多行文本禁用样式修改
+
+Compound复合组件优化：
+1. 支持onChange
+2. 支持onAfterChanged
+3. 支持获取ParentFieldValue
+4. 支持locked锁定
+
 # v1.6.39
 2024-04-07
 

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="'/customermanage/customerReg/getCustomerInfoLayoutOfBrowse'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "commissionMode":1,"contractId":"202406181443110093F2F8AADD6B96EA","propertyId":"20180321102126B4B8B65EFBD6613722","searchFields":{"fields":[{"fieldName1":"CompanyPath","groupName":"CompanyPath","operation":1,"searchDataType":1,"searchValue1":"001"},{"fieldName1":"EmpID","groupName":"EmpID","operation":1,"searchDataType":1,"searchValue1":"2016080115594575A1A2EFB5B823B8A4"},{"fieldName1":"DeptPath","groupName":"DeptPath","operation":1,"searchDataType":1,"searchValue1":"001.200"},{"fieldName1":"type","groupName":"type","operation":1,"searchDataType":1,"searchValue1":"left"},{"fieldName1":"EstateID","groupName":"EstateID","operation":2,"searchDataType":3,"searchValue1":"201005121336088B888053DAF3FAD603"},{"fieldName1":"ContractDateStar","fieldName2":"ContractDateEnd","groupName":"ContractDateStar","operation":5,"searchDataType":4,"searchValue1":"2023-11-01","searchValue2":""}]},"pageAttribute":{"pageIndex":1},"columnName":"contractDate","actionType":3
+          "customerId":"f8befff6-2c2a-402f-a879-80b80653aa96","customerCode":"4412c652-702d-4286-a227-e9cd407f5aca","searchFields":{"fields":[{"fieldName1":"EmpId","groupName":"EmpId","operation":2,"searchDataType":3,"searchValue1":"2411120940038E8B1C87525447179987"},{"fieldName1":"ReceptionStatus","groupName":"ReceptionStatus","operation":2,"searchDataType":1,"searchValue1":"1"},{"fieldName1":"SearchArea","groupName":"SearchArea","operation":2,"searchDataType":1,"searchValue1":"1"}]},"pageAttribute":{"pageIndex":1},"columnName":"custName","actionType":1,"pageStyle":2,"pageOnly":true
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -31,7 +31,7 @@
 
     <!-- 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="'/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="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'"  :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/UrgentResponsiblePersonList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/UrgentResponsiblePersonList/getList'"></ct-searchlist> -->
@@ -46,6 +46,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/system/AreaList/getLayoutOfSearch'"  :searchDataApi="'/system/AreaList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist>
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -167,7 +168,7 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          type: "top",
+          type: "left",
   "deleteRight": 0,
   "editRight": 0,
   "browseRight": 0,

package/src/centaline/dynamicCompound/src/dynamicCompound.vue

@@ -74,11 +74,19 @@
         self.model.requiredHandle(field);
         //self.model.validMrf(field);
 
+        if (typeof field.change !== 'undefined') {
+          if (typeof this.parentModel.scripts !== 'undefined') {
+            this.parentModel.scripts.formData.setExcuteListData(this.parentModel.fields);
+          }
+          this.parentModel.scripts.$fd = field.id;
+          this.$common.excute.call(this.parentModel.scripts, field.change);
+        }
+
         if (field.onAfterChanged) {
           var router = self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
           });
-          self.$parent.$parent.$parent.$parent.clickHandler(router);
+          self.parentModel.self.clickHandler(router);
         }
 
         self.$forceUpdate();

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -490,6 +490,10 @@ export default {
     handleDownload(file) {
     },
     handleChange(file, fileList) {
+      if (this.model.maxSize && file.size > this.model.maxSize) {
+        this.$message.error(`文件大小不能超过 ${this.model.maxSize / (1024 * 1024)}MB`);
+        fileList.pop(); // 移除不符合要求的文件
+      }
       this.changeHandler(this.model.value);
     },
     //上传之前的钩子

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

@@ -284,7 +284,7 @@
       computeScroll(){
         this.$nextTick(() => {
           let parentDom=this.$el.parentElement;
-          if (parentDom.scrollHeight > parentDom.clientHeight
+          if (parentDom && parentDom.scrollHeight > parentDom.clientHeight
           && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
             this.isScroll = true;
           }

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

@@ -55,7 +55,9 @@
       }
     }, 
     destroyed (){
-      if(this.$refs.multipleTable.bodyWrapper)this.$refs.multipleTable.bodyWrapper.removeEventListener('scroll', this.scrollHandle);
+      if(this.$refs.multipleTable && this.$refs.multipleTable.bodyWrapper){
+        this.$refs.multipleTable.bodyWrapper.removeEventListener('scroll', this.scrollHandle);
+      }
     },  
     methods: {
       load(data) {

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

@@ -31,7 +31,7 @@
         </el-input> 
       </el-popover>
 
-      <div v-else class="textarea-box" ref="input">
+      <div v-else class="textarea-box" ref="input" :style="{'background-color':model.lock ? '#f5f7fa' : '','cursor':model.lock ? 'not-allowed' : ''}" >
         <div ref="highlights" v-if="model.forbiddenWords" class="backdrop hoverColor" 
           :style="{'width':forbiddenWordsWidth+'px','height':forbiddenWordsHeight+'px','left':forbiddenWordsLeft+'px','top':forbiddenWordsTop+'px','overflow-y': model.rows===1?'hidden':'auto','overflow-x':'hidden'}">
           <div class="highlights" :style="{'line-height':model.rows===1?1:1.5,'white-space': model.rows===1?'nowrap':'pre-wrap'}" v-html="forbiddenWordsValue"></div>

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

@@ -22,6 +22,12 @@ const Compound = function (source, sourceParent) {
     set label(v) {
       source.controlLabel = v;
     },
+    get locked() {
+      return source.locked;
+    },
+    set locked(v) {
+      source.locked = v;
+    },
     _buttons: null,
     get buttons() {
       if (rtn._buttons !== null) {
@@ -84,6 +90,40 @@ const Compound = function (source, sourceParent) {
       });
       return rtnFormObj;
     },
+    getRefFieldPara(refFieldNameArr) {
+      let submitData = {};
+      var tempFormData = rtn.getFormObj();
+      refFieldNameArr.forEach((v) => {
+        submitData[v] = tempFormData[v];
+      });
+      return submitData;
+    },
+    getParentFieldPara(parentFieldNameArr) {
+      let submitData = {};
+      var tempFormData = rtn.getFormObj();
+      parentFieldNameArr.forEach((v) => {
+        let vs=v.split('.');
+        submitData[vs[vs.length-1]] = tempFormData[v];
+        if(submitData[vs[vs.length-1]]==undefined){
+          if(rtn.self && rtn.self.parentModel){
+            submitData[vs[vs.length-1]] = rtn.self.parentModel.getFormObj()[v];
+          }
+        }
+      });
+      
+      if(JSON.stringify(submitData) == "{}"){
+        return '';
+      }
+      else{
+        if(parentFieldNameArr.length>1){
+          return JSON.stringify(submitData);
+        }
+        else{
+          let parentNameArr = parentFieldNameArr[0].split('.');
+          return submitData[parentNameArr[parentNameArr.length-1]];
+        }
+      }
+    },
     _compoundfieldsDic: null,//字典，方便取值
     get compoundfieldsDic() {
       if (rtn._compoundfieldsDic !== null) {
@@ -115,6 +155,9 @@ const Compound = function (source, sourceParent) {
           if (Index == 1 && item.label == "") {
             item.label = rtn.label;
           }
+          if(rtn.locked){
+            item.locked = rtn.locked;
+          }
           rtn.hiddenHandle(item);//是否隐藏关联组件
           rtn._fields.push(item);
         }

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

@@ -612,7 +612,13 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           configurable: true
         });
         return rtnFormObj;
-      }
+      },      
+      get maxSize() {
+        if(source.code2){
+          return source.code2 * 1024 * 1024;
+        }
+        return null;
+      },
     };
     rtn = base.copy(Base(data), rtn);
     rtn = base.copy(rtn, valid.Init(rtn));

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -349,6 +349,11 @@ const Enum = {
     /// 
     /// </summary>
     Data: 4,
+    
+    /**
+    * url
+    **/
+    Url:5,
   },
 
   /// <summary>

package/src/main.js

@@ -75,8 +75,8 @@ Vue.use(centaline, {
         EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"FLNd7t","time":1742453755758,"sign":"dcf9d289a261a3a63bfb8f29a699ac1e","systemSource":"CCESU","empNo":"maopp","empId":"2411120940038E8B1C87525447179987","clientVersion":"24.11.4.1","empName":"%E6%AF%9B%E7%AE%A1%E7%90%86","roleName":"%E9%9B%86%E5%9B%A2IT%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImYzMzE1YTYwLWU1ODctNDE0NS05NzlkLTJhOWE3NzY1ZDU4OCJ9.r7qyJcVjrHhVmC4y81xuKrVp_CbexX4D1hraycg188aOCBg0IDVkTQqJENmAOF3D_WtbGB1Lm8ntb1gPflIVYA',
+        authObject: '{"currentEstate":{"estateId":"241113105409757BFF2887A7472E99D2","estateName":"U%E7%89%88%E6%A5%BC%E7%9B%98%E6%8C%89%E7%82%B9%E4%BD%8D","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"jijlB","time":1744183725353,"sign":"528fb9ea127871dacfda5d2e56abe364","systemSource":"CCESU","empNo":"maopp","empId":"2411120940038E8B1C87525447179987","clientVersion":"12.5","empName":"%E6%AF%9B%E7%AE%A1%E7%90%86","roleName":"%E9%9B%86%E5%9B%A2IT%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjI1ZjYwYTJkLWEwNmMtNGRmNy1iNTQ1LTY1YTAwNjk5ZGI2OSJ9.8J9_ATCF2DYDE1wVr5cGoJgT9kNf1kajqkYtcr2se6s44PPMWOGaIzmpzVQTm1_Q9WD9laGM2BtKcfK2n2_aiw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作