@nokecy/qc-ui 1.0.11 → 1.0.12

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

@@ -104,6 +104,16 @@ var Setting = function Setting(props) {
                   gridSpan: 3
                 }
               }, /*#__PURE__*/_react2.default.createElement(SchemaField.Object, null, /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                "x-component": "ArrayTable.Column",
+                "x-component-props": {
+                  width: 80,
+                  title: "排序"
+                }
+              }, /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                "x-decorator": "FormItem",
+                required: true,
+                "x-component": "ArrayTable.SortHandle"
+              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
                   width: 300,
@@ -178,6 +188,7 @@ 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

@@ -39,6 +39,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
   var ref = (0, _react.useRef)();
   var field = (0, _react2.useField)();
   var dataSource = Array.isArray(field.value) ? field.value.slice() : [];
+  var dataSourceCopy = dataSource.slice();
   var sources = (0, _utils.useArrayTableSources)();
   var columns = (0, _utils.useArrayTableColumns)(dataSource, field, sources);
   var schema = (0, _react2.useFieldSchema)();
@@ -49,6 +50,33 @@ var ArrayTable = (0, _react2.observer)(function (props) {
     onMoveDown = props.onMoveDown,
     onMoveUp = props.onMoveUp;
   var addition = (0, _utils.useAddition)();
+
+  //@ts-ignore
+  if (columns.length > 0) {
+    //@ts-ignore
+    columns[0].rowDrag = true;
+  }
+  var onRowDragMove = (0, _react.useCallback)(function (event) {
+    var movingNode = event.node;
+    var overNode = event.overNode;
+    var rowNeedsToMove = movingNode !== overNode;
+    if (rowNeedsToMove) {
+      var movingData = movingNode.data;
+      var overData = overNode.data;
+      var fromIndex = dataSourceCopy.indexOf(movingData);
+      var toIndex = dataSourceCopy.indexOf(overData);
+      var newStore = dataSourceCopy.slice();
+      moveInArray(newStore, fromIndex, toIndex);
+      dataSourceCopy = newStore;
+      field.setValue(newStore);
+      apiRef.current.clearFocusedCell();
+    }
+    function moveInArray(arr, fromIndex, toIndex) {
+      var element = arr[fromIndex];
+      arr.splice(fromIndex, 1);
+      arr.splice(toIndex, 0, element);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Space, {
     style: {
       marginBottom: 5
@@ -84,6 +112,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
       enableCellTextSelection: true,
       ensureDomOrder: true
     },
+    onRowDragMove: onRowDragMove,
     onRowDataUpdated: function onRowDataUpdated(e) {
       if (isAdd) {
         var _apiRef$current;
@@ -91,6 +120,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
         setIsAdd(false);
       }
     },
+    rowDragManaged: true,
     suppressClipboardApi: true,
     suppressClipboardPaste: true,
     preventDefaultOnContextMenu: true,

package/dist/cjs/dialogSelect/index.js

@@ -11,7 +11,9 @@ var _icons = require("@ant-design/icons");
 var _react = _interopRequireWildcard(require("react"));
 var _agGridPlus = require("../ag-grid-plus");
 var _ahooks = require("ahooks");
+var _draggableModal = _interopRequireDefault(require("../draggableModal"));
 var _excluded = ["request", "columnDefs", "value", "labelField", "valueField", "onChangeItem"];
+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; }
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -107,7 +109,9 @@ var DialogSelect = function DialogSelect(props) {
       width: "calc(100% - 0px)",
       marginRight: !props.hideBtn ? 5 : 0
     })
-  })) : /*#__PURE__*/_react.default.createElement(_antdV.Select, _extends({}, rest, {
+  })) : /*#__PURE__*/_react.default.createElement(_antdV.Select, _extends({
+    maxTagCount: 'responsive'
+  }, rest, {
     value: state,
     style: _objectSpread({
       width: "calc(100% - 0px)",
@@ -119,7 +123,7 @@ var DialogSelect = function DialogSelect(props) {
       setTrue();
     },
     disabled: rest.disabled
-  }) : null), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  }) : null), /*#__PURE__*/_react.default.createElement(_draggableModal.default, {
     width: 960,
     title: "\u9009\u62E9",
     style: {

package/dist/cjs/formDesigner/FormDesigner.js

@@ -59,7 +59,7 @@ var FormDesigner = function FormDesigner(props) {
   }, []);
   (0, _react.useEffect)(function () {
     loadSchema && loadSchema(engine);
-  }, []);
+  }, [name]);
   var getComponents = function getComponents() {
     var components = {};
     businessComponents.map(function (x) {

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

@@ -95,6 +95,16 @@ var Setting = function Setting(props) {
                   gridSpan: 3
                 }
               }, /*#__PURE__*/React.createElement(SchemaField.Object, null, /*#__PURE__*/React.createElement(SchemaField.Void, {
+                "x-component": "ArrayTable.Column",
+                "x-component-props": {
+                  width: 80,
+                  title: "排序"
+                }
+              }, /*#__PURE__*/React.createElement(SchemaField.Void, {
+                "x-decorator": "FormItem",
+                required: true,
+                "x-component": "ArrayTable.SortHandle"
+              })), /*#__PURE__*/React.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
                   width: 300,
@@ -169,6 +179,7 @@ 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, useRef, useState } from "react";
+import React, { Fragment, useCallback, useRef, useState } from "react";
 import { AgGridReact } from "ag-grid-react";
 import { useField, observer, RecursionField } from "@formily/react";
 import { useFieldSchema } from "@formily/react";
@@ -33,6 +33,7 @@ var ArrayTable = observer(function (props) {
   var ref = useRef();
   var field = useField();
   var dataSource = Array.isArray(field.value) ? field.value.slice() : [];
+  var dataSourceCopy = dataSource.slice();
   var sources = useArrayTableSources();
   var columns = useArrayTableColumns(dataSource, field, sources);
   var schema = useFieldSchema();
@@ -43,6 +44,33 @@ var ArrayTable = observer(function (props) {
     onMoveDown = props.onMoveDown,
     onMoveUp = props.onMoveUp;
   var addition = useAddition();
+
+  //@ts-ignore
+  if (columns.length > 0) {
+    //@ts-ignore
+    columns[0].rowDrag = true;
+  }
+  var onRowDragMove = useCallback(function (event) {
+    var movingNode = event.node;
+    var overNode = event.overNode;
+    var rowNeedsToMove = movingNode !== overNode;
+    if (rowNeedsToMove) {
+      var movingData = movingNode.data;
+      var overData = overNode.data;
+      var fromIndex = dataSourceCopy.indexOf(movingData);
+      var toIndex = dataSourceCopy.indexOf(overData);
+      var newStore = dataSourceCopy.slice();
+      moveInArray(newStore, fromIndex, toIndex);
+      dataSourceCopy = newStore;
+      field.setValue(newStore);
+      apiRef.current.clearFocusedCell();
+    }
+    function moveInArray(arr, fromIndex, toIndex) {
+      var element = arr[fromIndex];
+      arr.splice(fromIndex, 1);
+      arr.splice(toIndex, 0, element);
+    }
+  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
     style: {
       marginBottom: 5
@@ -78,6 +106,7 @@ var ArrayTable = observer(function (props) {
       enableCellTextSelection: true,
       ensureDomOrder: true
     },
+    onRowDragMove: onRowDragMove,
     onRowDataUpdated: function onRowDataUpdated(e) {
       if (isAdd) {
         var _apiRef$current;
@@ -85,6 +114,7 @@ var ArrayTable = observer(function (props) {
         setIsAdd(false);
       }
     },
+    rowDragManaged: true,
     suppressClipboardApi: true,
     suppressClipboardPaste: true,
     preventDefaultOnContextMenu: true,

package/dist/esm/dialogSelect/index.js

@@ -17,12 +17,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Button, Modal, AutoComplete } from 'antd';
+import { Button, AutoComplete } from 'antd';
 import { Select } from '@formily/antd-v5';
 import { DashOutlined } from '@ant-design/icons';
 import React, { useState } from 'react';
 import { AgGridPlus } from "../ag-grid-plus";
 import { useBoolean, useControllableValue } from 'ahooks';
+import DraggableModal from "../draggableModal";
 var DialogSelect = function DialogSelect(props) {
   var request = props.request,
     columnDefs = props.columnDefs,
@@ -99,7 +100,9 @@ var DialogSelect = function DialogSelect(props) {
       width: "calc(100% - 0px)",
       marginRight: !props.hideBtn ? 5 : 0
     })
-  })) : /*#__PURE__*/React.createElement(Select, _extends({}, rest, {
+  })) : /*#__PURE__*/React.createElement(Select, _extends({
+    maxTagCount: 'responsive'
+  }, rest, {
     value: state,
     style: _objectSpread({
       width: "calc(100% - 0px)",
@@ -111,7 +114,7 @@ var DialogSelect = function DialogSelect(props) {
       setTrue();
     },
     disabled: rest.disabled
-  }) : null), /*#__PURE__*/React.createElement(Modal, {
+  }) : null), /*#__PURE__*/React.createElement(DraggableModal, {
     width: 960,
     title: "\u9009\u62E9",
     style: {

package/dist/esm/formDesigner/FormDesigner.js

@@ -51,7 +51,7 @@ var FormDesigner = function FormDesigner(props) {
   }, []);
   useEffect(function () {
     loadSchema && loadSchema(engine);
-  }, []);
+  }, [name]);
   var getComponents = function getComponents() {
     var components = {};
     businessComponents.map(function (x) {