@qn-pandora/pandora-component 4.4.4 → 4.4.5

package/CHANGELOG.json

@@ -1,6 +1,23 @@
 {
   "name": "@qn-pandora/pandora-component",
   "entries": [
+    {
+      "version": "4.4.5",
+      "tag": "@qn-pandora/pandora-component_v4.4.5",
+      "date": "Thu, 29 Feb 2024 08:29:44 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "2024-02-29发包"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@qn-pandora/app-sdk\" from `^3.4.4` to `^3.4.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.4.4",
       "tag": "@qn-pandora/pandora-component_v4.4.4",

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - @qn-pandora/pandora-component
 
-This log was last generated on Tue, 27 Feb 2024 12:57:54 GMT and should not be manually modified.
+This log was last generated on Thu, 29 Feb 2024 08:29:44 GMT and should not be manually modified.
+
+## 4.4.5
+Thu, 29 Feb 2024 08:29:44 GMT
+
+### Patches
+
+- 2024-02-29发包
 
 ## 4.4.4
 Tue, 27 Feb 2024 12:57:54 GMT

package/es/components/Table/index.d.ts

@@ -84,6 +84,7 @@ declare class Table<T = any> extends React.Component<ITableProps<T>, any> {
     };
     settingFields: ISaveFieldItem[];
     UNSAFE_componentWillReceiveProps(nextProps: ITableProps<T>): void;
+    componentWillUnmount(): void;
     get selectedRowKeys(): React.ReactText[];
     get rowSelection(): TableRowSelection<T> | undefined;
     get undisabledData(): readonly T[];
@@ -95,9 +96,16 @@ declare class Table<T = any> extends React.Component<ITableProps<T>, any> {
         unconfigableKeys: string[];
         resetKeys: string[];
     };
-    get resizable(): boolean;
+    get resizable(): false | ({
+        x?: string | number | true | undefined;
+        y?: string | number | undefined;
+    } & {
+        scrollToFirstRowOnChange?: boolean | undefined;
+    }) | undefined;
     get sortable(): boolean;
+    updateSettingConfig(columns: Array<IColumnType<T>>): void;
     initSettingConfig(): void;
+    updateSettingFields(columns: Array<IColumnType<T>>, settingFields: ISaveFieldItem[]): void;
     handleHideColumnsChange(keys: string[]): Promise<void> | undefined;
     getSortedColumns(): (IKeyValues<any> | undefined)[];
     getColumns(): (IKeyValues<any> | undefined)[];

package/es/components/Table/index.js

@@ -134,10 +134,19 @@ var Table = /** @class */ (function (_super) {
             this.setHiddenColumn(nextProps.hiddenColumns);
         }
         if (nextProps.columns !== this.props.columns) {
-            this.setColumns((nextProps.scroll && nextProps.draggable === true) ||
-                nextProps.draggable === ETableSettingType.RESIZE
-                ? this.getResizeColumns(nextProps.columns)
-                : nextProps.columns);
+            if ((nextProps.scroll && nextProps.draggable === true) ||
+                nextProps.draggable === ETableSettingType.RESIZE) {
+                this.updateSettingConfig(nextProps.columns);
+                this.setColumns(this.getResizeColumns(nextProps.columns));
+            }
+            else {
+                this.setColumns(nextProps.columns || []);
+            }
+        }
+    };
+    Table.prototype.componentWillUnmount = function () {
+        if (this.props.saveSettingKey) {
+            localStorage.setItem(this.props.saveSettingKey, JSON.stringify(this.settingFields));
         }
     };
     Object.defineProperty(Table.prototype, "selectedRowKeys", {
@@ -250,8 +259,9 @@ var Table = /** @class */ (function (_super) {
     Object.defineProperty(Table.prototype, "resizable", {
         get: function () {
             var _a, _b;
-            return (((_a = this.props) === null || _a === void 0 ? void 0 : _a.draggable) === true ||
-                ((_b = this.props) === null || _b === void 0 ? void 0 : _b.draggable) === ETableSettingType.RESIZE);
+            return ((((_a = this.props) === null || _a === void 0 ? void 0 : _a.draggable) === true ||
+                ((_b = this.props) === null || _b === void 0 ? void 0 : _b.draggable) === ETableSettingType.RESIZE) &&
+                this.props.scroll);
         },
         enumerable: true,
         configurable: true
@@ -265,95 +275,80 @@ var Table = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
+    Table.prototype.updateSettingConfig = function (columns) {
+        this.updateSettingFields(columns, this.settingFields);
+    };
     Table.prototype.initSettingConfig = function () {
-        var _this = this;
-        var _a = this.props, saveSettingKey = _a.saveSettingKey, _b = _a.hiddenColumns, hiddenColumns = _b === void 0 ? [] : _b;
+        var saveSettingKey = this.props.saveSettingKey;
         var settingFields = [];
+        if (saveSettingKey) {
+            var settingStr = localStorage.getItem(saveSettingKey);
+            var settingConfig = !!settingStr && JSON.parse(settingStr);
+            if (isArray(settingConfig)) {
+                settingFields = settingConfig;
+            }
+        }
+        this.updateSettingFields(this.props.columns, settingFields);
+    };
+    Table.prototype.updateSettingFields = function (columns, settingFields) {
+        var _a = this.props.hiddenColumns, hiddenColumns = _a === void 0 ? [] : _a;
         var sortableColumns = [];
         var leftColumns = [];
         var rightColumns = [];
         var hideKeys = [];
-        if (saveSettingKey) {
-            // 支持排序或拖拽
-            var sizeStr = localStorage.getItem(saveSettingKey);
-            settingFields = (!!sizeStr && JSON.parse(sizeStr)) || [];
-            // 已配置的列和实际的对不上
-            // 可能新增或者删除列的情况
-            var newSettingFields = [];
-            if ((settingFields === null || settingFields === void 0 ? void 0 : settingFields.length) && isArray(settingFields)) {
-                // 已配置列
-                // 旧类型数据为对象类型，未配置
-                settingFields.map(function (field) {
-                    var find = _this.columns.find(function (column) { return column.dataIndex === field.field; });
-                    if (find) {
-                        if (field.hide) {
-                            hideKeys.push(field.field);
-                        }
-                        if (!find.fixed) {
-                            sortableColumns.push(field);
-                        }
-                        else if (find.fixed === 'left' || find.fixed === true) {
-                            leftColumns.push(field);
-                        }
-                        else {
-                            rightColumns.push(field);
-                        }
-                    }
-                });
-                // 未配置过的列
-                this.columns
-                    .filter(function (f) { return !settingFields.find(function (field) { return field.field === f.dataIndex; }); })
-                    .map(function (column) {
-                    if (!column.fixed) {
-                        sortableColumns.push({
-                            field: column.dataIndex,
-                            fixed: column.fixed
-                        });
-                    }
-                    else if (column.fixed === 'left' || column.fixed === true) {
-                        leftColumns.push({
-                            field: column.dataIndex,
-                            fixed: column.fixed
-                        });
-                    }
-                    else {
-                        rightColumns.push({
-                            field: column.dataIndex,
-                            fixed: column.fixed
-                        });
-                    }
-                });
+        // 已配置的列和实际的对不上
+        // 可能新增或者删除列的情况
+        var newSettingFields = [];
+        // 已配置列
+        // 旧类型数据为对象类型，未配置
+        settingFields.map(function (field) {
+            var find = columns.find(function (column) { var _a; return ((_a = column) === null || _a === void 0 ? void 0 : _a.dataIndex) === field.field; });
+            if (find) {
+                if (field.hide) {
+                    hideKeys.push(field.field);
+                }
+                if (!find.fixed) {
+                    sortableColumns.push(field);
+                }
+                else if (find.fixed === 'left' || find.fixed === true) {
+                    leftColumns.push(field);
+                }
+                else {
+                    rightColumns.push(field);
+                }
             }
-            else {
-                // 从未配置过的列
-                this.columns.map(function (column) {
-                    if (!column.fixed) {
-                        sortableColumns.push({
-                            field: column.dataIndex,
-                            fixed: column.fixed
-                        });
-                    }
-                    else if (column.fixed === 'left' || column.fixed === true) {
-                        leftColumns.push({
-                            field: column.dataIndex,
-                            fixed: column.fixed
-                        });
-                    }
-                    else {
-                        rightColumns.push({
-                            field: column.dataIndex,
-                            fixed: column.fixed
-                        });
-                    }
-                });
+        });
+        // 未配置过的列
+        columns
+            .filter(function (f) { return !settingFields.find(function (field) { return field.field === f.dataIndex; }); })
+            .map(function (column) {
+            if (column.dataIndex) {
+                if (!column.fixed) {
+                    sortableColumns.push({
+                        field: column.dataIndex.toString(),
+                        fixed: column.fixed
+                    });
+                }
+                else if (column.fixed === 'left' || column.fixed === true) {
+                    leftColumns.push({
+                        field: column.dataIndex.toString(),
+                        fixed: column.fixed
+                    });
+                }
+                else {
+                    rightColumns.push({
+                        field: column.dataIndex.toString(),
+                        fixed: column.fixed
+                    });
+                }
             }
-            this.setFixedLeftKeys(leftColumns.map(function (t) { return t.field; }));
-            this.setFixedRightKeys(rightColumns.map(function (t) { return t.field; }));
-            this.setSortKeys(sortableColumns.map(function (t) { return t.field; }));
-            this.setHiddenColumn(__spread(new Set(__spread(hiddenColumns, hideKeys))));
-            newSettingFields = __spread(leftColumns, sortableColumns, rightColumns);
-            this.setSettingFields(newSettingFields);
-        }
+        });
+        this.setFixedLeftKeys(leftColumns.map(function (t) { return t.field; }));
+        this.setFixedRightKeys(rightColumns.map(function (t) { return t.field; }));
+        this.setSortKeys(sortableColumns.map(function (t) { return t.field; }));
+        this.setHiddenColumn(__spread(new Set(__spread(hiddenColumns, hideKeys))));
+        newSettingFields = __spread(leftColumns, sortableColumns, rightColumns);
+        this.setSettingFields(newSettingFields);
     };
     // 隐藏key
     Table.prototype.handleHideColumnsChange = function (keys) {
@@ -452,9 +447,6 @@ var Table = /** @class */ (function (_super) {
         this.sortConfig = __assign(__assign({}, this.sortConfig), { sortKeys: columns });
     };
     Table.prototype.setSettingFields = function (columns) {
-        if (this.props.saveSettingKey) {
-            localStorage.setItem(this.props.saveSettingKey, JSON.stringify(columns));
-        }
         this.settingFields = columns;
     };
     Table.prototype.setFixedRightKeys = function (columns) {
@@ -560,18 +552,14 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.getResizeColumns = function (columns) {
         var _this = this;
-        var fields;
-        if (this.props.saveSettingKey) {
-            var sizeStr = localStorage.getItem(this.props.saveSettingKey);
-            fields = !!sizeStr && JSON.parse(sizeStr);
-            if (fields) {
-                columns = columns === null || columns === void 0 ? void 0 : columns.map(function (col) {
-                    var _a;
-                    var dataIndex = get(col, 'dataIndex');
-                    var width = (_a = fields.find(function (f) { return f.field === dataIndex; })) === null || _a === void 0 ? void 0 : _a.width;
-                    return isNumber(width) ? __assign(__assign({}, col), { width: width }) : col;
-                });
-            }
+        var fields = this.settingFields;
+        if ((fields === null || fields === void 0 ? void 0 : fields.length) && isArray(fields)) {
+            columns = columns === null || columns === void 0 ? void 0 : columns.map(function (col) {
+                var _a;
+                var dataIndex = get(col, 'dataIndex');
+                var width = (_a = fields === null || fields === void 0 ? void 0 : fields.find(function (f) { return f.field === dataIndex; })) === null || _a === void 0 ? void 0 : _a.width;
+                return isNumber(width) ? __assign(__assign({}, col), { width: width }) : col;
+            });
         }
         var transformColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (it) {
             if (get(it, 'resizable') && _this.resizable) {
@@ -591,12 +579,13 @@ var Table = /** @class */ (function (_super) {
         return transformColumns;
     };
     Table.prototype.componentDidMount = function () {
-        this.setColumns(this.resizable && this.props.scroll
-            ? this.getResizeColumns(this.props.columns)
-            : this.props.columns);
+        var _a;
         if (this.sortable || this.resizable) {
             this.initSettingConfig();
         }
+        this.setColumns(this.resizable && ((_a = this.settingFields) === null || _a === void 0 ? void 0 : _a.length)
+            ? this.getResizeColumns(this.props.columns)
+            : this.props.columns);
     };
     Table.prototype.render = function () {
         var _a, _b;
@@ -608,7 +597,7 @@ var Table = /** @class */ (function (_super) {
                 // getCheckboxProps只能放到tableBatchWrapper里，因为selectedRowKeys在那个组件计算
                 rowSelection: batchOptions && this.props.rowSelection
                     ? this.rowSelection
-                    : this.props.rowSelection, rowClassName: this.getRowClassName, components: __assign(__assign({}, (components || {})), (this.resizable && scroll
+                    : this.props.rowSelection, rowClassName: this.getRowClassName, components: __assign(__assign({}, (components || {})), (this.resizable
                     ? {
                         header: {
                             cell: ResizableTitle
@@ -704,6 +693,13 @@ var Table = /** @class */ (function (_super) {
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Table.prototype, "sortable", null);
+    __decorate([
+        bind,
+        action,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Array]),
+        __metadata("design:returntype", void 0)
+    ], Table.prototype, "updateSettingConfig", null);
     __decorate([
         bind,
         action,
@@ -711,6 +707,13 @@ var Table = /** @class */ (function (_super) {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
     ], Table.prototype, "initSettingConfig", null);
+    __decorate([
+        bind,
+        action,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Array, Array]),
+        __metadata("design:returntype", void 0)
+    ], Table.prototype, "updateSettingFields", null);
     __decorate([
         bind,
         __metadata("design:type", Function),