@nokecy/qc-ui 0.1.6 → 0.1.7

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

@@ -31,6 +31,8 @@ var _icons = require("@ant-design/icons");
 
 var _utils = require("./utils");
 
+var _setting = _interopRequireDefault(require("./setting"));
+
 var _excluded = ["style", "params", "request", "dataSource", "gridRef", "headerTitle", "toolBarRender", "search", "hideRedo", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -99,8 +101,8 @@ function AgGridPlus(props) {
 
   var _useState5 = (0, _react.useState)(),
       _useState6 = _slicedToArray(_useState5, 2),
-      columnDefs = _useState6[0],
-      setColumnDefs = _useState6[1];
+      columnState = _useState6[0],
+      setColumnState = _useState6[1];
 
   var _useState7 = (0, _react.useState)([]),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -165,12 +167,14 @@ function AgGridPlus(props) {
     setRowData(dataSource || rowData);
   }, [dataSource, rowData]);
   var onGridReady = (0, _react.useCallback)(function (params) {
+    var _columnsRef$current;
+
     apiRef.current = params.api;
     columnsRef.current = params.columnApi;
     onReady && onReady(params); ///@ts-ignore
 
     dataSource && setRowData(dataSource);
-    setColumnDefs(columnsRef.current.getColumns());
+    setColumnState((_columnsRef$current = columnsRef.current) === null || _columnsRef$current === void 0 ? void 0 : _columnsRef$current.getColumnState());
     sortChanged(params.columnApi);
     setReady(true);
   }, [dataSource]);
@@ -214,6 +218,8 @@ function AgGridPlus(props) {
     request && onRequest(queryFilter);
   };
 
+  var onSaveColumnState = function onSaveColumnState(columnState) {};
+
   (0, _react.useEffect)(function () {
     gridRef.current = {
       onRefresh: onRefresh
@@ -231,7 +237,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/_react.default.createElement(_queryForm.default, {
-    columns: columnDefs,
+    columnStates: columnState || [],
     gridApi: apiRef.current,
     onQuery: function onQuery(formValues) {
       setQueryFilter(_objectSpread({}, formValues));
@@ -265,9 +271,10 @@ function AgGridPlus(props) {
     settings: [/*#__PURE__*/_react.default.createElement(_settingItem.default, {
       onClick: onRefresh,
       icon: /*#__PURE__*/_react.default.createElement(_icons.RedoOutlined, null)
-    }), /*#__PURE__*/_react.default.createElement(_settingItem.default, {
-      onClick: onRefresh,
-      icon: /*#__PURE__*/_react.default.createElement(_icons.SettingOutlined, null)
+    }), /*#__PURE__*/_react.default.createElement(_setting.default, {
+      gridApi: apiRef.current,
+      columnApi: columnsRef.current,
+      onSaveColumnState: onSaveColumnState
     })]
   }), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, _extends({
     className: "ag-theme-alpine"
@@ -284,6 +291,28 @@ function AgGridPlus(props) {
       props.onSelectionChanged && props.onSelectionChanged(e);
       setSelectRows(e.api.getSelectedRows());
     },
+    onDragStopped: function onDragStopped(e) {
+      if (columnsRef.current) {
+        var _columnsRef$current2;
+
+        setColumnState((_columnsRef$current2 = columnsRef.current) === null || _columnsRef$current2 === void 0 ? void 0 : _columnsRef$current2.getColumnState());
+      }
+    },
+    onColumnResized: function onColumnResized(e) {
+      if (columnsRef.current) {
+        var _columnsRef$current3, _columnsRef$current4;
+
+        console.log((_columnsRef$current3 = columnsRef.current) === null || _columnsRef$current3 === void 0 ? void 0 : _columnsRef$current3.getColumnState());
+        setColumnState((_columnsRef$current4 = columnsRef.current) === null || _columnsRef$current4 === void 0 ? void 0 : _columnsRef$current4.getColumnState());
+      }
+    },
+    onColumnMoved: function onColumnMoved() {
+      if (columnsRef.current) {
+        var _columnsRef$current5;
+
+        setColumnState((_columnsRef$current5 = columnsRef.current) === null || _columnsRef$current5 === void 0 ? void 0 : _columnsRef$current5.getColumnState());
+      }
+    },
     columnTypes: {
       bool: {
         cellRenderer: function cellRenderer(params) {

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

@@ -1,10 +1,10 @@
 /// <reference types="react" />
-import { GridApi } from 'ag-grid-community';
+import { ColumnState, GridApi } from 'ag-grid-community';
 import './index.less';
 declare const FormRender: (props: {
     className?: any;
     gridApi?: GridApi<any> | undefined;
-    columns: any[];
+    columnStates: ColumnState[];
     onQuery: (formValue: any) => void;
 }) => JSX.Element;
 export default FormRender;

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

@@ -56,7 +56,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var FormRender = function FormRender(props) {
   var className = props.className,
       gridApi = props.gridApi,
-      columns = props.columns,
+      columnStates = props.columnStates,
       onQuery = props.onQuery;
   var form = (0, _react2.useMemo)(function () {
     return (0, _core.createForm)();
@@ -119,7 +119,7 @@ var FormRender = function FormRender(props) {
       properties: {}
     };
 
-    if (!columns) {
+    if (!columnStates) {
       return rootSchema;
     }
 
@@ -131,27 +131,18 @@ var FormRender = function FormRender(props) {
       },
       properties: {}
     };
-    columns.forEach(function (i, index) {
-      i.searchSort = i.getColDef().searchSort === 0 ? i.getColDef().searchSort : i.getColDef().searchSort || index;
-    }); //ag-grid 列 添加属性 searchSort，冒泡排序表单
-
-    for (var i = 0; i < columns.length - 1; i++) {
-      for (var j = 0; j < columns.length - 1 - i; j++) {
-        if (columns[j].searchSort > columns[j + 1].searchSort) {
-          var temp = columns[j];
-          columns[j] = columns[j + 1];
-          columns[j + 1] = temp;
-        }
-      }
-    }
-
-    var arr = columns.filter(function (i) {
-      return (i === null || i === void 0 ? void 0 : i.visible) != false && !i.getColDef().hideInSearch || i.getColDef().hideInTable;
+    var columns = columnStates.filter(function (x) {
+      return !x.hide;
+    }).map(function (columnState) {
+      return gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(columnState.colId);
+    });
+    columns = columns.filter(function (i) {
+      return (i === null || i === void 0 ? void 0 : i.visible) != false && !i.hideInSearch || i.hideInTable;
     });
-    arr.map(function (col) {
+    columns.map(function (col) {
       var _colDef$queryField;
 
-      var colDef = col.getColDef();
+      var colDef = col;
       var name = (_colDef$queryField = colDef.queryField) !== null && _colDef$queryField !== void 0 ? _colDef$queryField : colDef.field;
       var headerName = colDef.headerName; //表单自定义组件
 
@@ -182,7 +173,7 @@ var FormRender = function FormRender(props) {
 
     rootSchema.properties["grid"] = gridSchema;
 
-    if (!arr.length) {
+    if (!columns.length) {
       ///@ts-ignore
       delete rootSchema.properties["grid"];
     }
@@ -193,7 +184,7 @@ var FormRender = function FormRender(props) {
   (0, _react2.useEffect)(function () {
     var new_schema = getSchema();
     setSchema(new_schema);
-  }, [columns]);
+  }, [JSON.stringify(columnStates)]);
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _classnames.default)(className, "ag-grid-table-search ag-grid-table-search-query-filter")
   }, /*#__PURE__*/_react2.default.createElement(_antd.Form, {

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { ColumnApi, GridApi } from 'ag-grid-community';
+declare const Setting: (props: {
+    gridApi?: GridApi<any> | undefined;
+    columnApi: ColumnApi;
+    onSaveColumnState: (state: any) => void;
+}) => JSX.Element;
+export default Setting;

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

@@ -0,0 +1,214 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
+
+var _antd = require("@formily/antd");
+
+var _react = require("@formily/react");
+
+var _core = require("@formily/core");
+
+var _react2 = _interopRequireWildcard(require("react"));
+
+var _icons = require("@ant-design/icons");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var Setting = function Setting(props) {
+  var gridApi = props.gridApi,
+      columnApi = props.columnApi,
+      onSaveColumnState = props.onSaveColumnState;
+  var SchemaField = (0, _react2.useMemo)(function () {
+    return (0, _react.createSchemaField)({
+      components: {
+        FormTab: _antd.FormTab,
+        FormItem: _antd.FormItem,
+        FormGrid: _antd.FormGrid,
+        Space: _antd.Space,
+        Input: _antd.Input,
+        Select: _antd.Select,
+        ArrayTable: _antd.ArrayTable,
+        NumberPicker: _antd.NumberPicker,
+        Switch: _antd.Switch
+      }
+    });
+  }, []);
+  var formProps = {
+    effects: function effects() {
+      (0, _core.onFormInit)(function (form) {
+        form.setInitialValuesIn('items', getColumnData());
+      });
+    }
+  };
+
+  var getColumnData = function getColumnData() {
+    var columnStates = columnApi.getColumnState();
+    var columnRowData = [];
+    var columns = columnStates.map(function (columnState) {
+      var colDef = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(columnState.colId);
+      columnRowData.push(_objectSpread({
+        field: colDef.field,
+        headerName: colDef.headerName,
+        width: columnState.width,
+        hide: columnState.hide
+      }, columnState));
+    });
+    return columnRowData;
+  };
+
+  var portalId = "workProcedure".concat((0, _uniqueId2.default)());
+  return /*#__PURE__*/_react2.default.createElement(_antd.FormDialog.Portal, {
+    id: portalId
+  }, /*#__PURE__*/_react2.default.createElement("div", {
+    style: {
+      margin: "0 4px",
+      color: "#000",
+      fontSize: 16,
+      cursor: "pointer"
+    },
+    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var formDialog;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              formDialog = (0, _antd.FormDialog)({
+                title: "个性化设置",
+                width: 960
+              }, portalId, function () {
+                return /*#__PURE__*/_react2.default.createElement(_antd.FormLayout, null, /*#__PURE__*/_react2.default.createElement(SchemaField, null, /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                  "x-component": "FormGrid",
+                  "x-component-props": {
+                    maxColumns: [1, 3],
+                    strictAutoFit: true
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.Array, {
+                  name: "items",
+                  title: "",
+                  "x-component": "ArrayTable",
+                  "x-validator": [{
+                    message: ""
+                  }],
+                  "x-decorator": "FormItem",
+                  "x-decorator-props": {
+                    gridSpan: 3
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.Object, null, /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                  "x-component": "ArrayTable.Column",
+                  "x-component-props": {
+                    width: 150,
+                    title: "字段名"
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
+                  name: "field",
+                  "x-decorator": "FormItem",
+                  "x-component": "Input",
+                  "x-read-pretty": true
+                })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                  "x-component": "ArrayTable.Column",
+                  "x-component-props": {
+                    width: 150,
+                    title: "列名"
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
+                  name: "headerName",
+                  "x-decorator": "FormItem",
+                  "x-component": "Input",
+                  "x-read-pretty": true
+                })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                  "x-component": "ArrayTable.Column",
+                  "x-component-props": {
+                    width: 150,
+                    title: "宽度"
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
+                  name: "width",
+                  "x-decorator": "FormItem",
+                  "x-component": "NumberPicker"
+                })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                  "x-component": "ArrayTable.Column",
+                  "x-component-props": {
+                    width: 150,
+                    title: "占满"
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
+                  name: "flex",
+                  "x-decorator": "FormItem",
+                  "x-component": "Switch"
+                })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                  "x-component": "ArrayTable.Column",
+                  "x-component-props": {
+                    width: 150,
+                    title: '固定位置'
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
+                  name: "pinned",
+                  "x-decorator": "FormItem",
+                  "x-component": "Select",
+                  enum: [{
+                    value: "left",
+                    label: "左固定"
+                  }, {
+                    value: "right",
+                    label: "右固定"
+                  }, {
+                    value: undefined,
+                    label: "不固定"
+                  }]
+                })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                  "x-component": "ArrayTable.Column",
+                  "x-component-props": {
+                    width: 150,
+                    title: '隐藏'
+                  }
+                }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
+                  name: "hide",
+                  "x-decorator": "FormItem",
+                  "x-component": "Switch"
+                })))))));
+              });
+              formDialog.forConfirm(function (payload, next) {
+                var values = payload.values;
+                var falg = columnApi.applyColumnState({
+                  state: values.items,
+                  applyOrder: true
+                });
+                onSaveColumnState && onSaveColumnState(values.items);
+                next(payload);
+              }).open(formProps);
+
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))
+  }, /*#__PURE__*/_react2.default.createElement(_icons.SettingOutlined, null)));
+};
+
+var _default = Setting;
+exports.default = _default;

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

@@ -34,8 +34,9 @@ import { AgGridColumn } from "./interface";
 import FormRender from "./queryForm";
 import ToolBar from "./toolBar";
 import SettingItem from "./settingItem";
-import { RedoOutlined, SettingOutlined } from '@ant-design/icons';
+import { RedoOutlined } from '@ant-design/icons';
 import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
+import Setting from "./setting";
 
 var getSort = function getSort(columnState) {
   return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
@@ -73,8 +74,8 @@ function AgGridPlus(props) {
 
   var _useState5 = useState(),
       _useState6 = _slicedToArray(_useState5, 2),
-      columnDefs = _useState6[0],
-      setColumnDefs = _useState6[1];
+      columnState = _useState6[0],
+      setColumnState = _useState6[1];
 
   var _useState7 = useState([]),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -139,12 +140,14 @@ function AgGridPlus(props) {
     setRowData(dataSource || rowData);
   }, [dataSource, rowData]);
   var onGridReady = useCallback(function (params) {
+    var _columnsRef$current;
+
     apiRef.current = params.api;
     columnsRef.current = params.columnApi;
     onReady && onReady(params); ///@ts-ignore
 
     dataSource && setRowData(dataSource);
-    setColumnDefs(columnsRef.current.getColumns());
+    setColumnState((_columnsRef$current = columnsRef.current) === null || _columnsRef$current === void 0 ? void 0 : _columnsRef$current.getColumnState());
     sortChanged(params.columnApi);
     setReady(true);
   }, [dataSource]);
@@ -188,6 +191,8 @@ function AgGridPlus(props) {
     request && onRequest(queryFilter);
   };
 
+  var onSaveColumnState = function onSaveColumnState(columnState) {};
+
   useEffect(function () {
     gridRef.current = {
       onRefresh: onRefresh
@@ -205,7 +210,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/React.createElement(FormRender, {
-    columns: columnDefs,
+    columnStates: columnState || [],
     gridApi: apiRef.current,
     onQuery: function onQuery(formValues) {
       setQueryFilter(_objectSpread({}, formValues));
@@ -239,9 +244,10 @@ function AgGridPlus(props) {
     settings: [/*#__PURE__*/React.createElement(SettingItem, {
       onClick: onRefresh,
       icon: /*#__PURE__*/React.createElement(RedoOutlined, null)
-    }), /*#__PURE__*/React.createElement(SettingItem, {
-      onClick: onRefresh,
-      icon: /*#__PURE__*/React.createElement(SettingOutlined, null)
+    }), /*#__PURE__*/React.createElement(Setting, {
+      gridApi: apiRef.current,
+      columnApi: columnsRef.current,
+      onSaveColumnState: onSaveColumnState
     })]
   }), /*#__PURE__*/React.createElement(AgGridReact, _extends({
     className: "ag-theme-alpine"
@@ -258,6 +264,28 @@ function AgGridPlus(props) {
       props.onSelectionChanged && props.onSelectionChanged(e);
       setSelectRows(e.api.getSelectedRows());
     },
+    onDragStopped: function onDragStopped(e) {
+      if (columnsRef.current) {
+        var _columnsRef$current2;
+
+        setColumnState((_columnsRef$current2 = columnsRef.current) === null || _columnsRef$current2 === void 0 ? void 0 : _columnsRef$current2.getColumnState());
+      }
+    },
+    onColumnResized: function onColumnResized(e) {
+      if (columnsRef.current) {
+        var _columnsRef$current3, _columnsRef$current4;
+
+        console.log((_columnsRef$current3 = columnsRef.current) === null || _columnsRef$current3 === void 0 ? void 0 : _columnsRef$current3.getColumnState());
+        setColumnState((_columnsRef$current4 = columnsRef.current) === null || _columnsRef$current4 === void 0 ? void 0 : _columnsRef$current4.getColumnState());
+      }
+    },
+    onColumnMoved: function onColumnMoved() {
+      if (columnsRef.current) {
+        var _columnsRef$current5;
+
+        setColumnState((_columnsRef$current5 = columnsRef.current) === null || _columnsRef$current5 === void 0 ? void 0 : _columnsRef$current5.getColumnState());
+      }
+    },
     columnTypes: {
       bool: {
         cellRenderer: function cellRenderer(params) {

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

@@ -1,10 +1,10 @@
 /// <reference types="react" />
-import { GridApi } from 'ag-grid-community';
+import { ColumnState, GridApi } from 'ag-grid-community';
 import './index.less';
 declare const FormRender: (props: {
     className?: any;
     gridApi?: GridApi<any> | undefined;
-    columns: any[];
+    columnStates: ColumnState[];
     onQuery: (formValue: any) => void;
 }) => JSX.Element;
 export default FormRender;

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

@@ -36,7 +36,7 @@ import "./index.less";
 var FormRender = function FormRender(props) {
   var className = props.className,
       gridApi = props.gridApi,
-      columns = props.columns,
+      columnStates = props.columnStates,
       onQuery = props.onQuery;
   var form = useMemo(function () {
     return createForm();
@@ -99,7 +99,7 @@ var FormRender = function FormRender(props) {
       properties: {}
     };
 
-    if (!columns) {
+    if (!columnStates) {
       return rootSchema;
     }
 
@@ -111,27 +111,18 @@ var FormRender = function FormRender(props) {
       },
       properties: {}
     };
-    columns.forEach(function (i, index) {
-      i.searchSort = i.getColDef().searchSort === 0 ? i.getColDef().searchSort : i.getColDef().searchSort || index;
-    }); //ag-grid 列 添加属性 searchSort，冒泡排序表单
-
-    for (var i = 0; i < columns.length - 1; i++) {
-      for (var j = 0; j < columns.length - 1 - i; j++) {
-        if (columns[j].searchSort > columns[j + 1].searchSort) {
-          var temp = columns[j];
-          columns[j] = columns[j + 1];
-          columns[j + 1] = temp;
-        }
-      }
-    }
-
-    var arr = columns.filter(function (i) {
-      return (i === null || i === void 0 ? void 0 : i.visible) != false && !i.getColDef().hideInSearch || i.getColDef().hideInTable;
+    var columns = columnStates.filter(function (x) {
+      return !x.hide;
+    }).map(function (columnState) {
+      return gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(columnState.colId);
+    });
+    columns = columns.filter(function (i) {
+      return (i === null || i === void 0 ? void 0 : i.visible) != false && !i.hideInSearch || i.hideInTable;
     });
-    arr.map(function (col) {
+    columns.map(function (col) {
       var _colDef$queryField;
 
-      var colDef = col.getColDef();
+      var colDef = col;
       var name = (_colDef$queryField = colDef.queryField) !== null && _colDef$queryField !== void 0 ? _colDef$queryField : colDef.field;
       var headerName = colDef.headerName; //表单自定义组件
 
@@ -162,7 +153,7 @@ var FormRender = function FormRender(props) {
 
     rootSchema.properties["grid"] = gridSchema;
 
-    if (!arr.length) {
+    if (!columns.length) {
       ///@ts-ignore
       delete rootSchema.properties["grid"];
     }
@@ -173,7 +164,7 @@ var FormRender = function FormRender(props) {
   useEffect(function () {
     var new_schema = getSchema();
     setSchema(new_schema);
-  }, [columns]);
+  }, [JSON.stringify(columnStates)]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(className, "ag-grid-table-search ag-grid-table-search-query-filter")
   }, /*#__PURE__*/React.createElement(Form, {

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { ColumnApi, GridApi } from 'ag-grid-community';
+declare const Setting: (props: {
+    gridApi?: GridApi<any> | undefined;
+    columnApi: ColumnApi;
+    onSaveColumnState: (state: any) => void;
+}) => JSX.Element;
+export default Setting;