@nokecy/qc-ui 1.0.12 → 1.0.14

package/dist/cjs/ag-grid-plus/ag-gridPlus.js

@@ -19,7 +19,7 @@ var _icons = require("@ant-design/icons");
 var _utils = require("./utils");
 var _setting = _interopRequireDefault(require("./setting"));
 var _ = require(".");
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -59,6 +59,7 @@ function AgGridPlus(props) {
     onReady = props.onGridReady,
     gridKey = props.gridKey,
     children = props.children,
+    defaultSearchExpand = props.defaultSearchExpand,
     rest = _objectWithoutProperties(props, _excluded);
   var _useGridPlusColumnSta = (0, _.useGridPlusColumnState)(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -82,26 +83,23 @@ function AgGridPlus(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     rowData = _useState8[0],
     setRowData = _useState8[1];
+  // const [selectRow, setSelectRow] = useState({});
   var _useState9 = (0, _react.useState)({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    selectRow = _useState10[0],
-    setSelectRow = _useState10[1];
-  var _useState11 = (0, _react.useState)({}),
+    queryFilter = _useState10[0],
+    setQueryFilter = _useState10[1];
+  var _useState11 = (0, _react.useState)(),
     _useState12 = _slicedToArray(_useState11, 2),
-    queryFilter = _useState12[0],
-    setQueryFilter = _useState12[1];
-  var _useState13 = (0, _react.useState)(),
-    _useState14 = _slicedToArray(_useState13, 2),
-    sortColumn = _useState14[0],
-    setSortColumn = _useState14[1];
-  var _useState15 = (0, _react.useState)({
+    sortColumn = _useState12[0],
+    setSortColumn = _useState12[1];
+  var _useState13 = (0, _react.useState)({
       pageSize: 200,
       current: 1,
       total: dataSource ? dataSource.length : 0
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    pagination = _useState16[0],
-    setPagination = _useState16[1];
+    _useState14 = _slicedToArray(_useState13, 2),
+    pagination = _useState14[0],
+    setPagination = _useState14[1];
   (0, _react.useImperativeHandle)(propsGridRef, function () {
     return gridRef.current;
   });
@@ -226,7 +224,7 @@ function AgGridPlus(props) {
     props.onSelectionChanged && props.onSelectionChanged(e);
   }, []);
   var onRowSelected = (0, _react.useCallback)(function (e) {
-    setSelectRow(e.data);
+    // setSelectRow(e.data); //移除无效更新
     props.onRowSelected && props.onRowSelected(e);
   }, []);
   var onColumnStateChanged = function onColumnStateChanged(columnState) {
@@ -437,6 +435,7 @@ function AgGridPlus(props) {
   }, search == false ? null : /*#__PURE__*/_react.default.createElement(_queryForm.default, {
     colDefs: allColDefs,
     columnStates: columnState || [],
+    defaultExpand: defaultSearchExpand,
     gridApi: apiRef.current,
     onQuery: function onQuery(formValues) {
       setQueryFilter(_objectSpread({}, formValues));

package/dist/cjs/ag-grid-plus/interface.d.ts

@@ -18,6 +18,7 @@ interface GridProps extends AgGridReactProps {
     headerTitle?: React.ReactNode;
     columnDefs?: (AgGridColumnPropsClone | ColGroupDef<any>)[] | null;
     toolBarRender?: (gridApi?: GridApi, filter?: string, queryFilter?: any) => React.ReactNode[];
+    defaultSearchExpand?: Boolean;
     /**
      * 用于标识grid唯一标识，用于保存列方案
      */

package/dist/cjs/ag-grid-plus/queryForm/index.d.ts

@@ -6,6 +6,7 @@ declare const FormRender: (props: {
     gridApi?: GridApi<any> | undefined;
     colDefs: ColDef[];
     columnStates: ColumnState[];
+    defaultExpand?: Boolean | undefined;
     onQuery: (formValue: any) => void;
 }) => React.JSX.Element;
 export default FormRender;

package/dist/cjs/ag-grid-plus/queryForm/index.js

@@ -47,7 +47,8 @@ var FormRender = function FormRender(props) {
         return [(0, _core.onFieldInit)('queryForm', function (field) {
           field.query('queryForm').take(function (node) {
             node.setComponentProps({
-              onReset: onReset
+              onReset: onReset,
+              defaultExpand: props.defaultExpand
             });
           });
         })];
@@ -118,7 +119,8 @@ var FormRender = function FormRender(props) {
       type: 'void',
       "name": 'queryForm',
       "x-component": 'QueryForm',
-      properties: {}
+      properties: {},
+      "x-component-props": {}
     };
     var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
       var state = columnStates.find(function (x) {

package/dist/cjs/ag-grid-plus/queryForm/queryForm.js

@@ -12,13 +12,14 @@ var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var useCollapseGrid = function useCollapseGrid(maxRows) {
+var useCollapseGrid = function useCollapseGrid(maxRows, defaultExpand) {
   var grid = (0, _react2.useMemo)(function () {
     return _antdV.FormGrid.createFormGrid({
       maxColumns: 5,
       maxWidth: 240,
       maxRows: maxRows,
       shouldVisible: function shouldVisible(node, grid) {
+        if (defaultExpand) return true;
         if (node.index === grid.childSize - 1) return true;
         if (grid.maxRows === Infinity) return true;
         return node.shadowRow < maxRows + 1 && node.index < grid.maxColumns - 1;
@@ -48,8 +49,9 @@ var useCollapseGrid = function useCollapseGrid(maxRows) {
   };
 };
 var QueryForm = (0, _react.observer)(function (props) {
-  var onReset = props.onReset;
-  var _useCollapseGrid = useCollapseGrid(1),
+  var onReset = props.onReset,
+    defaultExpand = props.defaultExpand;
+  var _useCollapseGrid = useCollapseGrid(1, defaultExpand),
     grid = _useCollapseGrid.grid,
     expanded = _useCollapseGrid.expanded,
     toggle = _useCollapseGrid.toggle,
@@ -80,7 +82,7 @@ var QueryForm = (0, _react.observer)(function (props) {
   var renderButtonGroup = function renderButtonGroup() {
     return /*#__PURE__*/_react2.default.createElement(_react2.Fragment, null, /*#__PURE__*/_react2.default.createElement(_antdV.FormButtonGroup, {
       align: "right"
-    }, renderActions(), type === "collapsible" ? renderExpanded() : null));
+    }, renderActions(), defaultExpand ? null : type === "collapsible" ? renderExpanded() : null));
   };
   return /*#__PURE__*/_react2.default.createElement(_antdV.FormGrid, {
     grid: grid,

package/dist/cjs/ag-grid-plus/setting/index.d.ts

@@ -3,6 +3,7 @@ import React from "react";
 declare const Setting: (props: {
     gridKey?: string | undefined;
     gridApi?: GridApi<any> | undefined;
+    gridApiState?: GridApi<any> | undefined;
     onSaveColumnState: (state: any) => void;
 }) => React.JSX.Element | null;
 export default Setting;

package/dist/cjs/ag-grid-plus/setting/index.js

@@ -26,6 +26,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 var Setting = function Setting(props) {
   var gridKey = props.gridKey,
     gridApi = props.gridApi,
+    gridApiState = props.gridApiState,
     onSaveColumnState = props.onSaveColumnState;
   var SchemaField = (0, _react2.useMemo)(function () {
     return (0, _react.createSchemaField)({
@@ -92,10 +93,16 @@ var Setting = function Setting(props) {
                   maxColumns: [1, 3],
                   strictAutoFit: true
                 }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.Array, {
+              },
+              /*#__PURE__*/
+              //@ts-ignore
+              _react2.default.createElement(SchemaField.Array, {
                 name: "items",
                 title: "",
                 "x-component": "ArrayTable",
+                "x-component-props": {
+                  onRowDrag: true
+                },
                 "x-validator": [{
                   message: ""
                 }],
@@ -188,7 +195,6 @@ var Setting = function Setting(props) {
                 state: values.items,
                 applyOrder: true
               });
-              console.log('record1 values.items', values.items, falg);
               onSaveColumnState && onSaveColumnState(values.items);
               next(payload);
             }).open(formProps);

package/dist/cjs/array-table/index.js

@@ -14,6 +14,8 @@ var _arrayBase = _interopRequireDefault(require("./arrayBase"));
 var _arrayAddBtn = _interopRequireDefault(require("./arrayAddBtn"));
 var _preview = _interopRequireDefault(require("./preview"));
 var _antd = require("antd");
+var _setting = _interopRequireDefault(require("../ag-grid-plus/setting"));
+var _agGridPlus = require("../ag-grid-plus");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -38,6 +40,10 @@ var ArrayTable = (0, _react2.observer)(function (props) {
   var apiRef = (0, _react.useRef)();
   var ref = (0, _react.useRef)();
   var field = (0, _react2.useField)();
+  var _useState3 = (0, _react.useState)(undefined),
+    _useState4 = _slicedToArray(_useState3, 2),
+    gridApiState = _useState4[0],
+    setGridApiState = _useState4[1];
   var dataSource = Array.isArray(field.value) ? field.value.slice() : [];
   var dataSourceCopy = dataSource.slice();
   var sources = (0, _utils.useArrayTableSources)();
@@ -50,11 +56,23 @@ var ArrayTable = (0, _react2.observer)(function (props) {
     onMoveDown = props.onMoveDown,
     onMoveUp = props.onMoveUp;
   var addition = (0, _utils.useAddition)();
+  var _useGridPlusColumnSta = (0, _agGridPlus.useGridPlusColumnState)(),
+    onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
+    gridPlusColumnState = _useGridPlusColumnSta.columnState,
+    extensibleColumns = _useGridPlusColumnSta.extensibleColumns;
+  (0, _react.useEffect)(function () {
+    if (gridPlusColumnState && props.gridKey && gridPlusColumnState[props.gridKey] && apiRef.current) {
+      apiRef.current.applyColumnState({
+        state: gridPlusColumnState[props.gridKey],
+        applyOrder: true
+      });
+    }
+  }, [gridPlusColumnState, apiRef.current]);
 
   //@ts-ignore
   if (columns.length > 0) {
     //@ts-ignore
-    columns[0].rowDrag = true;
+    columns[0].rowDrag = props.onRowDrag ? true : false;
   }
   var onRowDragMove = (0, _react.useCallback)(function (event) {
     var movingNode = event.node;
@@ -77,6 +95,11 @@ var ArrayTable = (0, _react2.observer)(function (props) {
       arr.splice(toIndex, 0, element);
     }
   }, []);
+  var onColumnStateChanged = function onColumnStateChanged(columnState) {
+    if (props.gridKey) {
+      onSaveColumnState && onSaveColumnState(props.gridKey, columnState);
+    }
+  };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Space, {
     style: {
       marginBottom: 5
@@ -103,10 +126,22 @@ var ArrayTable = (0, _react2.observer)(function (props) {
     onRemove: onRemove,
     onMoveUp: onMoveUp,
     onMoveDown: onMoveDown
-  }, /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'flex-end'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_setting.default, {
+    gridKey: props.gridKey,
+    gridApi: apiRef.current,
+    gridApiState: gridApiState,
+    onSaveColumnState: onColumnStateChanged
+  })), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
     onGridReady: function onGridReady(params) {
       params.api.hidePopupMenu();
       apiRef.current = params.api;
+      setGridApiState(params.api);
     },
     gridOptions: {
       enableCellTextSelection: true,

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -1,7 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import _sumBy from "lodash/sumBy";
 import _uniqueId from "lodash/uniqueId";
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -50,6 +50,7 @@ function AgGridPlus(props) {
     onReady = props.onGridReady,
     gridKey = props.gridKey,
     children = props.children,
+    defaultSearchExpand = props.defaultSearchExpand,
     rest = _objectWithoutProperties(props, _excluded);
   var _useGridPlusColumnSta = useGridPlusColumnState(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -73,26 +74,23 @@ function AgGridPlus(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     rowData = _useState8[0],
     setRowData = _useState8[1];
+  // const [selectRow, setSelectRow] = useState({});
   var _useState9 = useState({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    selectRow = _useState10[0],
-    setSelectRow = _useState10[1];
-  var _useState11 = useState({}),
+    queryFilter = _useState10[0],
+    setQueryFilter = _useState10[1];
+  var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    queryFilter = _useState12[0],
-    setQueryFilter = _useState12[1];
-  var _useState13 = useState(),
-    _useState14 = _slicedToArray(_useState13, 2),
-    sortColumn = _useState14[0],
-    setSortColumn = _useState14[1];
-  var _useState15 = useState({
+    sortColumn = _useState12[0],
+    setSortColumn = _useState12[1];
+  var _useState13 = useState({
       pageSize: 200,
       current: 1,
       total: dataSource ? dataSource.length : 0
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    pagination = _useState16[0],
-    setPagination = _useState16[1];
+    _useState14 = _slicedToArray(_useState13, 2),
+    pagination = _useState14[0],
+    setPagination = _useState14[1];
   useImperativeHandle(propsGridRef, function () {
     return gridRef.current;
   });
@@ -217,7 +215,7 @@ function AgGridPlus(props) {
     props.onSelectionChanged && props.onSelectionChanged(e);
   }, []);
   var onRowSelected = useCallback(function (e) {
-    setSelectRow(e.data);
+    // setSelectRow(e.data); //移除无效更新
     props.onRowSelected && props.onRowSelected(e);
   }, []);
   var onColumnStateChanged = function onColumnStateChanged(columnState) {
@@ -428,6 +426,7 @@ function AgGridPlus(props) {
   }, search == false ? null : /*#__PURE__*/React.createElement(FormRender, {
     colDefs: allColDefs,
     columnStates: columnState || [],
+    defaultExpand: defaultSearchExpand,
     gridApi: apiRef.current,
     onQuery: function onQuery(formValues) {
       setQueryFilter(_objectSpread({}, formValues));

package/dist/esm/ag-grid-plus/interface.d.ts

@@ -18,6 +18,7 @@ interface GridProps extends AgGridReactProps {
     headerTitle?: React.ReactNode;
     columnDefs?: (AgGridColumnPropsClone | ColGroupDef<any>)[] | null;
     toolBarRender?: (gridApi?: GridApi, filter?: string, queryFilter?: any) => React.ReactNode[];
+    defaultSearchExpand?: Boolean;
     /**
      * 用于标识grid唯一标识，用于保存列方案
      */

package/dist/esm/ag-grid-plus/queryForm/index.d.ts

@@ -6,6 +6,7 @@ declare const FormRender: (props: {
     gridApi?: GridApi<any> | undefined;
     colDefs: ColDef[];
     columnStates: ColumnState[];
+    defaultExpand?: Boolean | undefined;
     onQuery: (formValue: any) => void;
 }) => React.JSX.Element;
 export default FormRender;

package/dist/esm/ag-grid-plus/queryForm/index.js

@@ -39,7 +39,8 @@ var FormRender = function FormRender(props) {
         return [onFieldInit('queryForm', function (field) {
           field.query('queryForm').take(function (node) {
             node.setComponentProps({
-              onReset: onReset
+              onReset: onReset,
+              defaultExpand: props.defaultExpand
             });
           });
         })];
@@ -110,7 +111,8 @@ var FormRender = function FormRender(props) {
       type: 'void',
       "name": 'queryForm',
       "x-component": 'QueryForm',
-      properties: {}
+      properties: {},
+      "x-component-props": {}
     };
     var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
       var state = columnStates.find(function (x) {

package/dist/esm/ag-grid-plus/queryForm/queryForm.js

@@ -3,13 +3,14 @@ import { FormButtonGroup, FormGrid, Submit } from "@formily/antd-v5";
 import { observer } from "@formily/react";
 import { Button } from "antd";
 import React, { useMemo, Fragment } from 'react';
-var useCollapseGrid = function useCollapseGrid(maxRows) {
+var useCollapseGrid = function useCollapseGrid(maxRows, defaultExpand) {
   var grid = useMemo(function () {
     return FormGrid.createFormGrid({
       maxColumns: 5,
       maxWidth: 240,
       maxRows: maxRows,
       shouldVisible: function shouldVisible(node, grid) {
+        if (defaultExpand) return true;
         if (node.index === grid.childSize - 1) return true;
         if (grid.maxRows === Infinity) return true;
         return node.shadowRow < maxRows + 1 && node.index < grid.maxColumns - 1;
@@ -39,8 +40,9 @@ var useCollapseGrid = function useCollapseGrid(maxRows) {
   };
 };
 var QueryForm = observer(function (props) {
-  var onReset = props.onReset;
-  var _useCollapseGrid = useCollapseGrid(1),
+  var onReset = props.onReset,
+    defaultExpand = props.defaultExpand;
+  var _useCollapseGrid = useCollapseGrid(1, defaultExpand),
     grid = _useCollapseGrid.grid,
     expanded = _useCollapseGrid.expanded,
     toggle = _useCollapseGrid.toggle,
@@ -71,7 +73,7 @@ var QueryForm = observer(function (props) {
   var renderButtonGroup = function renderButtonGroup() {
     return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormButtonGroup, {
       align: "right"
-    }, renderActions(), type === "collapsible" ? renderExpanded() : null));
+    }, renderActions(), defaultExpand ? null : type === "collapsible" ? renderExpanded() : null));
   };
   return /*#__PURE__*/React.createElement(FormGrid, {
     grid: grid,

package/dist/esm/ag-grid-plus/setting/index.d.ts

@@ -3,6 +3,7 @@ import React from "react";
 declare const Setting: (props: {
     gridKey?: string | undefined;
     gridApi?: GridApi<any> | undefined;
+    gridApiState?: GridApi<any> | undefined;
     onSaveColumnState: (state: any) => void;
 }) => React.JSX.Element | null;
 export default Setting;

package/dist/esm/ag-grid-plus/setting/index.js

@@ -17,6 +17,7 @@ import ArrayTable from "../../array-table";
 var Setting = function Setting(props) {
   var gridKey = props.gridKey,
     gridApi = props.gridApi,
+    gridApiState = props.gridApiState,
     onSaveColumnState = props.onSaveColumnState;
   var SchemaField = useMemo(function () {
     return createSchemaField({
@@ -83,10 +84,16 @@ var Setting = function Setting(props) {
                   maxColumns: [1, 3],
                   strictAutoFit: true
                 }
-              }, /*#__PURE__*/React.createElement(SchemaField.Array, {
+              },
+              /*#__PURE__*/
+              //@ts-ignore
+              React.createElement(SchemaField.Array, {
                 name: "items",
                 title: "",
                 "x-component": "ArrayTable",
+                "x-component-props": {
+                  onRowDrag: true
+                },
                 "x-validator": [{
                   message: ""
                 }],
@@ -179,7 +186,6 @@ var Setting = function Setting(props) {
                 state: values.items,
                 applyOrder: true
               });
-              console.log('record1 values.items', values.items, falg);
               onSaveColumnState && onSaveColumnState(values.items);
               next(payload);
             }).open(formProps);

package/dist/esm/array-table/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { Fragment, useCallback, useRef, useState } from "react";
+import React, { Fragment, useCallback, useEffect, useRef, useState } from "react";
 import { AgGridReact } from "ag-grid-react";
 import { useField, observer, RecursionField } from "@formily/react";
 import { useFieldSchema } from "@formily/react";
@@ -21,6 +21,8 @@ import ArrayBase from "./arrayBase";
 import ArrayAddBtn from "./arrayAddBtn";
 import PreviewArrayTable from "./preview";
 import { Space } from "antd";
+import Setting from "../ag-grid-plus/setting";
+import { useGridPlusColumnState } from "../ag-grid-plus";
 
 //@ts-ignore
 var ArrayTable = observer(function (props) {
@@ -32,6 +34,10 @@ var ArrayTable = observer(function (props) {
   var apiRef = useRef();
   var ref = useRef();
   var field = useField();
+  var _useState3 = useState(undefined),
+    _useState4 = _slicedToArray(_useState3, 2),
+    gridApiState = _useState4[0],
+    setGridApiState = _useState4[1];
   var dataSource = Array.isArray(field.value) ? field.value.slice() : [];
   var dataSourceCopy = dataSource.slice();
   var sources = useArrayTableSources();
@@ -44,11 +50,23 @@ var ArrayTable = observer(function (props) {
     onMoveDown = props.onMoveDown,
     onMoveUp = props.onMoveUp;
   var addition = useAddition();
+  var _useGridPlusColumnSta = useGridPlusColumnState(),
+    onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
+    gridPlusColumnState = _useGridPlusColumnSta.columnState,
+    extensibleColumns = _useGridPlusColumnSta.extensibleColumns;
+  useEffect(function () {
+    if (gridPlusColumnState && props.gridKey && gridPlusColumnState[props.gridKey] && apiRef.current) {
+      apiRef.current.applyColumnState({
+        state: gridPlusColumnState[props.gridKey],
+        applyOrder: true
+      });
+    }
+  }, [gridPlusColumnState, apiRef.current]);
 
   //@ts-ignore
   if (columns.length > 0) {
     //@ts-ignore
-    columns[0].rowDrag = true;
+    columns[0].rowDrag = props.onRowDrag ? true : false;
   }
   var onRowDragMove = useCallback(function (event) {
     var movingNode = event.node;
@@ -71,6 +89,11 @@ var ArrayTable = observer(function (props) {
       arr.splice(toIndex, 0, element);
     }
   }, []);
+  var onColumnStateChanged = function onColumnStateChanged(columnState) {
+    if (props.gridKey) {
+      onSaveColumnState && onSaveColumnState(props.gridKey, columnState);
+    }
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
     style: {
       marginBottom: 5
@@ -97,10 +120,22 @@ var ArrayTable = observer(function (props) {
     onRemove: onRemove,
     onMoveUp: onMoveUp,
     onMoveDown: onMoveDown
-  }, /*#__PURE__*/React.createElement(AgGridReact, {
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'flex-end'
+    }
+  }, /*#__PURE__*/React.createElement(Setting, {
+    gridKey: props.gridKey,
+    gridApi: apiRef.current,
+    gridApiState: gridApiState,
+    onSaveColumnState: onColumnStateChanged
+  })), /*#__PURE__*/React.createElement(AgGridReact, {
     onGridReady: function onGridReady(params) {
       params.api.hidePopupMenu();
       apiRef.current = params.api;
+      setGridApiState(params.api);
     },
     gridOptions: {
       enableCellTextSelection: true,