vxe-table 4.7.73 → 4.7.75

package/lib/index.umd.js

@@ -1976,9 +1976,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.73";
+const version = "4.7.75";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.73";
+core_.VxeUI.tableVersion = "4.7.75";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2360,7 +2360,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.73"}`;
+const log_version = `table v${"4.7.75"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4298,26 +4298,29 @@ const Cell = {
     const editSlot = slots ? slots.edit : null;
     const compConf = cell_renderer.get(editRender.name);
     const rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
+    const cellParams = Object.assign({
+      $type: '',
+      isEdit
+    }, params);
     if (isEdit) {
+      cellParams.$type = 'edit';
       if (editSlot) {
-        return $table.callSlot(editSlot, params);
+        return $table.callSlot(editSlot, cellParams);
       }
       if (rtEdit) {
-        return getSlotVNs(rtEdit(editRender, Object.assign({
-          $type: 'edit'
-        }, params)));
+        return getSlotVNs(rtEdit(editRender, cellParams));
       }
       return [];
     }
     if (defaultSlot) {
-      return $table.callSlot(defaultSlot, params);
+      return $table.callSlot(defaultSlot, cellParams);
     }
     if (formatter) {
       return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-cell--label'
-      }, getDefaultCellLabel(params))];
+      }, getDefaultCellLabel(cellParams))];
     }
-    return Cell.renderDefaultCell(params);
+    return Cell.renderDefaultCell(cellParams);
   }
 };
 /* harmony default export */ var cell = (Cell);
@@ -4781,6 +4784,7 @@ const lineOffsetSizes = {
       const params = {
         $table: $xeTable,
         $grid: $xeTable.xegrid,
+        isEdit: false,
         seq,
         rowid,
         row,
@@ -6645,7 +6649,10 @@ const {
         allowResizable
       } = customOpts;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
-        if (!parent) {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed;
+        } else {
           if (allowSort) {
             const sortIndex = index + 1;
             column.renderSortNumber = sortIndex;
@@ -6784,22 +6791,30 @@ const {
       const customOpts = computeCustomOpts.value;
       if (customOpts.immediate) {
         if (column.renderFixed === colFixed) {
-          column.fixed = '';
-          column.renderFixed = '';
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
+            col.fixed = '';
+            col.renderFixed = '';
+          });
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
-            column.fixed = colFixed;
-            column.renderFixed = colFixed;
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
+              col.fixed = colFixed;
+              col.renderFixed = colFixed;
+            });
           }
         }
         $xeTable.handleCustom();
         $xeTable.saveCustomStore('update:fixed');
       } else {
         if (column.renderFixed === colFixed) {
-          column.renderFixed = '';
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
+            col.renderFixed = '';
+          });
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
-            column.renderFixed = colFixed;
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
+              col.renderFixed = colFixed;
+            });
           }
         }
       }
@@ -10292,7 +10307,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
      */
     const handleChangeCell = (evnt, params) => {
       checkValidate('blur').catch(e => e).then(() => {
-        $xeTable.handleActived(params, evnt).then(() => checkValidate('change')).catch(e => e);
+        $xeTable.handleEdit(params, evnt).then(() => checkValidate('change')).catch(e => e);
       });
     };
     const handleDefaultSort = () => {
@@ -12349,8 +12364,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 将固定的列左边、右边分别靠边
        * 如果传 true 则会检查列顺序并排序
        */
-      refreshColumn(resiveOrder) {
-        if (resiveOrder) {
+      refreshColumn(initOrder) {
+        if (initOrder) {
           const columnList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(internalData.collectColumn, 'renderSortNumber');
           internalData.collectColumn = columnList;
           const tableFullColumn = getColumnList(columnList);
@@ -14103,7 +14118,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               // 如果按下了 F2 键
               if (selected.row && selected.column) {
                 evnt.preventDefault();
-                $xeTable.handleActived(selected.args, evnt);
+                $xeTable.handleEdit(selected.args, evnt);
               }
             }
           } else if (isContextMenu) {
@@ -14222,7 +14237,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                     backMethod(params);
                   } else {
                     setCellValue(selected.row, selected.column, null);
-                    $xeTable.handleActived(selected.args, evnt);
+                    $xeTable.handleEdit(selected.args, evnt);
                   }
                   $xeTable.dispatchEvent('cell-backspace-value', params, evnt);
                 }
@@ -14274,7 +14289,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                   editMethod(params);
                 } else {
                   setCellValue(selected.row, selected.column, null);
-                  $xeTable.handleActived(selected.args, evnt);
+                  $xeTable.handleEdit(selected.args, evnt);
                 }
                 const afterEditMethod = editOpts.afterEditMethod;
                 if (afterEditMethod) {
@@ -15354,10 +15369,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (!actived.args || evnt.currentTarget !== actived.args.cell) {
             if (editOpts.mode === 'row') {
               checkValidate('blur').catch(e => e).then(() => {
-                $xeTable.handleActived(params, evnt).then(() => checkValidate('change')).catch(e => e);
+                $xeTable.handleEdit(params, evnt).then(() => checkValidate('change')).catch(e => e);
               });
             } else if (editOpts.mode === 'cell') {
-              $xeTable.handleActived(params, evnt).then(() => checkValidate('change')).catch(e => e);
+              $xeTable.handleEdit(params, evnt).then(() => checkValidate('change')).catch(e => e);
             }
           }
         }
@@ -16596,6 +16611,59 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     return this.renderVN();
   }
 }));
+;// CONCATENATED MODULE: ./packages/table/src/use/cell-view.ts
+
+
+function useCellView(props) {
+  const currColumn = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const {
+      renderParams
+    } = props;
+    return renderParams.column;
+  });
+  const currRow = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const {
+      renderParams
+    } = props;
+    return renderParams.row;
+  });
+  const cellOptions = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const {
+      renderOpts
+    } = props;
+    return renderOpts.props || {};
+  });
+  const cellModel = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)({
+    get() {
+      const {
+        renderParams
+      } = props;
+      const {
+        row,
+        column
+      } = renderParams;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+    },
+    set(value) {
+      const {
+        renderParams
+      } = props;
+      const {
+        row,
+        column
+      } = renderParams;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, column.field, value);
+    }
+  });
+  return {
+    currColumn,
+    currRow,
+    cellModel,
+    cellOptions
+  };
+}
+;// CONCATENATED MODULE: ./packages/table/src/use/index.ts
+
 ;// CONCATENATED MODULE: ./packages/table/module/filter/hook.ts
 
 
@@ -18188,7 +18256,7 @@ edit_hook_hooks.add('tableEditModule', {
           return $xeTable.scrollToRow(row, column).then(() => {
             const cell = $xeTable.getCellElement(row, column);
             if (cell) {
-              editPrivateMethods.handleActived({
+              editPrivateMethods.handleEdit({
                 row,
                 rowIndex: $xeTable.getRowIndex(row),
                 column,
@@ -18233,7 +18301,7 @@ edit_hook_hooks.add('tableEditModule', {
       /**
        * 处理激活编辑
        */
-      handleActived(params, evnt) {
+      handleEdit(params, evnt) {
         const {
           editConfig,
           mouseConfig
@@ -18359,6 +18427,12 @@ edit_hook_hooks.add('tableEditModule', {
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
+      /**
+       * @deprecated
+       */
+      handleActived(params, evnt) {
+        return editPrivateMethods.handleEdit(params, evnt);
+      },
       /**
        * 处理聚焦
        */
@@ -20471,7 +20545,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           if (editConfig) {
             if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
               if (editOpts.mode === 'row') {
-                $xeTable.handleActived(params, evnt);
+                $xeTable.handleEdit(params, evnt);
               } else {
                 $xeTable.scrollToRow(params.row, params.column).then(() => $xeTable.handleSelected(params, evnt));
               }
@@ -20673,7 +20747,7 @@ validator_hook_hooks.add('tableValidatorModule', {
           $xeTable.dispatchEvent('valid-error', params, null);
           resolve();
         } else {
-          $xeTable.handleActived(params, {
+          $xeTable.handleEdit(params, {
             type: 'valid-error',
             trigger: 'call'
           }).then(() => {
@@ -21214,7 +21288,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       // 判断面板不能大于表格高度
       let tableHeight = 0;
       if (el) {
-        tableHeight = el.clientHeight - 30;
+        tableHeight = el.clientHeight - 28;
       }
       customStore.maxHeight = Math.max(4, tableHeight);
     };
@@ -22321,15 +22395,20 @@ render_renderer.mixin({
 
 
 
+
 const VxeTable = Object.assign({}, table, {
   install(app) {
     app.component(table.name, table);
   }
 });
+const tableHandle = {
+  useCellView: useCellView
+};
 if (core_.VxeUI.dynamicApp) {
   core_.VxeUI.dynamicApp.component(table.name, table);
 }
 core_.VxeUI.component(table);
+core_.VxeUI.tableHandle = tableHandle;
 const Table = VxeTable;
 /* harmony default export */ var packages_table = (VxeTable);
 ;// CONCATENATED MODULE: ./packages/toolbar/src/toolbar.ts
@@ -24753,7 +24832,12 @@ const Grid = VxeGrid;
       uploadErr: '上传失败',
       uploadSuccess: '上传成功',
       moreBtnText: '更多（{0}）',
-      viewItemTitle: '点击查看'
+      viewItemTitle: '点击查看',
+      morePopup: {
+        readTitle: '查看列表',
+        imageTitle: '上传图片',
+        fileTitle: '上传文件'
+      }
     },
     formDesign: {
       formName: '表单名称',