@visactor/vtable 1.4.2-alpha.3 → 1.4.2-alpha.4

package/cjs/ListTable.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ListTable = void 0;
 
-const ts_types_1 = require("./ts-types"), layout_1 = require("./layout"), vutils_1 = require("@visactor/vutils"), tableHelper_1 = require("./core/tableHelper"), core_1 = require("./core"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE"), env_1 = require("./tools/env"), editors = __importStar(require("./edit/editors")), edit_manager_1 = require("./edit/edit-manager"), compute_col_width_1 = require("./scenegraph/layout/compute-col-width"), compute_row_height_1 = require("./scenegraph/layout/compute-row-height"), util_1 = require("./tools/util"), radio_1 = require("./state/radio/radio"), vutils_extension_1 = require("@visactor/vutils-extension"), checkbox_1 = require("./state/checkbox/checkbox"), factory_1 = require("./core/factory");
+const ts_types_1 = require("./ts-types"), layout_1 = require("./layout"), vutils_1 = require("@visactor/vutils"), tableHelper_1 = require("./core/tableHelper"), core_1 = require("./core"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE"), title_1 = require("./components/title/title"), env_1 = require("./tools/env"), editors = __importStar(require("./edit/editors")), edit_manager_1 = require("./edit/edit-manager"), compute_col_width_1 = require("./scenegraph/layout/compute-col-width"), compute_row_height_1 = require("./scenegraph/layout/compute-row-height"), util_1 = require("./tools/util"), radio_1 = require("./state/radio/radio"), vutil_extension_temp_1 = require("./vutil-extension-temp"), checkbox_1 = require("./state/checkbox/checkbox"), empty_tip_1 = require("./components/empty-tip/empty-tip");
 
 class ListTable extends core_1.BaseTable {
     constructor(container, options) {
@@ -38,24 +38,18 @@ class ListTable extends core_1.BaseTable {
         container = container.container ? container.container : null), super(container, options), 
         this.showHeader = !0;
         const internalProps = this.internalProps;
-        if (internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode, this.pagination = options.pagination, 
+        internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode, this.pagination = options.pagination, 
         internalProps.sortState = options.sortState, internalProps.dataConfig = {}, internalProps.columns = options.columns ? (0, 
-        vutils_extension_1.cloneDeepSpec)(options.columns, [ "children" ]) : options.header ? (0, 
-        vutils_extension_1.cloneDeepSpec)(options.header, [ "children" ]) : [], this.internalProps.headerHelper.setTableColumnsEditor(), 
+        vutil_extension_temp_1.cloneDeepSpec)(options.columns, [ "children" ]) : options.header ? (0, 
+        vutil_extension_temp_1.cloneDeepSpec)(options.header, [ "children" ]) : [], this.internalProps.headerHelper.setTableColumnsEditor(), 
         this.showHeader = null === (_a = options.showHeader) || void 0 === _a || _a, this.transpose = null !== (_b = options.transpose) && void 0 !== _b && _b, 
         "node" !== env_1.Env.mode && (this.editorManager = new edit_manager_1.EditManeger(this)), 
         this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, options.dataSource ? (0, 
         tableHelper_1._setDataSource)(this, options.dataSource) : options.records ? this.setRecords(options.records, {
             sortState: internalProps.sortState
-        }) : this.setRecords([]), options.title) {
-            const Title = factory_1.Factory.getComponent("title");
-            internalProps.title = new Title(options.title, this), this.scenegraph.resize();
-        }
-        if (this.options.emptyTip) if (this.internalProps.emptyTip) this.internalProps.emptyTip.resetVisible(); else {
-            const EmptyTip = factory_1.Factory.getComponent("emptyTip");
-            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), this.internalProps.emptyTip.resetVisible();
-        }
-        setTimeout((() => {
+        }) : this.setRecords([]), options.title && (internalProps.title = new title_1.Title(options.title, this), 
+        this.scenegraph.resize()), this.options.emptyTip && (this.internalProps.emptyTip || (this.internalProps.emptyTip = new empty_tip_1.EmptyTip(this.options.emptyTip, this)), 
+        this.internalProps.emptyTip.resetVisible()), setTimeout((() => {
             this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.INITIALIZED, null);
         }), 0);
     }
@@ -83,7 +77,7 @@ class ListTable extends core_1.BaseTable {
             col: this.stateManager.hover.cellPos.col,
             row: this.stateManager.hover.cellPos.row
         };
-        this.internalProps.columns = (0, vutils_extension_1.cloneDeepSpec)(columns, [ "children" ]), 
+        this.internalProps.columns = (0, vutil_extension_temp_1.cloneDeepSpec)(columns, [ "children" ]), 
         this.options.columns = columns, this.internalProps.headerHelper.setTableColumnsEditor(), 
         this._hasAutoImageColumn = void 0, this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, 
         this.scenegraph.clearCells(), this.headerStyleCache = new Map, this.bodyStyleCache = new Map, 
@@ -223,11 +217,11 @@ class ListTable extends core_1.BaseTable {
     updateOption(options) {
         var _a, _b;
         const internalProps = this.internalProps;
-        if (super.updateOption(options), internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode, 
+        return super.updateOption(options), internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode, 
         this.pagination = options.pagination, internalProps.sortState = options.sortState, 
         internalProps.dataConfig = {}, this.showHeader = null === (_a = options.showHeader) || void 0 === _a || _a, 
-        internalProps.columns = options.columns ? (0, vutils_extension_1.cloneDeepSpec)(options.columns, [ "children" ]) : options.header ? (0, 
-        vutils_extension_1.cloneDeepSpec)(options.header, [ "children" ]) : [], this.internalProps.headerHelper.setTableColumnsEditor(), 
+        internalProps.columns = options.columns ? (0, vutil_extension_temp_1.cloneDeepSpec)(options.columns, [ "children" ]) : options.header ? (0, 
+        vutil_extension_temp_1.cloneDeepSpec)(options.header, [ "children" ]) : [], this.internalProps.headerHelper.setTableColumnsEditor(), 
         this.transpose = null !== (_b = options.transpose) && void 0 !== _b && _b, this.refreshHeader(), 
         this.internalProps.useOneRowHeightFillAll = !1, internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
             var _a;
@@ -235,15 +229,9 @@ class ListTable extends core_1.BaseTable {
         })), internalProps.releaseList = null), options.dataSource ? (0, tableHelper_1._setDataSource)(this, options.dataSource) : options.records ? this.setRecords(options.records, {
             sortState: options.sortState
         }) : (this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), this.render()), 
-        options.title) {
-            const Title = factory_1.Factory.getComponent("title");
-            internalProps.title = new Title(options.title, this), this.scenegraph.resize();
-        }
-        if (this.options.emptyTip) if (this.internalProps.emptyTip) this.internalProps.emptyTip.resetVisible(); else {
-            const EmptyTip = factory_1.Factory.getComponent("emptyTip");
-            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), this.internalProps.emptyTip.resetVisible();
-        }
-        return new Promise((resolve => {
+        options.title && (internalProps.title = new title_1.Title(options.title, this), 
+        this.scenegraph.resize()), this.options.emptyTip && (this.internalProps.emptyTip || (this.internalProps.emptyTip = new empty_tip_1.EmptyTip(this.options.emptyTip, this)), 
+        this.internalProps.emptyTip.resetVisible()), new Promise((resolve => {
             setTimeout(resolve, 0);
         }));
     }
@@ -463,19 +451,17 @@ class ListTable extends core_1.BaseTable {
                 let order, field;
                 if (Array.isArray(this.sortState) ? 0 !== this.sortState.length && ({order: order, field: field} = null === (_c = this.sortState) || void 0 === _c ? void 0 : _c[0]) : ({order: order, field: field} = this.sortState), 
                 order && field && "normal" !== order) {
-                    const sortFunc = this._getSortFuncFromHeaderOption(void 0, field), hd = this.internalProps.layoutMap.headerObjects.find((col => col && col.field === field));
+                    const sortFunc = this._getSortFuncFromHeaderOption(void 0, field), hd = this.internalProps.layoutMap.headerObjectsIncludeHided.find((col => col && col.field === field));
                     !1 !== hd.define.sort && this.dataSource.sort(hd.field, order, null != sortFunc ? sortFunc : util_1.defaultOrderFn);
                 }
             }
             this.refreshRowColCount();
         } else (0, tableHelper_1._setRecords)(this, records);
-        if (this.stateManager.initCheckedState(records), this.clearCellStyleCache(), this.scenegraph.createSceneGraph(), 
+        this.stateManager.initCheckedState(records), this.clearCellStyleCache(), this.scenegraph.createSceneGraph(), 
         this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.internalProps.title && !this.internalProps.title.isReleased && (this._updateSize(), 
-        this.internalProps.title.resize(), this.scenegraph.resize()), this.options.emptyTip) if (this.internalProps.emptyTip) this.internalProps.emptyTip.resetVisible(); else {
-            const EmptyTip = factory_1.Factory.getComponent("emptyTip");
-            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), this.internalProps.emptyTip.resetVisible();
-        }
-        this.render(), (0, vutils_1.isValid)(oldHoverState.col) && (0, vutils_1.isValid)(oldHoverState.row) && oldHoverState.col >= 0 && oldHoverState.row >= 0 && setTimeout((() => {
+        this.internalProps.title.resize(), this.scenegraph.resize()), this.options.emptyTip && (this.internalProps.emptyTip || (this.internalProps.emptyTip = new empty_tip_1.EmptyTip(this.options.emptyTip, this)), 
+        this.internalProps.emptyTip.resetVisible()), this.render(), (0, vutils_1.isValid)(oldHoverState.col) && (0, 
+        vutils_1.isValid)(oldHoverState.row) && oldHoverState.col >= 0 && oldHoverState.row >= 0 && setTimeout((() => {
             this.internalProps.tooltipHandler.showTooltip(oldHoverState.col, oldHoverState.row);
         }), 0);
     }
@@ -840,5 +826,4 @@ class ListTable extends core_1.BaseTable {
     }
 }
 
-exports.ListTable = ListTable;
-//# sourceMappingURL=ListTable.js.map
+exports.ListTable = ListTable;