centaline-data-driven 1.6.50 → 1.6.52

package/package.json

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

package/release-log.md

@@ -1,3 +1,23 @@
+# v1.6.52
+2025-09-01
+
+优化
+
+Field添加隐藏属性
+
+Field添加显示相关的控制
+
+BUG
+
+表单重启一行<br/>不起效果处理
+
+# v1.6.51
+2025-08-07
+
+BUG
+
+搜索下拉框在App端无法唤起键盘输入的问题
+
 # v1.6.50
 2025-08-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="'/employee/readDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/property/readPropertyUpdateDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "empId":"20221125090727B9ADEDF567D9130923","columnName":"empNameNo","actionType":3
+          "estateId":"241112160400DF3DC1EB63A14A1DBBF4","propertyId":"2411121629063ADD517E35104A4E98FD","actionType":3
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -38,6 +38,7 @@
     <!-- <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="'/roomtypelist/getLayoutOfSearch'"  :searchDataApi="'/roomtypelist/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/app/workbenchdetails/getContractLayoutOfSearch'"  :searchDataApi="'/app/workbenchdetails/getContractList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- CCES -->
 

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

@@ -30,7 +30,7 @@
         <el-row v-if="collapseFieldsRow.length > 0">
           <template v-for="(col, index) in collapseFieldsRow[0]">
             <template v-if="col.show !== false && col.lineFeed">
-              <br/>
+              <div style="float: left;width: 100%;"></div>
               <el-col :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
                 <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
                        :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
@@ -62,7 +62,7 @@
             <el-row>
               <template v-for="(col, index) in collapseFieldsRow[index + 1]">
                 <template v-if="col.show !== false && col.lineFeed">
-                  <br/>
+                  <div style="display: flex; flex: 0 0 100%;"></div>
                   <el-col :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                     <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
                            :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
@@ -99,7 +99,7 @@
             <el-row>
               <template v-for="(col, index) in collapseFieldsRow[index + 1]">
                 <template v-if="col.show !== false && col.lineFeed">
-                  <br/>
+                  <div style="display: flex; flex: 0 0 100%;"></div>
                   <el-col :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                     <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
                             :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
@@ -130,7 +130,7 @@
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <template v-for="(col, index) in independentItem">
             <template v-if="col.show !== false && col.lineFeed">
-              <br/>
+              <div style="display: flex; flex: 0 0 100%;"></div>
               <el-col :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
               <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
                        :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -82,6 +82,11 @@
         this.model.value = this.$common.numFloat(this.model.value, this.model.decimals, this.inputOld);//保留n位小数 
         if (this.model.max !== "" && parseFloat(this.model.value) > parseFloat(this.model.max)) {
           this.model.value = this.inputOld;
+          this.$message({
+            message: '【' + this.model.label + '】最大值为' + this.model.max,
+            type: 'error',
+            showClose:true,
+          });
         }
 
         this.inputHandler(this.model.value);

package/src/centaline/dynamicSosNew/src/dynamicSosNew.vue

@@ -105,14 +105,14 @@
         if (this.model.popupSearchListType === 1){
           this.$refs.refselect.popperElm.hidden = true
         }
-        if(flag){
-          this.removeReadOnly();
-        }
+        this.removeReadOnly();
       },
       removeReadOnly() {
         this.$nextTick(() => {
-          const input = this.$refs.select.$el.querySelector('.el-input__inner');
-          input.removeAttribute('readonly');
+          setTimeout(() => {
+            const input = this.$refs.refselect.$el.querySelector('.el-input__inner');
+            input.removeAttribute('readonly');
+          }, 200);
         });
       },
       soChange: function (value) {
@@ -170,5 +170,7 @@
   }
 </script>
 <style>
-
+.el-scrollbar .el-scrollbar__bar {
+  opacity: 1 !important;
+}
 </style>

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

@@ -104,6 +104,9 @@ const Base = function (source) {
       if (typeof source.show !== "undefined") {
         return source.show;
       }
+      if (source.hidden) {
+        return !source.hidden;
+      }
       return true;
     },
     set show(v) {
@@ -424,6 +427,27 @@ const Base = function (source) {
     get vueComponentName() {
       return source.vueComponentName;
     },
+    //是否显示
+    get hidden() {
+      return source.hidden;
+    },
+    set hidden(v) {
+      source.hidden = v;
+    },
+    //决定其显示相关的字段
+    get displayRelationField() {
+      return source.displayRelationField;
+    },
+    set displayRelationField(v) {
+      source.displayRelationField = v;
+    },
+    //决定其显示相关字段的值
+    get displayRelationFieldValue() {
+      return source.displayRelationFieldValue;
+    },
+    set displayRelationFieldValue(v) {
+      source.displayRelationFieldValue = v;
+    },
   };
 
   return rtn;

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

@@ -205,7 +205,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       get onload() {
         return source.onload;
       },
-      formData:{        
+      formData:{
         common: common,
         Axios: Axios,
         form: null,
@@ -261,6 +261,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
               rtn1.jsSetFile(attrValue);
             }
 
+            if (attrKey == 'hidden') {
+              rtn1.source['show'] = !attrValue
+            }
             rtn1.source[attrKey] = attrValue;
             if (rtn1.source.controlType === 23) {
               if (rtn1["options"].length == 0) {
@@ -613,6 +616,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                   attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
                 }
               }
+            if (attrKey == 'hidden') {
+              rtn1.source['show'] = !attrValue
+            }
             rtn1.source[attrKey] = attrValue;
             this.self.hatchHandle(id, attrKey, attrValue, rtn1);
 
@@ -764,16 +770,31 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           let field = null;
 
           for (var i in rtn.source.fields) {
-            if (rtn.source.fields[i].hiddenRelationField === item.id) {
+            if (rtn.source.fields[i].hiddenRelationField && rtn.source.fields[i].hiddenRelationField === item.id) {
               field = rtn.source.fields[i];
 
               if (field) {
                 let hiddenValueArr = field.hiddenRelationFieldValue.split(',');
-                if (hiddenValueArr.indexOf(item.code1) > -1) {
-                  field.show = false;
+                if (item.type == Enum.ControlType.MultiSelectWithSearch || item.type == Enum.ControlType.MultiSelectNoSearch) {
+                  field.show = true;
+                  var value = item.code1 === '' ? [''] : JSON.parse(item.code1)
+                  if (value.length > 0) {
+                    value.forEach((v) => {
+                      if (v.flagDeleted !== true) {
+                        if (hiddenValueArr.indexOf(v.code) > -1) {
+                          field.show = false;
+                        }
+                      }
+                    });
+                  }
                 }
                 else {
-                  field.show = true;
+                  if (hiddenValueArr.indexOf(item.code1) > -1) {
+                    field.show = false;
+                  }
+                  else {
+                    field.show = true;
+                  }
                 }
 
                 //本组件隐藏，子组件必须隐藏
@@ -787,8 +808,43 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 }
               }
             }
-          }
+            else if(rtn.source.fields[i].displayRelationField && rtn.source.fields[i].displayRelationField === item.id){
+              field = rtn.source.fields[i];
 
+              if (field) {
+                let displayValueArr = field.displayRelationFieldValue.split(',');
+                if (item.type == Enum.ControlType.MultiSelectWithSearch || item.type == Enum.ControlType.MultiSelectNoSearch) {
+                  field.show = false;
+                  var value = item.code1 === '' ? [''] : JSON.parse(item.code1)
+                  if (value.length > 0) {
+                    value.forEach((v) => {
+                      if (v.flagDeleted !== true) {
+                        if (displayValueArr.indexOf(v.code) > -1) {
+                          field.show = true;
+                        }
+                      }
+                    });
+                  }
+                }
+                else {
+                  if (displayValueArr.indexOf(item.code1) > -1) {
+                    field.show = true;
+                  }
+                  else {
+                    field.show = false;
+                  }
+                }
+
+                if(!item.show && item.type !== Enum.ControlType.Hidden)field.show = false;
+
+                sign = true;
+
+                if (update && rtn.self && sign) {
+                  rtn.self.$forceUpdate();
+                }
+              }
+            }
+          }
         }
       },
       hiddenHandlesource(item){

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

@@ -10,6 +10,9 @@ const T = function (source) {
       if (typeof source.show !== "undefined") {
         flagShow = source.show;
       }
+      else if (source.hidden) {
+        flagShow = !source.hidden;
+      }
       if(!rtn.labelValue && !rtn.label){
         flagShow = false;
       }

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

@@ -70,7 +70,9 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
               && attrValue != undefined && attrValue != null && attrValue != '') {
               rtn1.jsSetFile(attrValue);
             }
-
+            if (attrKey == 'hidden') {
+              rtn1.source['show'] = !attrValue
+            }
             rtn1.source[attrKey] = attrValue;
             this.form.hatchHandle(id, attrKey, attrValue, rtn1);
 
@@ -888,7 +890,7 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
           
           if(rtn.sourceFieldsArr){
             for (var i in rtn.sourceFieldsArr) {
-              if (rtn.sourceFieldsArr[i].hiddenRelationField === item.id) {
+              if (rtn.sourceFieldsArr[i].hiddenRelationField && rtn.sourceFieldsArr[i].hiddenRelationField === item.id) {
                 field = rtn.sourceFieldsArr[i];
 
                 if (field) {
@@ -901,12 +903,24 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
                   }
                 }
               }
+              else if(rtn.sourceFieldsArr[i].displayRelationField && rtn.sourceFieldsArr[i].displayRelationField === item.id){
+                field = rtn.sourceFieldsArr[i];
+                if (field) {
+                  let displayValueArr = field.displayRelationFieldValue.split(',');
+                  if (displayValueArr.indexOf(item.code1) > -1) {
+                    field.show = true;
+                  }
+                  else {
+                    field.show = false;
+                  }
+                }
+              }
             }
           }
 
           if(rtn._screen){
             for (var i in rtn._screen) {
-              if (rtn._screen[i].hiddenId === item.id) {
+              if (rtn._screen[i].hiddenId && rtn._screen[i].hiddenId === item.id) {
                 field = rtn._screen[i];
 
                 if (field) {
@@ -920,12 +934,25 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
                   field.keyScreen=field.id+Math.random();
                 }
               }
+              else if(rtn._screen[i].displayRelationField && rtn._screen[i].displayRelationField === item.id){
+                field = rtn._screen[i];
+                if (field) {
+                  let displayValueArr = field.displayRelationFieldValue.split(',');
+                  if (displayValueArr.indexOf(item.code1) > -1) {
+                    field.show = true;
+                  }
+                  else {
+                    field.show = false;
+                  }
+                  field.keyScreen=field.id+Math.random();
+                }
+              }
             }
           }
           
           if(rtn._highScreen){
             for (var i in rtn._highScreen) {
-              if (rtn._highScreen[i].hiddenId === item.id) {
+              if (rtn._highScreen[i].hiddenId && rtn._highScreen[i].hiddenId === item.id) {
                 field = rtn._highScreen[i];
 
                 if (field) {
@@ -939,6 +966,19 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
                   field.keyScreen=field.id+Math.random();
                 }
               }
+              else if(rtn._highScreen[i].displayRelationField && rtn._highScreen[i].displayRelationField === item.id){
+                field = rtn._highScreen[i];
+                if (field) {
+                  let displayValueArr = field.displayRelationFieldValue.split(',');
+                  if (displayValueArr.indexOf(item.code1) > -1) {
+                    field.show = true;
+                  }
+                  else {
+                    field.show = false;
+                  }
+                  field.keyScreen=field.id+Math.random();
+                }
+              }
             }
           }
         }

package/src/main.js

@@ -23,7 +23,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:9004/max-uplink-api/",
   // baseUrl:"http://szamaxbusiness-api-test2.centaline.com.cn/max-uplink-api/",
-  // baseUrl: "http://10.88.22.13:6060/onecard-api/",
+  // baseUrl: "http://10.88.22.13:7070/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.28.21.164:9004/max-uplink-api/",
   // baseUrl: "http://10.25.10.63:9999/service-api/",
@@ -70,15 +70,15 @@ Vue.use(centaline, {
       return {
         oldToken: 'c827efdb-95fd-4b50-9b65-4e3f736acb53',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw',
-        // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjkluAjEQAP_iMy315ulubjZjX_IIxGSMBCfEIoGi_D1EeURupbpUfaXbY0nbxDY3bRNBbSSgrPImYUDMea6lt2q8j16yz6jAHBW0WwcPE8gUUtC9tqp73yExMkHeFQO1kqHkHiBtUnO0GSunTRrPS9qSaUxM4rpJp8P9T2TR-BWP27h-jNd_zJ3vp3fWjI1kXSHiM0BXDFgGLXDU42FycedlpO8fAAAA__8.ivEDjo_ZDzbRbY8bF3PeEQaGhl5uvrVbVDPjq9iYHb4"}',
+        // authObject: '{token:"jiangzf-1955865005534617600",platform:"WEB"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         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: '',
         appinfo:'{"appId":"8F184E91-2C73-45E3-B518-889491E07CDA","appName":"%E6%95%B0%E6%8D%AE%E9%A9%B1%E5%8A%A8%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0"}',
 
-        authObject: '{"currentEstate":{"estateId":"241112160400DF3DC1EB63A14A1DBBF4","estateName":"%E6%B5%8B%E8%AF%95%E6%8C%89%E7%82%B9%E4%BD%8Dhq","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"6TnEgk","time":1749115399017,"sign":"3a50eb5f08b7bd75b2e7c99f32fa220e","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%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%2FCCES%E7%BB%84"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjlmODc5NTA3LWJmZTgtNDY0MS04ZGE5LWJhOTQ2NjhjNjc0MCJ9.2MoGUYsd88MqzvNsOclX3pb-xX-CVWYPVip3c_B1kxGoKTsvgPbq-oEzMa_xsJ5ZZBTiauHAb21MjJdpnolzyA',
+        authObject: '{"currentEstate":{"estateId":"241112160400DF3DC1EB63A14A1DBBF4","estateName":"%E6%B5%8B%E8%AF%95%E6%8C%89%E7%82%B9%E4%BD%8Dhq","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"CcTkw4","time":1756699289470,"sign":"805964fbed32f7be5e46e9903c4ec631","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%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%2FCCES%E7%BB%84"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjA1YTUzMWIxLTBiOTYtNDI5OS1hODU3LTI5NTRhOTE0OTE1NCJ9.MYBWLR7_cxK9P-zQoZyO2OLcQE_ucbatLk5iwQ_IJAGdTBsgiKEw8k_2YpK3kvi78FrvypYs49tEWDNOtAElmw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作