@lemon-fe/kits 1.0.0-7 → 1.0.0-9

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

@@ -44,6 +44,7 @@ export default class DataGrid<TData> extends Component<DataGridProps<TData>, {
         };
         columnTypes: Record<string, ColDef<any>>;
         defaultColDef: ColDef<any>;
+        loading: boolean;
     };
     static EmptyCol: ColumnType<any>;
     static Editors: {

package/es/components/DataGrid/index.js

@@ -181,7 +181,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
     _defineProperty(_assertThisInitialized(_this), "getRowId", function (params) {
       var rowKey = _this.props.rowKey;
-      return typeof rowKey === 'function' ? rowKey(params.data) : get(params.data, rowKey);
+      var result = typeof rowKey === 'function' ? rowKey(params.data) : get(params.data, rowKey);
+      return String(result !== null && result !== void 0 ? result : '').toString();
     });
 
     _defineProperty(_assertThisInitialized(_this), "cellValueChanged", function (evt) {
@@ -200,7 +201,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
     _this.state = _objectSpread({
       colDefs: _this.getColumDefs(),
-      loading: false
+      loading: props.loading
     }, _this.getPagination());
     _this.store = new Store({
       errors: new Map(),
@@ -261,7 +262,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           columns = _this$props3.columns,
           rowSelection = _this$props3.rowSelection,
           dataSource = _this$props3.dataSource,
-          context = _this$props3.context;
+          context = _this$props3.context,
+          loading = _this$props3.loading;
 
       if (columns !== prevProps.columns) {
         this.syncColRender();
@@ -280,6 +282,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           context: context
         });
       }
+
+      if (loading !== prevProps.loading) {
+        this.setState({
+          loading: loading
+        });
+      }
     }
   }, {
     key: "syncColRender",
@@ -659,8 +667,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       var _this5 = this;
 
       var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      this.dataSource = data;
       this.afterReady(function () {
+        _this5.dataSource = data;
+
         _this5.api.setRowData(data);
 
         _this5.api.forEachNode(function (node) {
@@ -1072,7 +1081,8 @@ _defineProperty(DataGrid, "defaultProps", {
     collapseAll: '折叠所有'
   },
   columnTypes: {},
-  defaultColDef: {}
+  defaultColDef: {},
+  loading: false
 });
 
 _defineProperty(DataGrid, "EmptyCol", {

package/es/components/DataGrid/typings.d.ts

@@ -136,4 +136,8 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
      * @description 行操作按钮组
      */
     rowActions?: RowActionsType<TData>;
+    /**
+     * @description 加载动画
+     */
+    loading: boolean;
 }

package/es/components/SelectView/index.js

@@ -33,6 +33,7 @@ import Filter from "../Filter";
 import DataGrid from "../DataGrid";
 import { PREFIX_CLS } from "../../constants";
 import { DeleteTwoTone } from '@ant-design/icons';
+var defaultRows = [];
 export default function SelectView(props) {
   var emptyValue = useMemo(function () {
     return [];
@@ -68,11 +69,14 @@ export default function SelectView(props) {
       tabFlag = _useState6[0],
       setTabFlag = _useState6[1];
 
-  var _useState7 = useState(dataSource || []),
+  var _useState7 = useState(dataSource || defaultRows),
       _useState8 = _slicedToArray(_useState7, 2),
       rows = _useState8[0],
       setRows = _useState8[1];
 
+  useEffect(function () {
+    setRows(dataSource || defaultRows);
+  }, [dataSource]);
   useEffect(function () {
     if (list.current !== null) {
       if (dataSource !== undefined && rowFilter !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-7",
+  "version": "1.0.0-9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -11,7 +11,7 @@
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "prepublishOnly": "npm run build",
-    "prepare": "husky install"
+    "prerelease": "npm version prerelease --no-git-tag-version && npm publish --tag next"
   },
   "files": [
     "es"