centaline-data-driven 1.6.27 → 1.6.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.6.27",
+  "version": "1.6.29",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,
@@ -16,7 +16,9 @@
     "babel-polyfill": "^6.26.0",
     "compression-webpack-plugin": "^2.0.0",
     "element-ui": "^2.15.7",
+    "js-cookie": "^3.0.1",
     "module": "^1.2.5",
+    "moment": "^2.30.1",
     "sass": "^1.34.0",
     "save": "^2.4.0",
     "v-viewer": "^1.6.4",
@@ -24,8 +26,7 @@
     "vue-baidu-map": "^0.21.22",
     "vue-cropper": "^0.5.8",
     "vue-ueditor-wrap": "^2.5.6",
-    "vuedraggable": "^2.24.3",
-    "js-cookie": "^3.0.1"
+    "vuedraggable": "^2.24.3"
   },
   "peerDependencies": {
     "element-ui": "^2.15.7",

package/release-log.md

@@ -1,3 +1,23 @@
+# v1.6.29
+2024-11-14
+
+新增
+
+月份区间控件
+
+优化
+
+月份下拉选择控件在查询列表时修改为显示标题
+
+# 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/dynamicDtd/src/dynamicDtd.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" style="width:100%;display:flex" class="ct-Dtd" :class="[model.attrs.size?'ct-Dtd-'+model.attrs.size:''
-       ]">
+    <div v-if="model !== null" style="width:100%;display:flex" class="ct-Dtd" :class="[model.attrs.size?'ct-Dtd-'+model.attrs.size:'']">
       <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']" style="flex:1">
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
           {{model.label}}

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/Base.js

@@ -208,6 +208,7 @@ const Base = function (source) {
       else if(this.isScreen){
         if(this.type===Enum.ControlType.DateRange 
           || this.type===Enum.ControlType.DateTimeRange 
+          || this.type===Enum.ControlType.MonthRange 
           || this.type===Enum.ControlType.Location){
           this.value = this.defaultFormat[0];
           this.value1 = this.defaultFormat[1];
@@ -244,6 +245,7 @@ const Base = function (source) {
       else{
         if(this.type===Enum.ControlType.DateRange 
           || this.type===Enum.ControlType.DateTimeRange 
+          || this.type===Enum.ControlType.MonthRange 
           || this.type===Enum.ControlType.Location){
           this.value = '';
           this.value1 = '';

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

@@ -24,7 +24,7 @@ const D = function (source, dateType) {
       },
       set valueFormat(v) {
         source.valueFormat = v;
-      }
+      },
     }
   };
   rtn = base.copy(Base(source), rtn);

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

@@ -19,6 +19,9 @@ const Dtd = function (source, dateType) {
           if (dateType === "datetime") {
             return 'yyyy-MM-dd HH:mm:ss'
           }
+          else if (dateType === "month") {
+            return 'yyyy-MM'
+          }
           return 'yyyy-MM-dd'
         }
       },

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

@@ -531,6 +531,7 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
           }
           if((source.content.fields[key].controlType===Enum.ControlType.DateRange 
             || source.content.fields[key].controlType===Enum.ControlType.Location
+            || source.content.fields[key].controlType===Enum.ControlType.MonthRange
             || source.content.fields[key].controlType===Enum.ControlType.DateTimeRange)
             && source.content.fields[key].code2==undefined){
             source.content.fields[key].code2='';

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

@@ -291,6 +291,11 @@ const Enum = {
     /// </summary>
     Tags: 58,
 
+    /// <summary>
+    ///  月份区间
+    /// </summary>
+    MonthRange: 59,
+
   },
 
   //返回状态码

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

@@ -67,16 +67,17 @@ 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;
-      } 
-      else if (field.controlType === Enum.ControlType.DateRange) {
+      }
+      else if (field.controlType === Enum.ControlType.DateRange 
+        || field.controlType === Enum.ControlType.MonthRange) {
         field.width = field.width || 300;
-      } 
+      }
       else if (field.controlType === Enum.ControlType.DateTimeRange) {
         field.width = field.width || 350;
-      } 
+      }
       else if (field.controlType === Enum.ControlType.ButtonSearch ||
         field.controlType === Enum.ControlType.ButtonReset ||
         field.controlType === Enum.ControlType.ButtonAdvancedSearch) {
@@ -95,6 +96,9 @@ const LibFunction = {
       else if (field.controlType === Enum.ControlType.CheckBox) {
         showLabel = true;
       }
+      else if (field.controlType === Enum.ControlType.DateYearMonth) {
+          field.width = field.width || 200;
+      }
       else {
         showLabel = false;
         field.width = field.width || 200;
@@ -208,6 +212,10 @@ const LibFunction = {
         item = Dtd(field, 'datetime');
         item.is = 'ct-dtd';
         break;
+      case Enum.ControlType.MonthRange: //月份区间
+        item = Dtd(field, 'month');
+        item.is = 'ct-dtd';
+        break;
       case Enum.ControlType.List: //列表
         var listobj = source.list.find((v1) => {
           return v1.name === field.fieldName1;

package/src/centaline/validate/index.js

@@ -276,6 +276,7 @@ const valid = {
                 break;
               case Enum.ControlType.NumericRange:
               case Enum.ControlType.DateRange:
+              case Enum.ControlType.MonthRange:
               case Enum.ControlType.DateTimeRange:
               case Enum.ControlType.ComboBoxWithTextBox:
               case Enum.ControlType.Location:
@@ -332,6 +333,7 @@ const valid = {
               break;
             case Enum.ControlType.NumericRange:
             case Enum.ControlType.DateRange:
+            case Enum.ControlType.MonthRange:
             case Enum.ControlType.DateTimeRange:
             case Enum.ControlType.ComboBoxWithTextBox:
             case Enum.ControlType.Location:
@@ -390,6 +392,7 @@ const valid = {
                 case Enum.ControlType.NumericRange:
                   return actions.requiredArea;
                 case Enum.ControlType.DateRange:
+                case Enum.ControlType.MonthRange:
                 case Enum.ControlType.DateTimeRange:
                   return actions.requiredArea;
                 case Enum.ControlType.CheckBoxList:

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.eyJsb2dpbl91c2VyX2tleSI6IjY4YTM2YmJhLTJjZTItNDFkYi1hNTM3LTViODg1OTIwNmE0MSJ9.NPPgXYRG8LaqXrriJKsAcEUfSRg0QA98Oqw0MwvP0gDzvSY2rtu7nZDPO7gDnMIiF-hz4DuMroLrvKzYMsMM_A',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

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

@@ -6782,7 +6782,7 @@ var Base = function Base(source) {
       var _this = this;
 
       if (this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.Hidden || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.Label || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.MultiLineLabel) {} else if (this.isScreen) {
-        if (this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateTimeRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.Location) {
+        if (this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateTimeRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.MonthRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.Location) {
           this.value = this.defaultFormat[0];
           this.value1 = this.defaultFormat[1];
         } else if (this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.CheckBoxList) {
@@ -6811,7 +6811,7 @@ var Base = function Base(source) {
           this.text = this.defaultText;
         }
       } else {
-        if (this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateTimeRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.Location) {
+        if (this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.DateTimeRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.MonthRange || this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.Location) {
           this.value = '';
           this.value1 = '';
         } else if (this.type === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.CheckBoxList) {
@@ -8186,7 +8186,12 @@ var Enum = {
         /// <summary>
         ///  标签集合控件,每个标签是一个 ModelListItem 对象，可以拖动改变每个标签的顺序，locked 状态下不能拖动
         /// </summary>
-        Tags: 58
+        Tags: 58,
+
+        /// <summary>
+        ///  月份区间
+        /// </summary>
+        MonthRange: 59
 
     },
 
@@ -8903,6 +8908,7 @@ var valid = {
                 break;
               case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.NumericRange:
               case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.DateRange:
+              case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.MonthRange:
               case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.DateTimeRange:
               case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.ComboBoxWithTextBox:
               case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.Location:
@@ -8959,6 +8965,7 @@ var valid = {
               break;
             case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.NumericRange:
             case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.DateRange:
+            case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.MonthRange:
             case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.DateTimeRange:
             case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.ComboBoxWithTextBox:
             case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.Location:
@@ -9018,6 +9025,7 @@ var valid = {
                 case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.NumericRange:
                   return actions.requiredArea;
                 case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.DateRange:
+                case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.MonthRange:
                 case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.DateTimeRange:
                   return actions.requiredArea;
                 case __WEBPACK_IMPORTED_MODULE_1__loader_src_ctl_lib_Enum__["default"].ControlType.CheckBoxList:
@@ -10147,7 +10155,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();
       }
@@ -10719,7 +10727,7 @@ var LibFunction = {
         field.width = field.width || 250;
       } else if (field.controlType === __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.DateTime) {
         field.width = field.width || 280;
-      } else if (field.controlType === __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.DateRange) {
+      } else if (field.controlType === __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.DateRange || field.controlType === __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.MonthRange) {
         field.width = field.width || 300;
       } else if (field.controlType === __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.DateTimeRange) {
         field.width = field.width || 350;
@@ -10735,6 +10743,8 @@ var LibFunction = {
         field.placeholder1 = field.placeholder1 || field.controlLabel || '';
       } else if (field.controlType === __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.CheckBox) {
         showLabel = true;
+      } else if (field.controlType === __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.DateYearMonth) {
+        field.width = field.width || 200;
       } else {
         showLabel = false;
         field.width = field.width || 200;
@@ -10869,6 +10879,11 @@ var LibFunction = {
         item = Object(__WEBPACK_IMPORTED_MODULE_15__Dtd__["default"])(field, 'datetime');
         item.is = 'ct-dtd';
         break;
+      case __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.MonthRange:
+        //月份区间
+        item = Object(__WEBPACK_IMPORTED_MODULE_15__Dtd__["default"])(field, 'month');
+        item.is = 'ct-dtd';
+        break;
       case __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.List:
         //列表
         var listobj = source.list.find(function (v1) {
@@ -11239,7 +11254,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 +11274,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 +11385,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 +11405,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__,
@@ -12643,6 +12658,8 @@ var Dtd = function Dtd(source, dateType) {
         } else {
           if (dateType === "datetime") {
             return 'yyyy-MM-dd HH:mm:ss';
+          } else if (dateType === "month") {
+            return 'yyyy-MM';
           }
           return 'yyyy-MM-dd';
         }
@@ -19679,6 +19696,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 +29284,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);
                   }
                 }
@@ -52771,7 +52798,6 @@ if (typeof window !== "undefined" && "Vue" in window) {
 //
 //
 //
-//
 
 
 /* harmony default export */ __webpack_exports__["a"] = ({
@@ -57051,7 +57077,7 @@ var SearchScreen = function SearchScreen(source, callBack, screenPara, prevParam
           if (source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.From) {
             continue;
           }
-          if ((source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.DateRange || source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.Location || source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.DateTimeRange) && source.content.fields[key].code2 == undefined) {
+          if ((source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.DateRange || source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.Location || source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.MonthRange || source.content.fields[key].controlType === __WEBPACK_IMPORTED_MODULE_5__lib_Enum__["default"].ControlType.DateTimeRange) && source.content.fields[key].code2 == undefined) {
             source.content.fields[key].code2 = '';
           }
           var field = source.content.fields[key];
@@ -66544,6 +66570,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 +66588,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 +74213,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 +75670,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 */
@@ -81006,7 +81036,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_dynamicDtd_vue__ = __webpack_require__(340);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2b7790b9_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicDtd_vue__ = __webpack_require__(692);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_bf81d7c8_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicDtd_vue__ = __webpack_require__(692);
 function injectStyle (ssrContext) {
   __webpack_require__(690)
 }
@@ -81026,7 +81056,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_dynamicDtd_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2b7790b9_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicDtd_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_bf81d7c8_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicDtd_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -81047,7 +81077,7 @@ var content = __webpack_require__(691);
 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)("3bc39700", content, true, {});
+var update = __webpack_require__(3)("aa4754ce", content, true, {});
 
 /***/ }),
 /* 691 */
@@ -81068,8 +81098,7 @@ exports.push([module.i, ".ct-Dtd .ct-datepicker{width:100%;display:-webkit-box;d
 /***/ (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:"ct-Dtd",class:[_vm.model.attrs.size?'ct-Dtd-'+_vm.model.attrs.size:''
-     ],staticStyle:{"width":"100%","display":"flex"}},[_c('div',{class:[_vm.model.showLabel?'el-input-group el-input-group--prepend':'',!_vm.valid?'inputError':''],staticStyle:{"flex":"1"}},[(_vm.model.showLabel && _vm.model.label)?_c('div',{staticClass:"el-input-group__prepend",class:[_vm.model.labelClass]},[_vm._v("\n        "+_vm._s(_vm.model.label)+"\n      ")]):_vm._e(),_vm._v(" "),(_vm.model !== null)?_c('div',{staticClass:"ct-datepicker",class:[_vm.model.showLabel?'showLabel':'']},[_c('el-date-picker',_vm._b({staticClass:"ct-date-picker-editor",attrs:{"picker-options":_vm.pickerOptions,"placeholder":_vm.model.placeholder,"disabled":_vm.model.lock},on:{"change":function($event){_vm.changeModel($event)},"clear":function($event){_vm.changeModel($event)}},model:{value:(_vm.model.value),callback:function ($$v) {_vm.$set(_vm.model, "value", $$v)},expression:"model.value"}},'el-date-picker',_vm.model.attrs,false)),_vm._v(" "),_c('span',{staticClass:"ct-date-picker-span"},[_vm._v("-")]),_vm._v(" "),_c('el-date-picker',_vm._b({staticClass:"ct-date-picker-editor",attrs:{"picker-options":_vm.pickerOptions,"placeholder":_vm.model.placeholder1,"disabled":_vm.model.lock},on:{"change":function($event){_vm.changeModel($event)},"clear":function($event){_vm.changeModel($event)}},model:{value:(_vm.model.value1),callback:function ($$v) {_vm.$set(_vm.model, "value1", $$v)},expression:"model.value1"}},'el-date-picker',_vm.model.attrs,false))],1):_vm._e()]),_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      ")])]),_vm._v(" "),(_vm.model.paramName && !_vm.model.lock)?_c('ct-quick-input',{attrs:{"pn":_vm.model.paramName,"action":_vm.api}}):_vm._e()],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:"ct-Dtd",class:[_vm.model.attrs.size?'ct-Dtd-'+_vm.model.attrs.size:''],staticStyle:{"width":"100%","display":"flex"}},[_c('div',{class:[_vm.model.showLabel?'el-input-group el-input-group--prepend':'',!_vm.valid?'inputError':''],staticStyle:{"flex":"1"}},[(_vm.model.showLabel && _vm.model.label)?_c('div',{staticClass:"el-input-group__prepend",class:[_vm.model.labelClass]},[_vm._v("\n        "+_vm._s(_vm.model.label)+"\n      ")]):_vm._e(),_vm._v(" "),(_vm.model !== null)?_c('div',{staticClass:"ct-datepicker",class:[_vm.model.showLabel?'showLabel':'']},[_c('el-date-picker',_vm._b({staticClass:"ct-date-picker-editor",attrs:{"picker-options":_vm.pickerOptions,"placeholder":_vm.model.placeholder,"disabled":_vm.model.lock},on:{"change":function($event){_vm.changeModel($event)},"clear":function($event){_vm.changeModel($event)}},model:{value:(_vm.model.value),callback:function ($$v) {_vm.$set(_vm.model, "value", $$v)},expression:"model.value"}},'el-date-picker',_vm.model.attrs,false)),_vm._v(" "),_c('span',{staticClass:"ct-date-picker-span"},[_vm._v("-")]),_vm._v(" "),_c('el-date-picker',_vm._b({staticClass:"ct-date-picker-editor",attrs:{"picker-options":_vm.pickerOptions,"placeholder":_vm.model.placeholder1,"disabled":_vm.model.lock},on:{"change":function($event){_vm.changeModel($event)},"clear":function($event){_vm.changeModel($event)}},model:{value:(_vm.model.value1),callback:function ($$v) {_vm.$set(_vm.model, "value1", $$v)},expression:"model.value1"}},'el-date-picker',_vm.model.attrs,false))],1):_vm._e()]),_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      ")])]),_vm._v(" "),(_vm.model.paramName && !_vm.model.lock)?_c('ct-quick-input',{attrs:{"pn":_vm.model.paramName,"action":_vm.api}}):_vm._e()],1):_vm._e()])}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);
@@ -83730,7 +83759,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 +83779,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 +83800,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 */