centaline-data-driven 1.5.72 → 1.5.73

package/src/SearchList.vue

@@ -1,26 +1,13 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
+     <ct-searchlist :searchConditionApi="'/HolidayPublicList/getLayoutOfSearch'" :searchDataApi="'/HolidayPublicList/getListOfSearchModel'" ></ct-searchlist> 
     
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/profit-return/layout'"  :searchDataApi="'/api/third-dept-tran/profit-return'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/shift-approver/layout'"  :searchDataApi="'/api/shift-approver/list'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/api/necessaryFile/importTransFile/getLayoutOfSearch'" :searchDataApi="'/api/necessaryFile/importTransFile/getTableList'"></ct-searchlist> -->
-    
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/taskManagement/WorkingCalendarList/getLayoutOfSearch'" :searchDataApi="'//taskManagement/WorkingCalendarList/getList'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :searchConditionApi="'/mainlandsecond/CustAndContractRegSumList/getLayoutOfSearch'"  :searchDataApi="'/mainlandsecond/CustAndContractRegSumList/getList'"></ct-searchlist> -->
-
-     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> -->
-
+    <!-- <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
+      :searchDataApi="'/api/third-dept-tran/tran-list'">
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
@@ -50,12 +37,16 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
-      :searchDataApi="'/RightValueList/getListOfSearchModel'">
-    </ct-searchlist> -->
+     <!--<ct-searchlist :apiParam="para"
+      :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" 
+      :searchDataApi="'/CallTaskList/getListOfSearchModel'">
+    </ct-searchlist>--> 
 
-    <!-- <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist> -->
+    <!--<ct-searchlist 
+      :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
+      :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'"
+      :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
+    </ct-searchlist>-->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -63,42 +54,25 @@
       :searchStatsApi="'/PropertyRETList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :appRootUrl="appRootUrl"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
-    
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/DistrictList/getLayoutOfSearch'" :searchDataApi="'/DistrictList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
-    
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
+      :searchDataApi="'/EstateList/getListOfSearchModel'">
+    </ct-searchlist> -->
     
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
-  
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist> -->
-
-
+    <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'"
+      :searchDataApi="'/EstateBuildingList/getListOfSearchModel'">
+    </ct-searchlist> -->
 
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/cache/getLayoutOfSearchForCache'" :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
+      :searchDataApi="'/DistrictList/getListOfSearchModel'">
+    </ct-searchlist> -->
     
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceClassList/getLayoutOfSearch'" :searchDataApi="'/AttendanceClassList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportMonthAttendanceList/getLayoutOfSearch'" :searchDataApi="'/ReportMonthAttendanceList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PersonHolidayList/getLayoutOfSearch'" :searchDataApi="'/PersonHolidayList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearch'" :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/HolidayTypeList/getLayoutOfSearch'" :searchDataApi="'/HolidayTypeList/getListOfSearchModel'"></ct-searchlist>
-
+    <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>
@@ -110,9 +84,6 @@
     name: 'DataDrivenSearch',
     data() {
       return {
-        // appRootUrl:'http://10.88.22.13:17070/max-uplink-api/',
-        // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
-        appRootUrl:'',
         para:{
           
         },

package/src/centaline/common/index.js

@@ -354,6 +354,9 @@ const common = {
       else if (parent.$options.name === 'DataDrivenEmployeeClassList') {
         return parent;
       } 
+      else if (parent.$options.name === 'HOME') {
+        return parent;
+      } 
       else {
         return this.getParentPane(parent);
       }

package/src/centaline/dynamicCalendar/src/dynamicCalendar.vue

@@ -365,18 +365,7 @@ export default {
         self.model.doAction(action, newData,self.searchDataApi);
       });
     },
-    //删除树节点
-    remove(newData) {
-      let self = this;
-      self.getNextClickNode();
-      this.$refs.Tree.remove(self.currentNode);
-    },
-    //新增树节点
-    add(newData) {
-      let self = this;
-      this.$refs.Tree.append(newData, self.currentNode);
-      this.handleNodeClick(newData, true);
-    },
+    
     change() {
       let fullDate = moment(
         this.year + "-" + this.month + "-" + this.day,

package/src/centaline/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue

@@ -1,12 +1,12 @@
-<template>
-  <el-container  v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''"  :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
-    <div  @click="clickHandlerLayout($event)">
-      <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
-    </div>
-  </el-container>
-  <el-container  v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
-    <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
-  </el-container>
+<template>
+  <el-container  v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''"  :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <div  @click="clickHandlerLayout($event)">
+      <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+    </div>
+  </el-container>
+  <el-container  v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+  </el-container>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
@@ -37,13 +37,13 @@
       };
     },
     created() {
-      this.model = this.loaderObj.CellLayout(this.vmodel);
+      this.model = this.loaderObj.CellLayout(this.vmodel);
     },
     methods: {
       clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
         this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
-      },
-      clickHandlerLayout(ev) {
+      },
+      clickHandlerLayout(ev) {
         this.$emit(
           "click",
           this.model.routerKey,
@@ -64,16 +64,16 @@
           for (const vn of vnodes) {
             destroyDeep(vn)
           }
-        }
-        if (typeof vnode.componentInstance !== 'undefined') {
-          vnode.componentInstance.$destroy()
+        }
+        if (typeof vnode.componentInstance !== 'undefined') {
+          vnode.componentInstance.$destroy()
         }
         setTimeout(() => {
           vnode.componentInstance = undefined
           vnode.elm.innerHTML = ''
         }, 0)
       }
-      destroyDeep(this._vnode)
+      destroyDeep(this._vnode)
     },
   }
-</script>
+</script>

package/src/centaline/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

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

@@ -140,7 +140,7 @@
             'drafts',
             'help'
           ]],
-          zIndex: 16777271,
+          zIndex: 1,
           /* 上传图片配置项 */
           "imageActionName": "uploadimage222", /* 执行上传图片的action名称 */
           "imageFieldName": "file", /* 提交的图片表单名称 */

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -313,15 +313,14 @@ export default {
   },
   methods: {
     getrowselectColor(flagSelect){ 
-      if(flagSelect)
-      {
-         return {
+      if(flagSelect){
+        return {
           backgroundColor: this.backgroundColor
-         }
-        }
-        else{
-          return {};
         }
+      }
+      else{
+        return {};
+      }
     },
     theadTitleHover(ev){
      if ( !this.model.columnWidthSaveAction) {
@@ -2271,14 +2270,14 @@ export default {
   background-color: var(backgroundColor) !important;
 }
 .ct-table .ct-tr:hover .ct-td.select {
-  background-color: #ecf5ff !important;
+  background-color: var(backgroundColor) !important;
 }
 
 .ct-table .ct-td.selectMerged {
-  background-color: #ecf5ff !important;
+  background-color: var(backgroundColor) !important;
 }
 .ct-table .ct-tr:hover .ct-td.selectMerged {
-  background-color: #ecf5ff !important;
+  background-color: var(backgroundColor) !important;
 }
 
 .ct-table .ct-td.asc>.caret-wrapper>.sort-caret.ascending {

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

@@ -1,7 +1,7 @@
 import base from '../../index';
-import Base from './Base';
-import common from '../../../common';
-import Router from './Router';
+import Base from './Base';
+import common from '../../../common';
+import Router from './Router';
 import Vue from 'vue';
 const Button = function (source, router) {
   var rtn = {
@@ -15,7 +15,7 @@ const Button = function (source, router) {
     },
     set label(v) {
       source.controlLabel = v;
-    },
+    },
     get routerKey() {
       return source.routerKey;
     },
@@ -24,8 +24,8 @@ const Button = function (source, router) {
         return router.isHyperLink;
       }
       return false;
-    },
-    get isSearchRouterKey() {
+    },
+    get isSearchRouterKey() {
       if (source.controlType == 16 && source.routerKey) {
         return true;
       }
@@ -48,10 +48,10 @@ const Button = function (source, router) {
     get borderColor() {
       return source.borderColor ? source.borderColor + '' : (source.bgColor ? source.bgColor + '' : '');
     },
-    icon: '',
-    getApiData(callback, field) {
+    icon: '',
+    getApiData(callback, field) {
       var params = {
-        action: field.actionForSearch,
+        action: field.actionForSearch,
         para: {
           searchFields: field.getSearchPara(),
           pageAttribute: {
@@ -59,11 +59,11 @@ const Button = function (source, router) {
           },
           flagSearch: true
         }
-      };
+      };
       Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
-        if (response.rtnCode === 200) {
-          var Buttons = [];
-          if (response.content.toolButtons) {
+        if (response.rtnCode === 200) {
+          var Buttons = [];
+          if (response.content.toolButtons) {
             response.content.toolButtons.forEach((v) => {
               var button = Router(v);
               button.is = "ct-btn";
@@ -72,11 +72,11 @@ const Button = function (source, router) {
                 class: 'max-btn-gray'
               }
               Buttons.push(button);
-            });
-          }
+            });
+          }
           callback(response.content, Buttons);
         }
-      });
+      });
     },
   };
   if(router){

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

@@ -553,6 +553,7 @@ const FormList = function (source, master) {
           rtn._rows.push(iRow);
           Vue.set(r, 'edit', iRow.edit);
           Vue.set(r, 'delete', iRow.delete);
+          Vue.set(r, 'fontColor', iRow.fontColor);
           var gid = rtn.guid();
           rtn._rows[rtn._rows.length - 1].$sourceIndex = gid;
           r.$sourceIndex = gid;
@@ -561,6 +562,7 @@ const FormList = function (source, master) {
           rowData.$sourceIndex = gid;      
           rowData.edit = iRow.edit;
           rowData.delete = iRow.delete;
+          rowData.fontColor = iRow.fontColor;
           rtn._tableData.push(rowData);
         });
       }

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

package/src/main.js

@@ -14,8 +14,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
-  baseUrl: "http://10.88.22.13:6060/onecard-api/",
+  //baseUrl: "http://10.88.22.66:17070/max-uplink-api/",
+  baseUrl: "http://10.88.22.66:6060/onecard-api/", 
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
@@ -54,9 +54,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '11c12506-253c-4995-83fb-84cf51cb23a0',
+        oldToken: '16-1710548819277647872',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"16-1718866654626189312"}',
+        authObject: '{token:"16-1719642877547646976"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',

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

@@ -7342,6 +7342,8 @@ var common = {
         return parent;
       } else if (parent.$options.name === 'DataDrivenEmployeeClassList') {
         return parent;
+      } else if (parent.$options.name === 'HOME') {
+        return parent;
       } else {
         return this.getParentPane(parent);
       }
@@ -19101,20 +19103,6 @@ exports.f = __webpack_require__(30) ? gOPD : function getOwnPropertyDescriptor(O
         self.model.doAction(action, newData, self.searchDataApi);
       });
     },
-
-    //删除树节点
-    remove: function remove(newData) {
-      var self = this;
-      self.getNextClickNode();
-      this.$refs.Tree.remove(self.currentNode);
-    },
-
-    //新增树节点
-    add: function add(newData) {
-      var self = this;
-      this.$refs.Tree.append(newData, self.currentNode);
-      this.handleNodeClick(newData, true);
-    },
     change: function change() {
       var fullDate = __WEBPACK_IMPORTED_MODULE_2_moment___default()(this.year + "-" + this.month + "-" + this.day, "YYYY-MM-DD").format();
       this.$emit("change", fullDate);
@@ -38264,7 +38252,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_dynamicSearchTable_vue__ = __webpack_require__(301);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_7243ec6d_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(604);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1a9c057b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(604);
 function injectStyle (ssrContext) {
   __webpack_require__(566)
 }
@@ -38284,7 +38272,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_dynamicSearchTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_7243ec6d_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1a9c057b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -41127,7 +41115,7 @@ var Component = normalizeComponent(
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicLayoutChildren_vue__ = __webpack_require__(309);
 /* empty harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1a70a15e_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicLayoutChildren_vue__ = __webpack_require__(602);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_6b8185fb_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicLayoutChildren_vue__ = __webpack_require__(602);
 var normalizeComponent = __webpack_require__(1)
 /* script */
 
@@ -41144,7 +41132,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_dynamicLayoutChildren_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1a70a15e_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicLayoutChildren_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_6b8185fb_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicLayoutChildren_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -56272,6 +56260,7 @@ var FormList = function FormList(source, master) {
           rtn._rows.push(iRow);
           __WEBPACK_IMPORTED_MODULE_8_vue___default.a.set(r, 'edit', iRow.edit);
           __WEBPACK_IMPORTED_MODULE_8_vue___default.a.set(r, 'delete', iRow.delete);
+          __WEBPACK_IMPORTED_MODULE_8_vue___default.a.set(r, 'fontColor', iRow.fontColor);
           var gid = rtn.guid();
           rtn._rows[rtn._rows.length - 1].$sourceIndex = gid;
           r.$sourceIndex = gid;
@@ -56280,6 +56269,7 @@ var FormList = function FormList(source, master) {
           rowData.$sourceIndex = gid;
           rowData.edit = iRow.edit;
           rowData.delete = iRow.delete;
+          rowData.fontColor = iRow.fontColor;
           rtn._tableData.push(rowData);
         });
       }
@@ -63454,7 +63444,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: 16777271,
+        zIndex: 1,
         /* 上传图片配置项 */
         "imageActionName": "uploadimage222", /* 执行上传图片的action名称 */
         "imageFieldName": "file", /* 提交的图片表单名称 */
@@ -70028,7 +70018,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_dynamicCalendar_vue__ = __webpack_require__(149);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_658c77f3_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicCalendar_vue__ = __webpack_require__(514);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_076dba22_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicCalendar_vue__ = __webpack_require__(514);
 function injectStyle (ssrContext) {
   __webpack_require__(507)
 }
@@ -70048,7 +70038,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_dynamicCalendar_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_658c77f3_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicCalendar_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_076dba22_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicCalendar_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -70069,7 +70059,7 @@ var content = __webpack_require__(508);
 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)("3d8c8ff3", content, true, {});
+var update = __webpack_require__(3)("2e741dd0", content, true, {});
 
 /***/ }),
 /* 508 */
@@ -72096,7 +72086,7 @@ var content = __webpack_require__(567);
 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)("6eb0eed0", content, true, {});
+var update = __webpack_require__(3)("65f78cd8", content, true, {});
 
 /***/ }),
 /* 567 */
@@ -72108,7 +72098,7 @@ exports = module.exports = __webpack_require__(2)(false);
 
 
 // module
-exports.push([module.i, ".ct-tableParent{overflow:auto;border-bottom:1px solid #ebeef5;width:100%;outline:0;border-top:1px solid #ebeef5}.ct-searchtable .ct-table{min-width:100%;border-collapse:collapse}.ct-searchtable .ct-table-Shadow{border-collapse:separate}.ct-searchtable .ct-table th{background-color:#ddd!important}.ct-searchtable .ct-tr>.ct-td{padding:2px 20px;cursor:default;background-color:#fff;color:var(--centalineBlack)}.ct-searchtable .ct-tr>.ct-td1{border-right:1px solid #e7e8eb;border-left:1px solid #e7e8eb}.ct-searchtable .ct-tr:last-child>.ct-td1,.ct-searchtable .ct-tr>.ct-td2{border-bottom:1px solid #e7e8eb}.ct-searchtable .ct-tr>.ct-td3{border:1px solid #e7e8eb}.shadowLeft{-webkit-box-shadow:2px 0 3px -1px rgba(0,0,0,.1);box-shadow:2px 0 3px -1px rgba(0,0,0,.1)}.shadowRight{-webkit-box-shadow:-2px 0 3px -1px rgba(0,0,0,.1);box-shadow:-2px 0 3px -1px rgba(0,0,0,.1)}.ct-searchtable body:last-child>.ct-td{border-bottom:0}.ct-searchtable .ct-tr>.ct-td.nowidth{white-space:nowrap}.ct-table{color:#1f2233;font-size:18px;line-height:40px;min-height:40px}.ct-table-mini{font-size:12px;line-height:26px;min-height:28px}.ct-table-small{font-size:14px;line-height:32px;min-height:32px}.ct-table-medium{font-size:16px;line-height:36px;min-height:36px}.ct-table .ct-td>.caret-wrapper{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:34px;width:10px;vertical-align:middle;cursor:pointer;overflow:initial;position:relative}.ct-table .ct-td>.caret-wrapper>.sort-caret{width:0;height:0;border:5px solid transparent;position:absolute;left:7px}.ct-table .ct-td>.caret-wrapper>.sort-caret.ascending{border-bottom-color:var(--centalinePlaceholder);top:5px}.ct-table .ct-td>.caret-wrapper>.sort-caret.descending{border-top-color:var(--centalinePlaceholder);bottom:7px}.ct-table .ct-td.select{background-color:var(backgroundColor)!important}.ct-table .ct-td.selectMerged,.ct-table .ct-tr:hover .ct-td.select,.ct-table .ct-tr:hover .ct-td.selectMerged{background-color:#ecf5ff!important}.ct-table .ct-td.asc>.caret-wrapper>.sort-caret.ascending{border-bottom-color:#409eff;top:5px}.ct-table .ct-td.desc>.caret-wrapper>.sort-caret.descending{border-top-color:#409eff;bottom:7px}.ct-table .cell{text-overflow:ellipsis;overflow:hidden;overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.ct-table .lineFeedCell{min-width:40px}.ct-table .left-fixation,.ct-table .right-fixation{position:-webkit-sticky;position:sticky}.ct-table .left-fixation-th,.ct-table .right-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:99}.ct-table .right-no-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:50}.ct-table .checkbox-td{min-width:20px;width:20px;left:0}.ct-table .checkbox-td .checkbox-td-1{vertical-align:inherit}.tab-list{position:relative;margin-bottom:0!important;height:auto!important;display:block;padding-left:8px;padding-right:4px}.tab-list .subdiv_allinline{float:none;display:block;width:-webkit-fill-available;cursor:pointer}.div_allinline .Stats-popover{float:right;margin-top:3px;margin-left:0;height:16px}.icon-more{background:url(" + escape(__webpack_require__(568)) + ") no-repeat;background-size:100% 100%;width:16px;height:16px;display:table-caption;cursor:pointer}.el-popover1{min-width:inherit!important}.ct-searchtable .ct-search-table-tag{background-color:#fdf6ec;border-color:#faecd8;width:100%;-webkit-box-shadow:0 2px 10px 0 rgb(0 0 0/10%);box-shadow:0 2px 10px 0 rgb(0 0 0/10%);margin-bottom:4px}.theadLine{position:relative}.theadLine:before{position:absolute;top:50%;-webkit-transform:translatey(-50%);transform:translatey(-50%);right:0;content:\"\";width:1px;height:18px;background-color:#919296}.theadLine:last-child:before{width:0!important}.theadTitle{z-index:999;border-radius:4px;color:var(--centalineBlack);border:1px solid var(--centalineBlack);font-weight:500;white-space:nowrap}.box-card,.theadTitle{position:absolute;padding:1px 6px;background-color:#fff;font-size:12px}.box-card{z-index:1000;border-radius:4px;color:#606266;border:1px solid;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.ct-searchtable .el-loading-spinner .circular{-webkit-animation:none!important;animation:none!important}", ""]);
+exports.push([module.i, ".ct-tableParent{overflow:auto;border-bottom:1px solid #ebeef5;width:100%;outline:0;border-top:1px solid #ebeef5}.ct-searchtable .ct-table{min-width:100%;border-collapse:collapse}.ct-searchtable .ct-table-Shadow{border-collapse:separate}.ct-searchtable .ct-table th{background-color:#ddd!important}.ct-searchtable .ct-tr>.ct-td{padding:2px 20px;cursor:default;background-color:#fff;color:var(--centalineBlack)}.ct-searchtable .ct-tr>.ct-td1{border-right:1px solid #e7e8eb;border-left:1px solid #e7e8eb}.ct-searchtable .ct-tr:last-child>.ct-td1,.ct-searchtable .ct-tr>.ct-td2{border-bottom:1px solid #e7e8eb}.ct-searchtable .ct-tr>.ct-td3{border:1px solid #e7e8eb}.shadowLeft{-webkit-box-shadow:2px 0 3px -1px rgba(0,0,0,.1);box-shadow:2px 0 3px -1px rgba(0,0,0,.1)}.shadowRight{-webkit-box-shadow:-2px 0 3px -1px rgba(0,0,0,.1);box-shadow:-2px 0 3px -1px rgba(0,0,0,.1)}.ct-searchtable body:last-child>.ct-td{border-bottom:0}.ct-searchtable .ct-tr>.ct-td.nowidth{white-space:nowrap}.ct-table{color:#1f2233;font-size:18px;line-height:40px;min-height:40px}.ct-table-mini{font-size:12px;line-height:26px;min-height:28px}.ct-table-small{font-size:14px;line-height:32px;min-height:32px}.ct-table-medium{font-size:16px;line-height:36px;min-height:36px}.ct-table .ct-td>.caret-wrapper{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:34px;width:10px;vertical-align:middle;cursor:pointer;overflow:initial;position:relative}.ct-table .ct-td>.caret-wrapper>.sort-caret{width:0;height:0;border:5px solid transparent;position:absolute;left:7px}.ct-table .ct-td>.caret-wrapper>.sort-caret.ascending{border-bottom-color:var(--centalinePlaceholder);top:5px}.ct-table .ct-td>.caret-wrapper>.sort-caret.descending{border-top-color:var(--centalinePlaceholder);bottom:7px}.ct-table .ct-td.select,.ct-table .ct-td.selectMerged,.ct-table .ct-tr:hover .ct-td.select,.ct-table .ct-tr:hover .ct-td.selectMerged{background-color:var(backgroundColor)!important}.ct-table .ct-td.asc>.caret-wrapper>.sort-caret.ascending{border-bottom-color:#409eff;top:5px}.ct-table .ct-td.desc>.caret-wrapper>.sort-caret.descending{border-top-color:#409eff;bottom:7px}.ct-table .cell{text-overflow:ellipsis;overflow:hidden;overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.ct-table .lineFeedCell{min-width:40px}.ct-table .left-fixation,.ct-table .right-fixation{position:-webkit-sticky;position:sticky}.ct-table .left-fixation-th,.ct-table .right-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:99}.ct-table .right-no-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:50}.ct-table .checkbox-td{min-width:20px;width:20px;left:0}.ct-table .checkbox-td .checkbox-td-1{vertical-align:inherit}.tab-list{position:relative;margin-bottom:0!important;height:auto!important;display:block;padding-left:8px;padding-right:4px}.tab-list .subdiv_allinline{float:none;display:block;width:-webkit-fill-available;cursor:pointer}.div_allinline .Stats-popover{float:right;margin-top:3px;margin-left:0;height:16px}.icon-more{background:url(" + escape(__webpack_require__(568)) + ") no-repeat;background-size:100% 100%;width:16px;height:16px;display:table-caption;cursor:pointer}.el-popover1{min-width:inherit!important}.ct-searchtable .ct-search-table-tag{background-color:#fdf6ec;border-color:#faecd8;width:100%;-webkit-box-shadow:0 2px 10px 0 rgb(0 0 0/10%);box-shadow:0 2px 10px 0 rgb(0 0 0/10%);margin-bottom:4px}.theadLine{position:relative}.theadLine:before{position:absolute;top:50%;-webkit-transform:translatey(-50%);transform:translatey(-50%);right:0;content:\"\";width:1px;height:18px;background-color:#919296}.theadLine:last-child:before{width:0!important}.theadTitle{z-index:999;border-radius:4px;color:var(--centalineBlack);border:1px solid var(--centalineBlack);font-weight:500;white-space:nowrap}.box-card,.theadTitle{position:absolute;padding:1px 6px;background-color:#fff;font-size:12px}.box-card{z-index:1000;border-radius:4px;color:#606266;border:1px solid;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.ct-searchtable .el-loading-spinner .circular{-webkit-animation:none!important;animation:none!important}", ""]);
 
 // exports
 
@@ -80149,7 +80139,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__(398);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_64b05b9d_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicRichText_vue__ = __webpack_require__(801);
+/* 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__(801);
 function injectStyle (ssrContext) {
   __webpack_require__(798)
 }
@@ -80169,7 +80159,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_64b05b9d_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_bb26deac_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__,
@@ -80190,7 +80180,7 @@ var content = __webpack_require__(799);
 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)("5b88c2c1", content, true, {});
+var update = __webpack_require__(3)("0c537ef8", content, true, {});
 
 /***/ }),
 /* 799 */