@nokecy/qc-ui 0.3.12 → 0.3.14

package/dist/cjs/dashboard/utils.js

@@ -73,10 +73,10 @@ var getPosition = function getPosition(random, fontSize) {
     left: left
   };
 };
-/*
-生成uuid
-len:number  长度
-radix:number  进制
+/*
+生成uuid
+len:number  长度
+radix:number  进制
 */
 
 
@@ -115,10 +115,10 @@ function generateUuid() {
 }
 
 var confirm = _antd.Modal.confirm;
-/**
- * 异步确认弹窗，抛出确认或取消布尔值
- *
- * @param {confirmUtilAsyncProps} props
+/**
+ * 异步确认弹窗，抛出确认或取消布尔值
+ *
+ * @param {confirmUtilAsyncProps} props
  */
 
 var confirmUtilAsync = function confirmUtilAsync(props) {

package/dist/cjs/dashboard/widget/index.less

@@ -1,7 +1,7 @@
-.react-dashboard-widget {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  border:1px solid rgba(128,128,128,0.3);
-  overflow:hidden;
-}
+.react-dashboard-widget {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  border:1px solid rgba(128,128,128,0.3);
+  overflow:hidden;
+}

package/dist/cjs/dashboard/widget/selector/index.less

@@ -1,172 +1,172 @@
-.react-dashboard-widget-selector{
-  position:fixed;
-  top:50%;
-  left:50%;
-  transform:translate(-50%, -50%);
-  z-index:1006;
-  width:60%;
-  height:60%;
-  max-width:800px;
-  max-height:600px;
-  background:var(--component-background);
-}
-
-.react-dashboard-widget-wrap {
-  display: flex;
-  height:100%;
-  
-  .react-dashboard-widget-leftBar {
-    padding: 10px;
-    width: 180px;
-    border-right: 1px solid rgba(0, 0, 0, 0.1);
-    background: var(--component-background);
-    .react-dashboard-widget-searchIcon {
-      color: var(--text-color);
-    }
-
-    .react-dashboard-widget-item {
-      display: flex;
-      justify-content: space-between;
-      padding: 10px;
-
-      .react-dashboard-widget-Badge {
-
-          .ant-badge-count {
-            color: var(--text-color);
-            background-color: var(--component-background-1) !important;
-          }
-        
-      }
-
-      cursor: pointer;
-
-      &:hover {
-        background: var(--component-background-3);
-        font-weight: bold;
-      }
-    }
-
-    .react-dashboard-widget-active {
-      background: rgba(0, 0, 0, 0.03);
-      font-weight: bold;
-    }
-  }
-
-  .react-dashboard-widget-Layer {
-    flex: 1 1;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 10px;
-    background: rgba(0, 0, 0, 0.01);
-    &::-webkit-scrollbar {
-      width: 1px;
-      height: 1px;
-      overflow: auto;
-    }
-  
-    &::-webkit-scrollbar-thumb {
-      background-color: var(--primary-color);
-      min-height: 25px;
-      min-width: 25px;
-  
-      &:hover {
-        background-color: #a8a8a8;
-      }
-  
-      &:active {
-        background-color: #787878;
-      }
-    }
-  
-    &::-webkit-scrollbar-track {
-      background-color: #f7f7f7;
-      border: 1px solid #efefef;
-    }
-
-      .react-dashboard-widget-waterfall {
-        width: 100%;
-      }
-
-      .ant-popover-inner-content {
-        background: rgba(0, 0, 0, 0.01);
-      }
-    
-
-    .react-dashboard-widget-item {
-      cursor: pointer;
-      height: auto;
-      margin-bottom: 10px;
-      width: 100%;
-      height: auto;
-      border-radius: 5px;
-      overflow: hidden;
-      // box-shadow: 0 0 0px rgba(255, 255, 255, 1);
-      transition: all 0.3s;
-      border: 1px solid rgba(0, 0, 0, 0.1);
-      -webkit-column-break-inside: avoid;
-      position: relative;
-      background: var(--component-background);
-      .react-dashboard-widget-shortcut {
-        width: 100%;
-        height: auto;
-      }
-
-      .react-dashboard-widget-mask {
-        opacity: 0;
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background: rgba(0, 0, 0, 0.5);
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        transition: all 0.3s;
-      }
-
-      &:hover {
-        transition: all 0.3s;
-
-        border: 1px solid var(--component-background-3);
-
-        .react-dashboard-widget-mask {
-          opacity: 1;
-          transition: all 0.3s;
-        }
-      }
-
-      .react-dashboard-widget-bottombar {
-        border-top: 1px solid rgba(0, 0, 0, 0.1);
-        width: 100%;
-
-        padding: 5px;
-
-        .react-dashboard-widget-iconWrap {
-          display: inline-block;
-          width: 28px;
-          height: 28px;
-          line-height: 28px;
-          text-align: center;
-          border-radius: 7px;
-          color: #fff;
-          margin-right: 5px;
-          font-size: 16px;
-        }
-
-        .react-dashboard-widget-name {
-          font-size: 16px;
-          flex: 1;
-          color: var(--text-color);
-          line-height: 28px;
-          font-weight: bold;
-          display: inline;
-        }
-
-        .react-dashboard-widget-description {
-          margin-top: 5px;
-        }
-      }
-    }
-  }
-}
+.react-dashboard-widget-selector{
+  position:fixed;
+  top:50%;
+  left:50%;
+  transform:translate(-50%, -50%);
+  z-index:1006;
+  width:60%;
+  height:60%;
+  max-width:800px;
+  max-height:600px;
+  background:var(--component-background);
+}
+
+.react-dashboard-widget-wrap {
+  display: flex;
+  height:100%;
+  
+  .react-dashboard-widget-leftBar {
+    padding: 10px;
+    width: 180px;
+    border-right: 1px solid rgba(0, 0, 0, 0.1);
+    background: var(--component-background);
+    .react-dashboard-widget-searchIcon {
+      color: var(--text-color);
+    }
+
+    .react-dashboard-widget-item {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px;
+
+      .react-dashboard-widget-Badge {
+
+          .ant-badge-count {
+            color: var(--text-color);
+            background-color: var(--component-background-1) !important;
+          }
+        
+      }
+
+      cursor: pointer;
+
+      &:hover {
+        background: var(--component-background-3);
+        font-weight: bold;
+      }
+    }
+
+    .react-dashboard-widget-active {
+      background: rgba(0, 0, 0, 0.03);
+      font-weight: bold;
+    }
+  }
+
+  .react-dashboard-widget-Layer {
+    flex: 1 1;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 10px;
+    background: rgba(0, 0, 0, 0.01);
+    &::-webkit-scrollbar {
+      width: 1px;
+      height: 1px;
+      overflow: auto;
+    }
+  
+    &::-webkit-scrollbar-thumb {
+      background-color: var(--primary-color);
+      min-height: 25px;
+      min-width: 25px;
+  
+      &:hover {
+        background-color: #a8a8a8;
+      }
+  
+      &:active {
+        background-color: #787878;
+      }
+    }
+  
+    &::-webkit-scrollbar-track {
+      background-color: #f7f7f7;
+      border: 1px solid #efefef;
+    }
+
+      .react-dashboard-widget-waterfall {
+        width: 100%;
+      }
+
+      .ant-popover-inner-content {
+        background: rgba(0, 0, 0, 0.01);
+      }
+    
+
+    .react-dashboard-widget-item {
+      cursor: pointer;
+      height: auto;
+      margin-bottom: 10px;
+      width: 100%;
+      height: auto;
+      border-radius: 5px;
+      overflow: hidden;
+      // box-shadow: 0 0 0px rgba(255, 255, 255, 1);
+      transition: all 0.3s;
+      border: 1px solid rgba(0, 0, 0, 0.1);
+      -webkit-column-break-inside: avoid;
+      position: relative;
+      background: var(--component-background);
+      .react-dashboard-widget-shortcut {
+        width: 100%;
+        height: auto;
+      }
+
+      .react-dashboard-widget-mask {
+        opacity: 0;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: rgba(0, 0, 0, 0.5);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        transition: all 0.3s;
+      }
+
+      &:hover {
+        transition: all 0.3s;
+
+        border: 1px solid var(--component-background-3);
+
+        .react-dashboard-widget-mask {
+          opacity: 1;
+          transition: all 0.3s;
+        }
+      }
+
+      .react-dashboard-widget-bottombar {
+        border-top: 1px solid rgba(0, 0, 0, 0.1);
+        width: 100%;
+
+        padding: 5px;
+
+        .react-dashboard-widget-iconWrap {
+          display: inline-block;
+          width: 28px;
+          height: 28px;
+          line-height: 28px;
+          text-align: center;
+          border-radius: 7px;
+          color: #fff;
+          margin-right: 5px;
+          font-size: 16px;
+        }
+
+        .react-dashboard-widget-name {
+          font-size: 16px;
+          flex: 1;
+          color: var(--text-color);
+          line-height: 28px;
+          font-weight: bold;
+          display: inline;
+        }
+
+        .react-dashboard-widget-description {
+          margin-top: 5px;
+        }
+      }
+    }
+  }
+}

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

@@ -1,4 +1,4 @@
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "gridColumnState", "children"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 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); }
 
@@ -48,6 +48,7 @@ function AgGridPlus(props) {
       gridParams = props.params,
       request = props.request,
       dataSource = props.dataSource,
+      treeKeyName = props.treeKeyName,
       treeParentName = props.treeParentName,
       propRowData = props.rowData,
       propsGridRef = props.gridRef,
@@ -264,7 +265,7 @@ function AgGridPlus(props) {
     return !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
   }, [props.columnDefs]);
   var rowDataMemo = useMemo(function () {
-    return props.treeData ? flatten(toTree(rowData), treeParentName) : rowData;
+    return props.treeData ? flatten(toTree(rowData, treeParentName !== null && treeParentName !== void 0 ? treeParentName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeParentName) : rowData;
   }, [rowData, props.treeData]);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,

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

@@ -12,6 +12,7 @@ interface GridProps extends AgGridReactProps {
     loading?: boolean;
     request?: (params: any, sort: any, filter: any) => Promise<any>;
     dataSource?: any[];
+    treeKeyName?: string;
     treeParentName?: string;
     search?: boolean;
     headerTitle?: React.ReactNode;

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

@@ -6,6 +6,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -18,12 +24,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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); }); }; }
-
 import { DatePicker, FormButtonGroup, FormGrid, FormItem, Form, Input, Submit } from '@formily/antd-v5';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';
@@ -41,20 +41,17 @@ var FormRender = function FormRender(props) {
       columnStates = props.columnStates,
       onQuery = props.onQuery;
 
-  var getFormComponents = function getFormComponents() {
-    var columnDefs = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDefs();
-    var components = {};
-
-    if (columnDefs) {
-      return columnDefs.map(function (x) {
-        return x.searchComponent;
-      });
-    }
-  };
+  var _useState = useState({
+    type: 'object',
+    properties: {}
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      schema = _useState2[0],
+      setSchema = _useState2[1];
 
   var form = useMemo(function () {
     return createForm();
-  }, []);
+  }, [schema]);
   var SchemaField = useMemo(function () {
     return createSchemaField({
       components: {
@@ -69,7 +66,7 @@ var FormRender = function FormRender(props) {
         BoolSelect: BoolSelect
       }
     });
-  }, []);
+  }, [schema]);
 
   var onSubmit = function onSubmit() {
     onQuery && onQuery(form.values);
@@ -100,14 +97,6 @@ var FormRender = function FormRender(props) {
     };
   }();
 
-  var _useState = useState({
-    type: 'object',
-    properties: {}
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      schema = _useState2[0],
-      setSchema = _useState2[1];
-
   var getComponent = function getComponent(colDef) {
     var component = colDef.searchComponent ? colDef.searchComponent : undefined;
 
@@ -153,6 +142,7 @@ var FormRender = function FormRender(props) {
         return x.colId == colDef.field;
       });
       var columnDefs = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(colDef.field);
+      console.log("columnDefs", columnDefs);
       return _objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state);
     });
     columns = columns ? (_columns = columns) === null || _columns === void 0 ? void 0 : _columns.filter(function (i) {

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

@@ -4,6 +4,6 @@ declare const convertSortModel: (sortModel: any[]) => string;
 declare const dateValueFormatter: (params: ValueFormatterParams) => string;
 declare const dateTimeValueFormatter: (params: ValueFormatterParams) => string;
 declare const flatten: (arr: any[], parentPropName: any, parentref?: any[]) => any;
-declare const toTree: (data: any[]) => any[];
+declare const toTree: (data: any[], keyName: any, parentKeyName: any) => any[];
 declare const flattenTreeDeep: (treeData: any[], childrenName?: string) => any[];
 export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten };

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

@@ -114,7 +114,7 @@ var flatten = function flatten(arr, parentPropName, parentref) {
   return data;
 };
 
-var toTree = function toTree(data) {
+var toTree = function toTree(data, keyName, parentKeyName) {
   // 删除 所有 children,以防止多次调用
   data.forEach(function (item) {
     delete item.children;
@@ -122,12 +122,12 @@ var toTree = function toTree(data) {
 
   var map = {};
   data.forEach(function (item) {
-    map[item.id] = item;
+    map[item[keyName]] = item;
   });
   var val = [];
   data.forEach(function (item) {
     // 以当前遍历项，的pid,去map对象中找到索引的id
-    var parent = map[item.parentId]; // 好绕啊，如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
+    var parent = map[item[parentKeyName]]; // 好绕啊，如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
 
     if (parent) {
       (parent.children || (parent.children = [])).push(item);