centaline-data-driven 1.6.27 → 1.6.28

package/package.json

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

package/release-log.md

@@ -1,3 +1,12 @@
+# v1.6.28
+2024-11-12
+
+优化
+
+修复表单关闭tab后，列表没有删除行数据的bug，是因为关闭tab销毁对象造成的
+
+富文本插件的zindex修改为取前端配置的zindex+99
+
 # v1.6.27
 2024-11-04
 

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="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'"  :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
@@ -39,6 +39,7 @@
     <!-- <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="'/commissionquery/properformanceszjjbreport/getLayoutOfSearch'"  :searchDataApi="'/commissionquery/properformanceszjjbreport/getList'"></ct-searchlist>
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"

package/src/centaline/api/index.js

@@ -177,10 +177,7 @@ const api = {
     }
 
     //关闭tab页
-    if (data.notification === Enum.ActionType.CloseTab
-      || data.notification === Enum.ActionType.CloseTabThenDelete
-      || data.notification === Enum.ActionType.CloseTabThenNew
-      || data.notification === Enum.ActionType.CloseTabThenUpdate) {
+    if (data.notification === Enum.ActionType.CloseTab) {
       if (typeof common.getDataDrivenOpts().handler.closeTab === 'function') {
         common.getDataDrivenOpts().handler.closeTab();
       }

package/src/centaline/dynamicD/src/dynamicD.vue

@@ -6,7 +6,7 @@
           {{model.label}}
         </div>
         <el-date-picker :class="[model.showLabel?'ct-date-editor':'']" v-model="model.value" v-bind="model.attrs"
-                        @input="inputHandler($event)" @change="change($event)" @blur="dateBlur"
+                        @input="inputHandler($event)" @change="change($event)" @blur="dateBlur" :placeholder="model.placeholder"
                         :picker-options="pickerOptions" :disabled="model.lock">
         </el-date-picker>
       </div>

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

@@ -574,7 +574,7 @@
                       });
                     }
                     else {
-                      field.doAction(self.getFormObj(), (data) => {
+                      field.doAction(self.getFormObj(), (data) => {                        
                         field.disabled = false;
                         self.model.pageDisabled = false;
                         if (data.rtnCode === 200) {
@@ -638,6 +638,11 @@
                             });
                           }).catch(() => {
                           });
+                        }                        
+                        if (data.notification === 14 || data.notification === 15|| data.notification === 16) {
+                          if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                            self.$common.getDataDrivenOpts().handler.closeTab();
+                          }
                         }
                       }, self.model.scripts);
                     }

package/src/centaline/dynamicRichText/src/dynamicRichText.vue

@@ -29,6 +29,10 @@
     },
     data() {
       const that = this;
+      let zindex=1;
+      if (this.$common.getDataDrivenOpts().zindex) {
+        zindex=this.$common.getDataDrivenOpts().zindex + 99;
+      }
       return {
         editor: {},
         config: {
@@ -140,7 +144,7 @@
             'drafts',
             'help'
           ]],
-          zIndex: 1,
+          zIndex: zindex,
           /* 上传图片配置项 */
           "imageActionName": "uploadimage222", /* 执行上传图片的action名称 */
           "imageFieldName": "file", /* 提交的图片表单名称 */
@@ -238,7 +242,8 @@
     created() {
       if (typeof this.vmodel === "undefined") {
         this.model = this.loaderObj.Base(this.source);
-      } else {
+      } 
+      else {
         this.model = this.vmodel;
       }
 

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

@@ -310,6 +310,11 @@ import dynamicElement from '../../mixins/dynamicElement';
                             });
                           }).catch(() => {
                           });
+                        }                        
+                        if (data.notification === 14 || data.notification === 15|| data.notification === 16) {
+                          if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                            self.$common.getDataDrivenOpts().handler.closeTab();
+                          }
                         }
                       }, self.model.scripts);
                     }

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

@@ -24,7 +24,13 @@ const D = function (source, dateType) {
       },
       set valueFormat(v) {
         source.valueFormat = v;
-      }
+      },
+      get placeholder() {      
+        if (source.isList && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
+          return rtn.attrs.placeholder
+        }
+        return null;
+      },
     }
   };
   rtn = base.copy(Base(source), rtn);

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

@@ -67,7 +67,7 @@ const LibFunction = {
     if (isList) {
       if (field.controlType === Enum.ControlType.Date) {
         field.width = field.width || 250;
-      } 
+      }
       else if (field.controlType === Enum.ControlType.DateTime) {
         field.width = field.width || 280;
       } 

package/src/main.js

@@ -16,7 +16,7 @@ Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.46:6060/onecard-api/",
-  // baseUrl: "http://10.88.22.46:9999/service-api/",  
+  baseUrl: "http://10.88.22.46:9999/service-api/",  
   // baseUrl: "http://10.88.22.46:22324/service-api/v1/form/router",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/onecard-api/",
@@ -26,7 +26,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.25.10.67:9999/service-api/",
   // 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/", 
+  // baseUrl: "http://10.88.22.69:8080/", 
   // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38908/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
@@ -73,7 +73,7 @@ Vue.use(centaline, {
         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.eyJsb2dpbl91c2VyX2tleSI6ImIzOWQ2MDA3LTg5NGEtNDZlYy04MmYwLTZlZWZiZmIwMDcwOSJ9.kpreU5FhBzEUP-9ODH2UWw5YmYPxuyZjcnXcFBmPHm986Hb_3O8dkcAx9UvXdK6HHLOD-i8k9bMW8J_L0T41ZA',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdiOWFiNWM5LTYyZTUtNDg3Mi04Y2U0LTFiYTk0OTlmYTFiZSJ9.P5sPnIyGxHMpULCLQ-0B-Pc5h5yXiNvdJbAHqTV75J8AE3wY4tuuOuFdI3PCjU09K8Wi1ZRqOLd42qHCj8iH8g',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

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

@@ -10147,7 +10147,7 @@ var api = {
     }
 
     //关闭tab页
-    if (data.notification === __WEBPACK_IMPORTED_MODULE_4__loader_src_ctl_lib_Enum__["default"].ActionType.CloseTab || data.notification === __WEBPACK_IMPORTED_MODULE_4__loader_src_ctl_lib_Enum__["default"].ActionType.CloseTabThenDelete || data.notification === __WEBPACK_IMPORTED_MODULE_4__loader_src_ctl_lib_Enum__["default"].ActionType.CloseTabThenNew || data.notification === __WEBPACK_IMPORTED_MODULE_4__loader_src_ctl_lib_Enum__["default"].ActionType.CloseTabThenUpdate) {
+    if (data.notification === __WEBPACK_IMPORTED_MODULE_4__loader_src_ctl_lib_Enum__["default"].ActionType.CloseTab) {
       if (typeof __WEBPACK_IMPORTED_MODULE_5__common__["default"].getDataDrivenOpts().handler.closeTab === 'function') {
         __WEBPACK_IMPORTED_MODULE_5__common__["default"].getDataDrivenOpts().handler.closeTab();
       }
@@ -11239,7 +11239,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__(185);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_121b1b59_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(617);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1dcf9d7a_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(617);
 function injectStyle (ssrContext) {
   __webpack_require__(611)
 }
@@ -11259,7 +11259,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_121b1b59_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_1dcf9d7a_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__,
@@ -11370,7 +11370,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__(154);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_d3a3de56_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__ = __webpack_require__(533);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_a11f8d94_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__ = __webpack_require__(533);
 function injectStyle (ssrContext) {
   __webpack_require__(531)
 }
@@ -11390,7 +11390,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_d3a3de56_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_a11f8d94_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__,
@@ -19679,6 +19679,11 @@ exports.f = __webpack_require__(30) ? gOPD : function getOwnPropertyDescriptor(O
                           });
                         }).catch(function () {});
                       }
+                      if (data.notification === 14 || data.notification === 15 || data.notification === 16) {
+                        if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                          self.$common.getDataDrivenOpts().handler.closeTab();
+                        }
+                      }
                     }, self.model.scripts);
                   }
                 }
@@ -29262,6 +29267,11 @@ module.exports = g;
                           });
                         }).catch(function () {});
                       }
+                      if (data.notification === 14 || data.notification === 15 || data.notification === 16) {
+                        if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                          self.$common.getDataDrivenOpts().handler.closeTab();
+                        }
+                      }
                     }, self.model.scripts);
                   }
                 }
@@ -66544,6 +66554,10 @@ var ctSpan = {
   },
   data: function data() {
     var that = this;
+    var zindex = 1;
+    if (this.$common.getDataDrivenOpts().zindex) {
+      zindex = this.$common.getDataDrivenOpts().zindex + 99;
+    }
     return {
       editor: {},
       config: {
@@ -66558,7 +66572,7 @@ var ctSpan = {
         toolbars: [['fullscreen', 'source', '|', 'undo', 'redo', '|', 'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|', 'rowspacingtop', 'rowspacingbottom', 'lineheight', '|', 'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|', 'directionalityltr', 'directionalityrtl', 'indent', '|', 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|', 'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
         //'simpleupload',
         'insertimage', 'emotion', 'scrawl', 'insertvideo', 'music', 'attachment', 'map', 'gmap', 'insertframe', 'insertcode', 'webapp', 'pagebreak', 'template', 'background', '|', 'horizontal', 'date', 'time', 'spechars', 'wordimage', '|', 'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|', 'print', 'preview', 'searchreplace', 'drafts', 'help']],
-        zIndex: 1,
+        zIndex: zindex,
         /* 上传图片配置项 */
         "imageActionName": "uploadimage222", /* 执行上传图片的action名称 */
         "imageFieldName": "file", /* 提交的图片表单名称 */
@@ -74183,7 +74197,7 @@ var content = __webpack_require__(532);
 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)("30251953", content, true, {});
+var update = __webpack_require__(3)("735d0d88", content, true, {});
 
 /***/ }),
 /* 532 */
@@ -75640,7 +75654,7 @@ var content = __webpack_require__(612);
 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)("5a563055", content, true, {});
+var update = __webpack_require__(3)("2dfdacf9", content, true, {});
 
 /***/ }),
 /* 612 */
@@ -83730,7 +83744,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_dynamicRichText_vue__ = __webpack_require__(409);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_bb26deac_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicRichText_vue__ = __webpack_require__(836);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_c17650a2_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicRichText_vue__ = __webpack_require__(836);
 function injectStyle (ssrContext) {
   __webpack_require__(833)
 }
@@ -83750,7 +83764,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_dynamicRichText_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_bb26deac_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicRichText_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_c17650a2_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicRichText_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -83771,7 +83785,7 @@ var content = __webpack_require__(834);
 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)("0c537ef8", content, true, {});
+var update = __webpack_require__(3)("57572b14", content, true, {});
 
 /***/ }),
 /* 834 */