centaline-data-driven 1.6.1 → 1.6.2

package/package.json

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

package/release-log.md

@@ -1,3 +1,12 @@
+# v1.6.2
+2024-03-13
+
+bug
+
+表单列表选择按钮传值时：如果关联控件必填且控件值为空时，则提示必须录入值；如果非必填且控件值为空，则不提示
+
+js给隐藏表格赋值报undefined错误处理
+
 # v1.6.1
 2024-03-11
 

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="'/finance/refund-apply/refundApplyInfoView'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/salemanage/ContractByPoint/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "paymentId":"1765284601361645570","actionType":"1","pageStyle":"2","pageTitle":"放款申请查看","pageOnly":"true"
+          "estateId":"2403121157406A5CD9C9DDD445A6B665","propertyId":"24031213282778E215D9738F41D88246","actionType":2,"commissionMode":"2"
         },
         topHeight:10,
       }

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

@@ -1071,12 +1071,15 @@
           submitData[v] = self.$common.getDataOfUpperLower(tempFormData, v);
           if (!submitData[v]) {
             if (self.model.fieldsDic[v]) {
-              checkMsg = "请先录入" + self.model.fieldsDic[v].label;
+              if(self.model.fieldsDic[v].required){
+                checkMsg = "请先录入" + self.model.fieldsDic[v].label;
+                check = false;
+              }
             }
             else {
               checkMsg = "未读取到表单项(" + v + ")的值";
+              check = false;
             }
-            check = false;
           }
         });
 

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

@@ -435,12 +435,16 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                     }
                     if (data.field) {
                       data.field.source[attrName] = value;
-                      data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+                      if(data.listData.$self && data.listData.$self.$refs){
+                        data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+                      }
                     }
                 }
                 else if (data.field) {
                   data.field.source[attrName] = value;
-                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+                  if(data.listData.$self && data.listData.$self.$refs){
+                    data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+                  }
                 }
 
                 //如果有汇总列，触发重新计算汇总

package/src/main.js

@@ -23,10 +23,10 @@ Vue.use(centaline, {
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  // baseUrl: "http://10.88.22.42:9999/service-api/",
+  baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38028/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  baseUrl: "https://shccai.centaline.com.cn/api/",
+  // baseUrl: "https://shccai.centaline.com.cn/api/",
   flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
@@ -60,11 +60,11 @@ Vue.use(centaline, {
         authObject: '{token:"1080-1763003422333865984"}',
 
         // 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"}',
+        EstateInfo: '{"estateId":"2403121157406A5CD9C9DDD445A6B665","estateName":"%E4%BA%91%E5%A4%A9%E5%8D%8E%E5%BA%AD-%E6%A5%BC%E4%BB%B7","estDeptPath":"087.002.001"}',
         estateId: '',
 
-        // authObject: '{"currentEstate":{"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"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"9233406a0587299328ce14a5e25c25d0","token":"","random":"AHJMhK","time":1706089834449,"sign":"09e0f18e9b1d045356b5bee6c6bb7938"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjkzODNhODQ0LWM2ZGItNDdiYy1hOWY5LTdiMjU1NjIwYjA0YSJ9.M0OCksw9h-wg1LsbSZkJbXmGM7ZaFnmsg_90Vcr_tNN_tmTUwX4ZmeJlhxNW0mbhY-sE09NDLFXtxeYAl_Ur5Q',
+        authObject: '{"currentEstate":{"estateId":"2403121157406A5CD9C9DDD445A6B665","estateName":"%E4%BA%91%E5%A4%A9%E5%8D%8E%E5%BA%AD-%E6%A5%BC%E4%BB%B7","estDeptPath":"087.002.001"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"03a1d8ca0f1509b312a49669c4755289","token":"","random":"sHDiz9","time":1710294190875,"sign":"ee2ef6cd9370987700a3c0271901bc37"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImM4YzcxNDZkLWI3ZmItNDIzNS1hYTFjLWU3ZTE4NjBhNzhkMiJ9.Z6hXk7guvqCDFk2zSwuwja5sqw0mzBANxdAPCaK0IHzd32zAK6UiFlUQ07GWFNuxY5I66OHvt2WfARecM_aISA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -11177,7 +11177,7 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABX
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__ = __webpack_require__(184);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_0782b603_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(609);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_17e702d0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(609);
 function injectStyle (ssrContext) {
   __webpack_require__(603)
 }
@@ -11197,7 +11197,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_0782b603_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_17e702d0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -29539,11 +29539,14 @@ module.exports = g;
         submitData[v] = self.$common.getDataOfUpperLower(tempFormData, v);
         if (!submitData[v]) {
           if (self.model.fieldsDic[v]) {
-            checkMsg = "请先录入" + self.model.fieldsDic[v].label;
+            if (self.model.fieldsDic[v].required) {
+              checkMsg = "请先录入" + self.model.fieldsDic[v].label;
+              check = false;
+            }
           } else {
             checkMsg = "未读取到表单项(" + v + ")的值";
+            check = false;
           }
-          check = false;
         }
       });
 
@@ -59343,11 +59346,15 @@ var Form = function Form(source, callBack, apiParam, failCallBack, isFormList) {
               }
               if (data.field) {
                 data.field.source[attrName] = value;
-                data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+                if (data.listData.$self && data.listData.$self.$refs) {
+                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+                }
               }
             } else if (data.field) {
               data.field.source[attrName] = value;
-              data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+              if (data.listData.$self && data.listData.$self.$refs) {
+                data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+              }
             }
 
             //如果有汇总列，触发重新计算汇总
@@ -73349,7 +73356,7 @@ var content = __webpack_require__(604);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(3)("6fcad8c6", content, true, {});
+var update = __webpack_require__(3)("323f32d4", content, true, {});
 
 /***/ }),
 /* 604 */