centaline-data-driven 1.6.20 → 1.6.22

package/package.json

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

package/release-log.md

@@ -1,9 +1,23 @@
- # v1.6.20
+# v1.6.22
+2024-09-18
+
+优化
+
+steps控件支持各个步骤自定义状态
+
+# v1.6.21
+2024-09-14
+
+BUG
+
+查询条件必填验证bug处理，必须先判断有没有查询条件
+
+# v1.6.20
 2024-09-13
 
 BUG
 
-分片上传，API强制报错，删除当前文件 
+分片上传，API强制报错，删除当前文件
 
 保存按钮浮动样式修复
 

package/src/SearchList.vue

@@ -31,14 +31,14 @@
 
     <!-- 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="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/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> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/EntranceNoticeInfoList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/EntranceNoticeInfoList/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/EntranceNoticeInfoList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/EntranceNoticeInfoList/getList'"></ct-searchlist> -->
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -106,6 +106,8 @@
     
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> -->
 
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterList/getListOfSearchModel'"></ct-searchlist> -->
+
 
     <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
 :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
@@ -150,7 +152,9 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          "type":"left"
+          type
+: 
+"top"
         },
       }
     },

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-                 :searchConditionApi="'/DepartmentList/getLayoutOfSearch'"
-                 :searchDataApi="'/DepartmentList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
+                 :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

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

@@ -789,54 +789,56 @@ import dynamicElement from '../../mixins/dynamicElement';
         var rtnBool = true;
         var i = 0;
 
-        self.$refs.Fields.forEach((f) => {
-          if (f.model && typeof f.validExcute !== 'undefined') {
-            if (!f.validExcute()) {
-              if (i === 0) {
-                if (f.model.is == "ct-file"||f.model.is == "ct-repeat"||f.model.is == "ct-form-list-table") {
-                  self.$message({
-                    message: f.validMessage,
-                    type: 'error',
-                    showClose:true,
-                  });
-                }
-                else {
-                  if (f.validMessage) {
-                    if (f.validMessage == '必填' && (f.model.label || (f.model.attrs && f.model.attrs.placeholder))) {
-                      let m=f.model.label;
-                      if(!m && f.model.attrs && f.model.attrs.placeholder){
-                        m=f.model.attrs.placeholder;
+        if(self.$refs && self.$refs.Fields){
+          self.$refs.Fields.forEach((f) => {
+            if (f.model && typeof f.validExcute !== 'undefined') {
+              if (!f.validExcute()) {
+                if (i === 0) {
+                  if (f.model.is == "ct-file"||f.model.is == "ct-repeat"||f.model.is == "ct-form-list-table") {
+                    self.$message({
+                      message: f.validMessage,
+                      type: 'error',
+                      showClose:true,
+                    });
+                  }
+                  else {
+                    if (f.validMessage) {
+                      if (f.validMessage == '必填' && (f.model.label || (f.model.attrs && f.model.attrs.placeholder))) {
+                        let m=f.model.label;
+                        if(!m && f.model.attrs && f.model.attrs.placeholder){
+                          m=f.model.attrs.placeholder;
+                        }
+                        self.$message({
+                          message: '【' + m + '】' + f.validMessage,
+                          type: 'error',
+                          showClose:true,
+                        });
+                      }
+                      else {
+                        self.$message({
+                          message: f.validMessage,
+                          type: 'error',
+                          showClose:true,
+                        });
                       }
-                      self.$message({
-                        message: '【' + m + '】' + f.validMessage,
-                        type: 'error',
-                        showClose:true,
-                      });
                     }
                     else {
-                      self.$message({
-                        message: f.validMessage,
-                        type: 'error',
-                        showClose:true,
-                      });
-                    }
-                  }
-                  else {
-                    if (f.model.label) {
-                      self.$message({
-                        message: '【' + f.model.label + '】不能为空！',
-                        type: 'error',
-                        showClose:true,
-                      });
+                      if (f.model.label) {
+                        self.$message({
+                          message: '【' + f.model.label + '】不能为空！',
+                          type: 'error',
+                          showClose:true,
+                        });
+                      }
                     }
                   }
                 }
+                i++;
+                rtnBool = false;
               }
-              i++;
-              rtnBool = false;
             }
-          }
-        });
+          });
+        }
         return rtnBool;
       },
     }

package/src/centaline/dynamicSteps/src/dynamicSteps.vue

@@ -8,7 +8,7 @@
         <div>
           <el-steps :space="model.code2.space" :direction="model.code2.direction" :active="model.code2.active" :simple="model.code2.simple"
           :process-status="model.code2.processStatus" :finish-status="model.code2.finishStatus" :align-center="model.code2.alignCenter">
-            <el-step v-for="(step, index) in model.code1" :key="index" :title="step.title" :icon="step.icon">
+            <el-step v-for="(step, index) in model.code1" :key="index" :title="step.title" :icon="step.icon" :status="step.status">
               <div slot="description" v-html="step.description">
               </div>
             </el-step>            

package/src/main.js

@@ -21,6 +21,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/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/",
   // baseUrl: "http://10.25.10.67:9999/service-api/",
   // baseUrl: "http://10.25.10.69:8080/",
@@ -65,14 +66,14 @@ Vue.use(centaline, {
       return {
         oldToken: 'c48263f0-1b23-4599-96de-323f4507dc61',
         token:'1080-1762727915918856192',
-        // authObject: '{EmpID:"Token_6be80085-263f-4520-89bc-d789cb4717fb",MachineCode:"9c0cdf10-9296-4647-bd39-28eac046cf19",SSO_Token:"SSOToken_6be80085-263f-4520-89bc-d789cb4717fb",Platform:"WEB"}',
+        // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOiv5s2t76YztNBwiioMjhQqRRAIh7g4R0NEzxSummXcX81rETqgP8GO-dEFxNHazLBmQOAMHdJACsdbeZU6-8zaaNpCGjMYDmryHEFSEnDKlyJJaVqIR9XoWO-W0NQ6JZCOmfnkL7b3axDrXy6He_nHutEyv7NEWPRhlgWyRgAOO4PsRQRuWfXGjHGsVjycAAAD__w.Qknnm6TUNucBNAg_xMRzDifR5WHBjlHG4GN65hzN1Hk"}',
 
         // 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: '',
 
         authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"YSLnFY","time":1726133598476,"sign":"e08cc3c4257654dcc6b8063e3cb9b1b3","systemSource":"CCESU","empNo":"24988","empId":"202110201430497BB5FE89123A054CCA"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImJiY2MyNDFmLTA3NTYtNDViYy04NWEwLWViOWM0NmYxZWQyNCJ9.p799X66qZJjJlnSNp6KcYSRS9xVX_T6BXikb7Y80Fcwj0NgjOdbFTGN-n_ir1qIuKGTnjYAAhdqLR3n_acf8cA',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjljZThhNWI5LThjMjktNDgxOS1iNDEzLTJiN2EzYmNiY2ZkZiJ9.6cvhMVWgsSDbkApll1_F4N4ScJHJJbE66KuncCa3NY2I6FXKjwPlJ3kmF598jSnhXvvbT63GXx7QPvtj5XNW5A',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

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

@@ -11357,7 +11357,7 @@ module.exports = {};
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchScreen_vue__ = __webpack_require__(155);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_77c68ad0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__ = __webpack_require__(531);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3c50af46_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__ = __webpack_require__(531);
 function injectStyle (ssrContext) {
   __webpack_require__(529)
 }
@@ -11377,7 +11377,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_dynamicSearchScreen_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_77c68ad0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3c50af46_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -20446,51 +20446,53 @@ exports.f = __webpack_require__(30) ? gOPD : function getOwnPropertyDescriptor(O
       var rtnBool = true;
       var i = 0;
 
-      self.$refs.Fields.forEach(function (f) {
-        if (f.model && typeof f.validExcute !== 'undefined') {
-          if (!f.validExcute()) {
-            if (i === 0) {
-              if (f.model.is == "ct-file" || f.model.is == "ct-repeat" || f.model.is == "ct-form-list-table") {
-                self.$message({
-                  message: f.validMessage,
-                  type: 'error',
-                  showClose: true
-                });
-              } else {
-                if (f.validMessage) {
-                  if (f.validMessage == '必填' && (f.model.label || f.model.attrs && f.model.attrs.placeholder)) {
-                    var m = f.model.label;
-                    if (!m && f.model.attrs && f.model.attrs.placeholder) {
-                      m = f.model.attrs.placeholder;
+      if (self.$refs && self.$refs.Fields) {
+        self.$refs.Fields.forEach(function (f) {
+          if (f.model && typeof f.validExcute !== 'undefined') {
+            if (!f.validExcute()) {
+              if (i === 0) {
+                if (f.model.is == "ct-file" || f.model.is == "ct-repeat" || f.model.is == "ct-form-list-table") {
+                  self.$message({
+                    message: f.validMessage,
+                    type: 'error',
+                    showClose: true
+                  });
+                } else {
+                  if (f.validMessage) {
+                    if (f.validMessage == '必填' && (f.model.label || f.model.attrs && f.model.attrs.placeholder)) {
+                      var m = f.model.label;
+                      if (!m && f.model.attrs && f.model.attrs.placeholder) {
+                        m = f.model.attrs.placeholder;
+                      }
+                      self.$message({
+                        message: '【' + m + '】' + f.validMessage,
+                        type: 'error',
+                        showClose: true
+                      });
+                    } else {
+                      self.$message({
+                        message: f.validMessage,
+                        type: 'error',
+                        showClose: true
+                      });
                     }
-                    self.$message({
-                      message: '【' + m + '】' + f.validMessage,
-                      type: 'error',
-                      showClose: true
-                    });
                   } else {
-                    self.$message({
-                      message: f.validMessage,
-                      type: 'error',
-                      showClose: true
-                    });
-                  }
-                } else {
-                  if (f.model.label) {
-                    self.$message({
-                      message: '【' + f.model.label + '】不能为空！',
-                      type: 'error',
-                      showClose: true
-                    });
+                    if (f.model.label) {
+                      self.$message({
+                        message: '【' + f.model.label + '】不能为空！',
+                        type: 'error',
+                        showClose: true
+                      });
+                    }
                   }
                 }
               }
+              i++;
+              rtnBool = false;
             }
-            i++;
-            rtnBool = false;
           }
-        }
-      });
+        });
+      }
       return rtnBool;
     }
   }
@@ -72957,7 +72959,7 @@ var content = __webpack_require__(530);
 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)("26486c10", content, true, {});
+var update = __webpack_require__(3)("7c53647c", content, true, {});
 
 /***/ }),
 /* 530 */
@@ -83169,7 +83171,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSteps_vue__ = __webpack_require__(414);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_19c6dbe0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSteps_vue__ = __webpack_require__(870);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_a16309a2_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSteps_vue__ = __webpack_require__(870);
 function injectStyle (ssrContext) {
   __webpack_require__(868)
 }
@@ -83189,7 +83191,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_dynamicSteps_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_19c6dbe0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSteps_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_a16309a2_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSteps_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -83210,7 +83212,7 @@ var content = __webpack_require__(869);
 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)("5f3347a6", content, true, {});
+var update = __webpack_require__(3)("a6dba7ac", content, true, {});
 
 /***/ }),
 /* 869 */
@@ -83231,7 +83233,7 @@ exports.push([module.i, ".ct-Steps{width:100%}", ""]);
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"field-top"},[(_vm.model !== null)?_c('div',{staticClass:"ccai ct-Steps"},[_c('div',{class:[_vm.model.showLabel?'el-input-group el-input-group--prepend':'',!_vm.valid?'inputError':''],staticStyle:{"display":"inline-block"}},[(_vm.model.showLabel && _vm.model.label)?_c('div',{class:[_vm.model.labelClass],staticStyle:{"text-align":"left","padding-bottom":"5px","color":"#303133"}},[_c('h5',[_vm._v(_vm._s(_vm.model.label))])]):_vm._e(),_vm._v(" "),_c('div',[_c('el-steps',{attrs:{"space":_vm.model.code2.space,"direction":_vm.model.code2.direction,"active":_vm.model.code2.active,"simple":_vm.model.code2.simple,"process-status":_vm.model.code2.processStatus,"finish-status":_vm.model.code2.finishStatus,"align-center":_vm.model.code2.alignCenter}},_vm._l((_vm.model.code1),function(step,index){return _c('el-step',{key:index,attrs:{"title":step.title,"icon":step.icon}},[_c('div',{attrs:{"slot":"description"},domProps:{"innerHTML":_vm._s(step.description)},slot:"description"})])}))],1)]),_vm._v(" "),_c('transition',{attrs:{"name":"el-fade-in"}},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(!_vm.valid),expression:"!valid"}],staticClass:"errorMessage"},[_vm._v("\n        "+_vm._s(_vm.validMessage)+"\n      ")])])],1):_vm._e()])}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"field-top"},[(_vm.model !== null)?_c('div',{staticClass:"ccai ct-Steps"},[_c('div',{class:[_vm.model.showLabel?'el-input-group el-input-group--prepend':'',!_vm.valid?'inputError':''],staticStyle:{"display":"inline-block"}},[(_vm.model.showLabel && _vm.model.label)?_c('div',{class:[_vm.model.labelClass],staticStyle:{"text-align":"left","padding-bottom":"5px","color":"#303133"}},[_c('h5',[_vm._v(_vm._s(_vm.model.label))])]):_vm._e(),_vm._v(" "),_c('div',[_c('el-steps',{attrs:{"space":_vm.model.code2.space,"direction":_vm.model.code2.direction,"active":_vm.model.code2.active,"simple":_vm.model.code2.simple,"process-status":_vm.model.code2.processStatus,"finish-status":_vm.model.code2.finishStatus,"align-center":_vm.model.code2.alignCenter}},_vm._l((_vm.model.code1),function(step,index){return _c('el-step',{key:index,attrs:{"title":step.title,"icon":step.icon,"status":step.status}},[_c('div',{attrs:{"slot":"description"},domProps:{"innerHTML":_vm._s(step.description)},slot:"description"})])}))],1)]),_vm._v(" "),_c('transition',{attrs:{"name":"el-fade-in"}},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(!_vm.valid),expression:"!valid"}],staticClass:"errorMessage"},[_vm._v("\n        "+_vm._s(_vm.validMessage)+"\n      ")])])],1):_vm._e()])}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);