@lemon-fe/components 1.4.15-alpha.2 → 1.4.15

package/es/data-grid/index.d.ts

@@ -61,6 +61,7 @@ declare class InternalDataGrid<TData extends Record<string, any>> extends Compon
     componentDidMount(): Promise<void>;
     private syncColRender;
     private syncSelection;
+    private updateSelection;
     private syncRowData;
     private getFieldsSummary;
     private updateColumnDefs;

package/es/data-grid/index.js

@@ -434,6 +434,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
           onDataSourceChange(data, evt);
         }
       }
+      _this.updateSelection(data);
     });
     _defineProperty(_assertThisInitialized(_this), "cellEditingStop", function (evt) {
       var onCellEditingStopped = _this.props.onCellEditingStopped;
@@ -843,6 +844,50 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         });
       }
     }
+  }, {
+    key: "updateSelection",
+    value: function updateSelection(data) {
+      var _this3 = this;
+      if (this.isPreserveSelected()) {
+        this.api.forEachNode(function (node) {
+          if (node.id && _this3.selected.has(node.id)) {
+            var rowData = _this3.selected.get(node.id);
+            if (node.data !== undefined && rowData !== node.data) {
+              _this3.selected.set(node.id, node.data);
+            }
+            if (!node.isSelected()) {
+              node.setSelected(true, false, true);
+            }
+          }
+        });
+      } else {
+        var keys = new Map(data.map(function (item) {
+          return [_this3.getRowId({
+            data: item
+          }), item];
+        }));
+        this.selected.forEach(function (id) {
+          if (!keys.has(id)) {
+            _this3.selected.delete(id);
+          } else {
+            var node = _this3.api.getRowNode(id);
+            if (node !== undefined) {
+              if (node.data !== undefined && _this3.selected.get(id) !== node.data) {
+                _this3.selected.set(id, node.data);
+              }
+              if (!node.isSelected()) {
+                node.setSelected(true, false, true);
+              }
+            }
+          }
+        });
+      }
+      if (this.selected.isDirty()) {
+        this.api.dispatchEvent({
+          type: 'selectionChanged'
+        });
+      }
+    }
   }, {
     key: "syncRowData",
     value: function syncRowData() {
@@ -923,7 +968,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "getColumnDefs",
     value: function getColumnDefs() {
-      var _this3 = this,
+      var _this4 = this,
         _this$props$customCol;
       var _this$props8 = this.props,
         _this$props8$columns = _this$props8.columns,
@@ -950,7 +995,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             if (field !== undefined) {
               opts.field = getColField(item);
             }
-            var def = _this3.getFullColumnDef(opts);
+            var def = _this4.getFullColumnDef(opts);
 
             /** 部分列由于使用type 可能存在colId以及field都不存在, maintainColumnOrder下updateColumnDefs有问题，故从merge后的def中提取field或者colId */
             opts.colId = def.colId || def.field;
@@ -1113,20 +1158,20 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
           colId: field.id,
           headerName: field.name,
           spanHeaderHeight: true,
-          sortable: _this3.isClientMode(),
+          sortable: _this4.isClientMode(),
           type: 'rightAligned'
         };
         if (suppressFieldValueGetter) {
           fieldCol.field = field.id;
         } else {
-          var _this3$fieldSuffix$ex;
+          var _this4$fieldSuffix$ex;
           /**
            * 预校验是否可以进行四则运算，可能会有边界情况没考虑到
            */
           var scopeMap = {};
           var reg = /\$\{([^{}]+)\}/g;
-          var expressionSuffix = ((_this3$fieldSuffix$ex = _this3.fieldSuffix.exec(field.expression)) === null || _this3$fieldSuffix$ex === void 0 ? void 0 : _this3$fieldSuffix$ex[1]) || '';
-          var expression = field.expression.replace(_this3.fieldSuffix, '').replace(reg, function (match, p1) {
+          var expressionSuffix = ((_this4$fieldSuffix$ex = _this4.fieldSuffix.exec(field.expression)) === null || _this4$fieldSuffix$ex === void 0 ? void 0 : _this4$fieldSuffix$ex[1]) || '';
+          var expression = field.expression.replace(_this4.fieldSuffix, '').replace(reg, function (match, p1) {
             if (p1) {
               var mapKey = "a".concat(Object.keys(scopeMap).length);
               scopeMap[mapKey] = p1;
@@ -1167,7 +1212,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                   return get(node.data, field.id);
                 }
                 if (field.summaryType === 1) {
-                  var summary = _this3.getFieldsSummary(_this3.dataSource, _this3.fields);
+                  var summary = _this4.getFieldsSummary(_this4.dataSource, _this4.fields);
                   return get(summary, field.id);
                 }
               }
@@ -1201,7 +1246,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                   return null;
                 }
               } else {
-                return field.expression.replace(_this3.fieldSuffix, '').replace(reg, function (match, p1) {
+                return field.expression.replace(_this4.fieldSuffix, '').replace(reg, function (match, p1) {
                   if (p1) {
                     return getValue(p1) || '';
                   }
@@ -1337,49 +1382,9 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "updateRowData",
     value: function updateRowData() {
-      var _this4 = this;
       var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       this.dataSource = data;
       this.api.setRowData(data);
-      if (this.isPreserveSelected()) {
-        this.api.forEachNode(function (node) {
-          if (node.id && _this4.selected.has(node.id)) {
-            var rowData = _this4.selected.get(node.id);
-            if (node.data !== undefined && rowData !== node.data) {
-              _this4.selected.set(node.id, node.data);
-            }
-            if (!node.isSelected()) {
-              node.setSelected(true, false, true);
-            }
-          }
-        });
-      } else {
-        var keys = new Map(data.map(function (item) {
-          return [_this4.getRowId({
-            data: item
-          }), item];
-        }));
-        this.selected.forEach(function (id) {
-          if (!keys.has(id)) {
-            _this4.selected.delete(id);
-          } else {
-            var node = _this4.api.getRowNode(id);
-            if (node !== undefined) {
-              if (node.data !== undefined && _this4.selected.get(id) !== node.data) {
-                _this4.selected.set(id, node.data);
-              }
-              if (!node.isSelected()) {
-                node.setSelected(true, false, true);
-              }
-            }
-          }
-        });
-      }
-      if (this.selected.isDirty()) {
-        this.api.dispatchEvent({
-          type: 'selectionChanged'
-        });
-      }
     }
   }, {
     key: "getSummaryRowData",

package/es/filter/fields-config.js

@@ -226,7 +226,7 @@ function FieldsConfig(props) {
         props.onChange(props.originData.map(function (item) {
           return {
             key: item.key,
-            hidden: false
+            hidden: !!item.defaultHidden
           };
         }));
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.15-alpha.2",
+  "version": "1.4.15",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@dnd-kit/core": ">=6.0.0",
-    "@lemon-fe/hooks": "^1.4.14-alpha.1",
-    "@lemon-fe/utils": "^1.4.14-alpha.2",
+    "@lemon-fe/hooks": "^1.4.15",
+    "@lemon-fe/utils": "^1.4.15",
     "ag-grid-community": "29.2.0",
     "ag-grid-enterprise": "29.2.0",
     "ag-grid-react": "29.2.0",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "0557352f082265096245416e42ba490d0082ab1b"
+  "gitHead": "f5869a74199e1ec7dd588fb6165d63696161d488"
 }