vxe-table 4.7.71 → 4.7.73

package/lib/index.umd.js

@@ -1796,6 +1796,8 @@ var external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_defa
 ;// CONCATENATED MODULE: ./node_modules/dom-zindex/es/index.esm.js
 var storeEl = null;
 var storeId = 'z-index-manage';
+var styleEl = null;
+var styleId = 'z-index-style';
 var storeMainKey = 'm';
 var storeSubKey = 's';
 var storeData = {
@@ -1821,6 +1823,27 @@ function getDomMaxZIndex() {
   }
   return max;
 }
+function getStyle() {
+  if (!styleEl) {
+    if (isDocument()) {
+      styleEl = document.getElementById(styleId);
+      if (!styleEl) {
+        styleEl = document.createElement('style');
+        styleEl.id = styleId;
+        document.getElementsByTagName('head')[0].appendChild(styleEl);
+      }
+    }
+  }
+  return styleEl;
+}
+function updateVar() {
+  var styEl = getStyle();
+  if (styEl) {
+    var prefixes = '--dom-';
+    var propKey = '-z-index';
+    styEl.innerHTML = ':root{' + prefixes + 'main' + propKey + ':' + getCurrent() + ';' + prefixes + 'sub' + propKey + ':' + getSubCurrent() + '}';
+  }
+}
 function getDom() {
   if (!storeEl) {
     if (isDocument()) {
@@ -1851,6 +1874,7 @@ function createSetHandle(key) {
         }
       }
     }
+    updateVar();
     return storeData[key];
   };
 }
@@ -1902,6 +1926,7 @@ var DomZIndex = {
   getSubNext: getSubNext,
   getMax: getDomMaxZIndex
 };
+updateVar();
 /* harmony default export */ var index_esm = (DomZIndex);
 ;// CONCATENATED MODULE: ./packages/ui/src/utils.ts
 
@@ -1951,9 +1976,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.71";
+const version = "4.7.73";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.71";
+core_.VxeUI.tableVersion = "4.7.73";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2335,7 +2360,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.71"}`;
+const log_version = `table v${"4.7.73"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6586,7 +6611,7 @@ const {
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const bodyElemRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const dragHintElemRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
-    const dragColumn = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const dragColumnRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     let prevDropTrEl;
     const handleWrapperMouseenterEvent = evnt => {
       const {
@@ -6645,6 +6670,12 @@ const {
       $xeTable.emitCustomEvent('confirm', $event);
       $xeTable.saveCustomStore('confirm');
     };
+    const cancelCloseEvent = ({
+      $event
+    }) => {
+      $xeTable.closeCustom();
+      $xeTable.emitCustomEvent('close', $event);
+    };
     const cancelCustomEvent = ({
       $event
     }) => {
@@ -6731,35 +6762,48 @@ const {
     const changeCheckboxOption = column => {
       const isChecked = !column.renderVisible;
       const customOpts = computeCustomOpts.value;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], item => {
-        item.renderVisible = isChecked;
-        item.halfVisible = false;
-      });
-      handleOptionCheck(column);
       if (customOpts.immediate) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], item => {
+          item.visible = isChecked;
+          item.renderVisible = isChecked;
+          item.halfVisible = false;
+        });
         $xeTable.handleCustom();
         $xeTable.saveCustomStore('update:visible');
+      } else {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], item => {
+          item.renderVisible = isChecked;
+          item.halfVisible = false;
+        });
       }
+      handleOptionCheck(column);
       $xeTable.checkCustomStatus();
     };
     const changeFixedOption = (column, colFixed) => {
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
-      if (column.renderFixed === colFixed) {
-        column.renderFixed = '';
-        // $xeTable.clearColumnFixed(column)
+      const customOpts = computeCustomOpts.value;
+      if (customOpts.immediate) {
+        if (column.renderFixed === colFixed) {
+          column.fixed = '';
+          column.renderFixed = '';
+        } else {
+          if (!isMaxFixedColumn || column.renderFixed) {
+            column.fixed = colFixed;
+            column.renderFixed = colFixed;
+          }
+        }
+        $xeTable.handleCustom();
+        $xeTable.saveCustomStore('update:fixed');
       } else {
-        if (!isMaxFixedColumn || column.renderFixed) {
-          column.renderFixed = colFixed;
-          // $xeTable.setColumnFixed(column, colFixed)
+        if (column.renderFixed === colFixed) {
+          column.renderFixed = '';
+        } else {
+          if (!isMaxFixedColumn || column.renderFixed) {
+            column.renderFixed = colFixed;
+          }
         }
       }
     };
-    // const changePopupFixedOption = () => {
-    //   const isMaxFixedColumn = computeIsMaxFixedColumn.value
-    //   if (!isMaxFixedColumn) {
-    //     // $xeTable.setColumnFixed(column, column.fixed)
-    //   }
-    // }
     const allOptionEvent = () => {
       const {
         customStore
@@ -6772,15 +6816,30 @@ const {
         checkMethod
       } = customOpts;
       const isAll = !customStore.isAll;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-        if (!checkMethod || checkMethod({
-          column
-        })) {
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        }
-      });
-      customStore.isAll = isAll;
+      if (customOpts.immediate) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (!checkMethod || checkMethod({
+            column
+          })) {
+            column.visible = isAll;
+            column.renderVisible = isAll;
+            column.halfVisible = false;
+          }
+        });
+        customStore.isAll = isAll;
+        $xeTable.handleCustom();
+        $xeTable.saveCustomStore('update:visible');
+      } else {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (!checkMethod || checkMethod({
+            column
+          })) {
+            column.renderVisible = isAll;
+            column.halfVisible = false;
+          }
+        });
+        customStore.isAll = isAll;
+      }
       $xeTable.checkCustomStatus();
     };
     const sortMousedownEvent = evnt => {
@@ -6790,7 +6849,7 @@ const {
       const colid = trEl.getAttribute('colid');
       const column = $xeTable.getColumnById(colid);
       trEl.draggable = true;
-      dragColumn.value = column;
+      dragColumnRef.value = column;
       addClass(trEl, 'active--drag-origin');
     };
     const sortMouseupEvent = evnt => {
@@ -6799,7 +6858,7 @@ const {
       const trEl = tdEl.parentNode;
       const dragHintEl = dragHintElemRef.value;
       trEl.draggable = false;
-      dragColumn.value = null;
+      dragColumnRef.value = null;
       removeClass(trEl, 'active--drag-origin');
       if (dragHintEl) {
         dragHintEl.style.display = '';
@@ -6815,6 +6874,7 @@ const {
       const {
         customColumnList
       } = reactData;
+      const customOpts = computeCustomOpts.value;
       const trEl = evnt.currentTarget;
       const dragHintEl = dragHintElemRef.value;
       if (prevDropTrEl) {
@@ -6842,7 +6902,7 @@ const {
         prevDropTrEl.removeAttribute('drag-pos');
         removeClass(prevDropTrEl, 'active--drag-target');
       }
-      dragColumn.value = null;
+      dragColumnRef.value = null;
       trEl.draggable = false;
       trEl.removeAttribute('drag-pos');
       if (dragHintEl) {
@@ -6850,6 +6910,16 @@ const {
       }
       removeClass(trEl, 'active--drag-target');
       removeClass(trEl, 'active--drag-origin');
+      if (customOpts.immediate) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
+          if (!parent) {
+            const sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+        });
+        $xeTable.handleCustom();
+        $xeTable.saveCustomStore('update:sort');
+      }
     };
     const sortDragoverEvent = evnt => {
       const trEl = evnt.currentTarget;
@@ -6923,6 +6993,7 @@ const {
           const isDisabled = checkMethod ? !checkMethod({
             column
           }) : false;
+          const isHidden = !isChecked;
           colVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
             key: column.id,
             colid: column.id,
@@ -6949,40 +7020,49 @@ const {
           })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort && column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom--sort-option'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: 'vxe-table-custom--sort-btn',
+            class: ['vxe-table-custom--sort-btn', {
+              'is--disabled': isHidden
+            }],
             title: panel_getI18n('vxe.custom.setting.sortHelpTip'),
-            onMousedown: sortMousedownEvent,
-            onMouseup: sortMouseupEvent
+            ...(isHidden ? {} : {
+              onMousedown: sortMousedownEvent,
+              onMouseup: sortMouseupEvent
+            })
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
             class: panel_getIcon().TABLE_CUSTOM_SORT
-          })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), column.type === 'html' ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            key: '1',
             class: 'vxe-table-custom--checkbox-label',
-            title: colTitle
+            innerHTML: colTitle
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            key: '0',
+            class: 'vxe-table-custom--checkbox-label'
           }, colTitle), !parent && allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom--fixed-option'
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: ['vxe-table-custom--fixed-left-option', column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT, {
-              'is--checked': column.renderFixed === 'left',
-              'is--disabled': isMaxFixedColumn && !column.renderFixed
-            }],
+          }, [VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
+            mode: 'text',
+            icon: column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
+            status: column.renderFixed === 'left' ? 'primary' : '',
+            disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
             title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'),
             onClick: () => {
               changeFixedOption(column, 'left');
             }
-          }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: ['vxe-table-custom--fixed-right-option', column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT, {
-              'is--checked': column.renderFixed === 'right',
-              'is--disabled': isMaxFixedColumn && !column.renderFixed
-            }],
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
+            mode: 'text',
+            icon: column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
+            status: column.renderFixed === 'right' ? 'primary' : '',
+            disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
             title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'),
             onClick: () => {
               changeFixedOption(column, 'right');
             }
-          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
       const isAllChecked = customStore.isAll;
       const isAllIndeterminate = customStore.isIndeterminate;
+      const dragColumn = dragColumnRef.value;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         key: 'simple',
@@ -7022,18 +7102,26 @@ const {
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: dragHintElemRef,
         class: 'vxe-table-custom-popup--drag-hint'
-      }, panel_getI18n('vxe.custom.cstmDragTarget', [dragColumn.value ? dragColumn.value.getTitle() : '']))]), customOpts.showFooter ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, panel_getI18n('vxe.custom.cstmDragTarget', [dragColumn && dragColumn.type !== 'html' ? dragColumn.getTitle() : '']))]), customOpts.showFooter ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table-custom--footer'
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
-        class: 'btn--reset',
+      }, [VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
+        mode: 'text',
+        content: customOpts.resetButtonText || panel_getI18n('vxe.table.customRestore'),
         onClick: resetCustomEvent
-      }, customOpts.resetButtonText || panel_getI18n('vxe.table.customRestore')), customOpts.immediate ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
-        class: 'btn--cancel',
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), customOpts.immediate ? VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
+        mode: 'text',
+        content: customOpts.closeButtonText || panel_getI18n('vxe.table.customClose'),
+        onClick: cancelCloseEvent
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)() : VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
+        mode: 'text',
+        content: customOpts.cancelButtonText || panel_getI18n('vxe.table.customCancel'),
         onClick: cancelCustomEvent
-      }, customOpts.resetButtonText || panel_getI18n('vxe.table.customCancel')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
-        class: 'btn--confirm',
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), customOpts.immediate ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)() : VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
+        mode: 'text',
+        status: 'primary',
+        content: customOpts.confirmButtonText || panel_getI18n('vxe.table.customConfirm'),
         onClick: confirmCustomEvent
-      }, customOpts.confirmButtonText || panel_getI18n('vxe.table.customConfirm'))]) : null] : []);
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : null] : []);
     };
     const renderPopupPanel = () => {
       const {
@@ -7076,6 +7164,7 @@ const {
           const isDisabled = checkMethod ? !checkMethod({
             column
           }) : false;
+          const isHidden = !isChecked;
           trVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
             key: column.id,
             colid: column.id,
@@ -7104,21 +7193,31 @@ const {
           })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--sort'
           }, [column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: 'vxe-table-custom-popup--column-sort-btn',
+            class: ['vxe-table-custom-popup--column-sort-btn', {
+              'is--disabled': isHidden
+            }],
             title: panel_getI18n('vxe.custom.setting.sortHelpTip'),
-            onMousedown: sortMousedownEvent,
-            onMouseup: sortMouseupEvent
+            ...(isHidden ? {} : {
+              onMousedown: sortMousedownEvent,
+              onMouseup: sortMouseupEvent
+            })
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
             class: panel_getIcon().TABLE_CUSTOM_SORT
           })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-')]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--name'
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }, [column.type === 'html' ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            key: '1',
+            class: 'vxe-table-custom-popup--name',
+            innerHTML: colTitle
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            key: '0',
             class: 'vxe-table-custom-popup--name',
             title: colTitle
           }, colTitle)]), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--resizable'
-          }, [!isChecked || column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUIInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIInputComponent, {
+          }, [column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUIInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIInputComponent, {
             type: 'integer',
+            disabled: isHidden,
             modelValue: column.renderResizeWidth,
             'onUpdate:modelValue'(value) {
               column.renderResizeWidth = Math.max(0, Number(value));
@@ -7129,29 +7228,29 @@ const {
             modelValue: column.renderFixed || '',
             type: 'button',
             size: 'mini',
+            disabled: isHidden,
             options: [{
               label: panel_getI18n('vxe.custom.setting.fixedLeft'),
               value: 'left',
-              disabled: isMaxFixedColumn
+              disabled: isHidden || isMaxFixedColumn
             }, {
               label: panel_getI18n('vxe.custom.setting.fixedUnset'),
-              value: ''
+              value: '',
+              disabled: isHidden
             }, {
               label: panel_getI18n('vxe.custom.setting.fixedRight'),
               value: 'right',
-              disabled: isMaxFixedColumn
+              disabled: isHidden || isMaxFixedColumn
             }],
             'onUpdate:modelValue'(value) {
               column.renderFixed = value;
             }
-            // onChange () {
-            //   changePopupFixedOption(column)
-            // }
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
       const isAllChecked = customStore.isAll;
       const isAllIndeterminate = customStore.isIndeterminate;
+      const dragColumn = dragColumnRef.value;
       const scopedSlots = {
         default: () => {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -7211,7 +7310,7 @@ const {
           })])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             ref: dragHintElemRef,
             class: 'vxe-table-custom-popup--drag-hint'
-          }, panel_getI18n('vxe.custom.cstmDragTarget', [dragColumn.value ? dragColumn.value.getTitle() : '']))]);
+          }, panel_getI18n('vxe.custom.cstmDragTarget', [dragColumn ? dragColumn.getTitle() : '']))]);
         },
         footer: () => {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -7899,14 +7998,16 @@ const {
         const isColGroup = column.children && column.children.length;
         const isChecked = column.checked;
         const indeterminate = column.halfChecked;
+        const isHtml = column.type === 'html';
         cols.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
+          key: column.id,
           class: ['vxe-export--panel-column-option', `level--${column.level}`, {
             'is--group': isColGroup,
             'is--checked': isChecked,
             'is--indeterminate': indeterminate,
             'is--disabled': column.disabled
           }],
-          title: colTitle,
+          title: isHtml ? '' : colTitle,
           onClick: () => {
             if (!column.disabled) {
               changeOption(column);
@@ -7914,7 +8015,12 @@ const {
           }
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
           class: ['vxe-checkbox--icon', indeterminate ? export_panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? export_panel_getIcon().TABLE_CHECKBOX_CHECKED : export_panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-        }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        }), isHtml ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          key: '1',
+          class: 'vxe-checkbox--label',
+          innerHTML: colTitle
+        }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          key: '0',
           class: 'vxe-checkbox--label'
         }, colTitle)]));
       });
@@ -22855,7 +22961,7 @@ const {
   GLOBAL_EVENT_KEYS: grid_GLOBAL_EVENT_KEYS
 } = core_.VxeUI;
 const tableComponentPropKeys = Object.keys(props);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',
@@ -24401,6 +24507,7 @@ const Grid = VxeGrid;
       customTitle: '列设置',
       customAll: '全部',
       customConfirm: '确认',
+      customClose: '关闭',
       customCancel: '取消',
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个'
@@ -24753,7 +24860,8 @@ const Grid = VxeGrid;
           seqTitle: '序号',
           showSeq: '显示序号',
           showCheckbox: '允许多选',
-          errSubDrag: '子表不支持该控件，请使用其他控件'
+          errSubDrag: '子表不支持该控件，请使用其他控件',
+          colPlace: '将控件拖拽进来'
         },
         uploadProp: {
           limitFileCount: '文件数量限制',
@@ -24778,13 +24886,28 @@ const Grid = VxeGrid;
       },
       search: {
         addBtn: '编辑',
-        emptyText: '未配置查询条件'
+        emptyText: '未配置查询条件',
+        editPopupTitle: '编辑查询字段'
+      },
+      searchPopup: {
+        colTitle: '标题',
+        saveBtn: '保存'
       }
     },
     text: {
       copySuccess: '已复制到剪贴板',
       copyError: '当前环境不支持该操作'
     },
+    countdown: {
+      formats: {
+        yyyy: '年',
+        MM: '月',
+        dd: '天',
+        HH: '时',
+        mm: '分',
+        ss: '秒'
+      }
+    },
     /**
      * 扩展插件
      */