@nokecy/qc-ui 1.0.13 → 1.0.15

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

@@ -83,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;
   });
@@ -172,7 +169,7 @@ function AgGridPlus(props) {
         applyOrder: true
       });
     }
-  }, [gridPlusColumnState, apiRef.current]);
+  }, [gridPlusColumnState, apiRef.current, rowData]);
   (0, _react.useEffect)(function () {
     setRowData(dataSource || propRowData || []);
   }, [dataSource, propRowData]);
@@ -227,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) {

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)({
@@ -68,6 +69,9 @@ var Setting = function Setting(props) {
   if (!gridKey) {
     return null;
   }
+  var tableProps = {
+    onRowDrag: true
+  };
   return /*#__PURE__*/_react2.default.createElement(_antdV.FormDialog.Portal, {
     id: portalId
   }, /*#__PURE__*/_react2.default.createElement("div", {
@@ -96,6 +100,7 @@ var Setting = function Setting(props) {
                 name: "items",
                 title: "",
                 "x-component": "ArrayTable",
+                "x-component-props": tableProps,
                 "x-validator": [{
                   message: ""
                 }],
@@ -188,7 +193,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,25 @@ 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;
+  // const teststyle = '[{\"id\":\"18\",\"field\":\"xdxcp47tycp\",\"headerName\":\"A1\",\"width\":800,\"hide\":false,\"colId\":\"a1\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null},{\"id\":\"19\",\"field\":\"nvhezzkyak9\",\"headerName\":\"Operations\",\"width\":60,\"hide\":false,\"colId\":\"nvhezzkyak9\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null}]'
+
+  (0, _react.useEffect)(function () {
+    if (props.gridKey && gridPlusColumnState && gridPlusColumnState[props.gridKey] && apiRef.current) {
+      apiRef.current.applyColumnState({
+        state: gridPlusColumnState[props.gridKey],
+        applyOrder: true
+      });
+    }
+  }, [gridPlusColumnState, apiRef.current, dataSource]);
 
   //@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 +97,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 +128,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

@@ -74,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;
   });
@@ -163,7 +160,7 @@ function AgGridPlus(props) {
         applyOrder: true
       });
     }
-  }, [gridPlusColumnState, apiRef.current]);
+  }, [gridPlusColumnState, apiRef.current, rowData]);
   useEffect(function () {
     setRowData(dataSource || propRowData || []);
   }, [dataSource, propRowData]);
@@ -218,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) {

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({
@@ -59,6 +60,9 @@ var Setting = function Setting(props) {
   if (!gridKey) {
     return null;
   }
+  var tableProps = {
+    onRowDrag: true
+  };
   return /*#__PURE__*/React.createElement(FormDialog.Portal, {
     id: portalId
   }, /*#__PURE__*/React.createElement("div", {
@@ -87,6 +91,7 @@ var Setting = function Setting(props) {
                 name: "items",
                 title: "",
                 "x-component": "ArrayTable",
+                "x-component-props": tableProps,
                 "x-validator": [{
                   message: ""
                 }],
@@ -179,7 +184,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,25 @@ 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;
+  // const teststyle = '[{\"id\":\"18\",\"field\":\"xdxcp47tycp\",\"headerName\":\"A1\",\"width\":800,\"hide\":false,\"colId\":\"a1\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null},{\"id\":\"19\",\"field\":\"nvhezzkyak9\",\"headerName\":\"Operations\",\"width\":60,\"hide\":false,\"colId\":\"nvhezzkyak9\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null}]'
+
+  useEffect(function () {
+    if (props.gridKey && gridPlusColumnState && gridPlusColumnState[props.gridKey] && apiRef.current) {
+      apiRef.current.applyColumnState({
+        state: gridPlusColumnState[props.gridKey],
+        applyOrder: true
+      });
+    }
+  }, [gridPlusColumnState, apiRef.current, dataSource]);
 
   //@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 +91,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 +122,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,