@lemon-fe/components 1.1.0-alpha.6 → 1.1.0-alpha.7

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

@@ -42,6 +42,8 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
         node?: IRowNode<any>;
     }): boolean;
     constructor(props: DataGridProps<TData>);
+    /** TODO目前只应用在部分地方，临时解决一下获取的columnTypes不正确的问题，考虑未来转成函数组件 */
+    private getProps;
     setField(field: FieldCol): void;
     getField(id: string): FieldCol | undefined;
     getFields(): FieldCol[];

package/es/data-grid/index.js

@@ -436,7 +436,16 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     _this.syncColRender();
     return _this;
   }
+
+  /** TODO目前只应用在部分地方，临时解决一下获取的columnTypes不正确的问题，考虑未来转成函数组件 */
   _createClass(DataGrid, [{
+    key: "getProps",
+    value: function getProps(props) {
+      var reactCtx = this.context;
+      var target = props || this.props;
+      return _objectSpread(_objectSpread({}, reactCtx), target);
+    }
+  }, {
     key: "setField",
     value: function setField(field) {
       var newFields = _toConsumableArray(this.fields);
@@ -516,9 +525,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPagination",
     value: function getPagination() {
-      var _this$props3 = this.props,
-        pagination = _this$props3.pagination,
-        fetch = _this$props3.fetch;
+      var _this$getProps = this.getProps(),
+        pagination = _this$getProps.pagination,
+        fetch = _this$getProps.fetch;
       var page = 1;
       var pageSize = 50;
       var total = 0;
@@ -549,11 +558,11 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function componentDidUpdate(prevProps) {
       var _this2 = this,
         _prevProps$rowSelecti;
-      var _this$props4 = this.props,
-        columns = _this$props4.columns,
-        rowSelection = _this$props4.rowSelection,
-        dataSource = _this$props4.dataSource,
-        context = _this$props4.context;
+      var _this$props3 = this.props,
+        columns = _this$props3.columns,
+        rowSelection = _this$props3.rowSelection,
+        dataSource = _this$props3.dataSource,
+        context = _this$props3.context;
       if (columns !== prevProps.columns) {
         this.syncColRender();
         this.afterReady(function () {
@@ -589,14 +598,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$props5, customColumnPanelStorage, autoLoad, state, data;
+        var _this$props4, customColumnPanelStorage, autoLoad, state, data;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               window.addEventListener('blur', this.handleFocus);
 
               /** 加载定制列数据如果接口很慢的话，可能会存在列更新的时序问题，尝试过阻塞其他操作，但在明细页面依旧会出现2个加载动画的情况。未来尝试解决 */
-              _this$props5 = this.props, customColumnPanelStorage = _this$props5.customColumnPanelStorage, autoLoad = _this$props5.autoLoad;
+              _this$props4 = this.props, customColumnPanelStorage = _this$props4.customColumnPanelStorage, autoLoad = _this$props4.autoLoad;
               if (!customColumnPanelStorage) {
                 _context3.next = 16;
                 break;
@@ -775,9 +784,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       if (col.type === undefined) {
         return _objectSpread({}, col);
       }
-      var _this$props6 = this.props,
-        mColumnTypes = _this$props6.columnTypes,
-        mDefaultColDef = _this$props6.defaultColDef;
+      var _this$getProps2 = this.getProps(),
+        mColumnTypes = _this$getProps2.columnTypes,
+        mDefaultColDef = _this$getProps2.defaultColDef;
       var colTypes = this.getMemoizedColumnTypes(mColumnTypes);
       var result = {};
       var types;
@@ -800,11 +809,11 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function getColumnDefs() {
       var _this5 = this,
         _this$props$customCol;
-      var _this$props7 = this.props,
-        _this$props7$columns = _this$props7.columns,
-        columns = _this$props7$columns === void 0 ? [] : _this$props7$columns,
-        rowActions = _this$props7.rowActions,
-        rowSelection = _this$props7.rowSelection;
+      var _this$props5 = this.props,
+        _this$props5$columns = _this$props5.columns,
+        columns = _this$props5$columns === void 0 ? [] : _this$props5$columns,
+        rowActions = _this$props5.rowActions,
+        rowSelection = _this$props5.rowSelection;
       var leafColIds = [];
       var map = function map(cols) {
         return cols.map(function (item) {
@@ -1497,28 +1506,27 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this12 = this;
-      var reactCtx = this.context;
-      var _reactCtx$DataGrid$th = _objectSpread(_objectSpread({}, reactCtx.DataGrid), this.props),
-        rowKey = _reactCtx$DataGrid$th.rowKey,
-        fetch = _reactCtx$DataGrid$th.fetch,
-        dataSource = _reactCtx$DataGrid$th.dataSource,
-        rowActions = _reactCtx$DataGrid$th.rowActions,
-        columns = _reactCtx$DataGrid$th.columns,
-        autoLoad = _reactCtx$DataGrid$th.autoLoad,
-        loadingProp = _reactCtx$DataGrid$th.loading,
-        summary = _reactCtx$DataGrid$th.summary,
-        detailCell = _reactCtx$DataGrid$th.detailCell,
-        pagination = _reactCtx$DataGrid$th.pagination,
-        rowSelection = _reactCtx$DataGrid$th.rowSelection,
-        columnTypesProp = _reactCtx$DataGrid$th.columnTypes,
-        defaultColDefProp = _reactCtx$DataGrid$th.defaultColDef,
-        componentsProp = _reactCtx$DataGrid$th.components,
-        sideBarProp = _reactCtx$DataGrid$th.sideBar,
-        detailCellRendererParams = _reactCtx$DataGrid$th.detailCellRendererParams,
-        context = _reactCtx$DataGrid$th.context,
-        showSearch = _reactCtx$DataGrid$th.showSearch,
-        cellDisplayFlex = _reactCtx$DataGrid$th.cellDisplayFlex,
-        restProps = _objectWithoutProperties(_reactCtx$DataGrid$th, _excluded4);
+      var _this$getProps3 = this.getProps(),
+        rowKey = _this$getProps3.rowKey,
+        fetch = _this$getProps3.fetch,
+        dataSource = _this$getProps3.dataSource,
+        rowActions = _this$getProps3.rowActions,
+        columns = _this$getProps3.columns,
+        autoLoad = _this$getProps3.autoLoad,
+        loadingProp = _this$getProps3.loading,
+        summary = _this$getProps3.summary,
+        detailCell = _this$getProps3.detailCell,
+        pagination = _this$getProps3.pagination,
+        rowSelection = _this$getProps3.rowSelection,
+        columnTypesProp = _this$getProps3.columnTypes,
+        defaultColDefProp = _this$getProps3.defaultColDef,
+        componentsProp = _this$getProps3.components,
+        sideBarProp = _this$getProps3.sideBar,
+        detailCellRendererParams = _this$getProps3.detailCellRendererParams,
+        context = _this$getProps3.context,
+        showSearch = _this$getProps3.showSearch,
+        cellDisplayFlex = _this$getProps3.cellDisplayFlex,
+        restProps = _objectWithoutProperties(_this$getProps3, _excluded4);
       var _this$state2 = this.state,
         enablePagination = _this$state2.pagination,
         page = _this$state2.page,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.1.0-alpha.6",
+  "version": "1.1.0-alpha.7",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -62,5 +62,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "2e851869a32c6606e09a1fce15cc4000efb519ce"
+  "gitHead": "bf302718b70e867276efdf0f059c34e310c09545"
 }