gxxc-ui 1.0.5 → 1.0.7

package/dist/TableUI/material/Setting/index.js

@@ -12,13 +12,14 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { Table, Checkbox } from 'antd';
 import { IconUI, ButtonUI } from "../../..";
 import { DndContext } from '@dnd-kit/core';
@@ -36,9 +37,49 @@ export var Setting = function Setting(props) {
     _useState2 = _slicedToArray(_useState, 2),
     dataSource = _useState2[0],
     setDataSource = _useState2[1];
-  useEffect(function () {
-    setDataSource(tableHeader);
-  }, [tableHeader]);
+  // useEffect(() => {
+  // }, [tableHeader]);
+  var _setOpenModifyHeader = function _setOpenModifyHeader(isOpen) {
+    setDataSource(JSON.parse(JSON.stringify(tableHeader)));
+    setOpenModifyHeader(isOpen);
+  };
+
+  // 确认
+  var handleGetSortedData = function handleGetSortedData() {
+    var dataSourceMap = {};
+    dataSource === null || dataSource === void 0 || dataSource.map(function (item, i) {
+      item.sort = i + 1;
+      dataSourceMap[item.key] = item;
+    });
+    var tableHeaderMap = {};
+    var _iterator = _createForOfIteratorHelper(tableHeader),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        tableHeaderMap[item.key] = item;
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    for (var _key in dataSourceMap) {
+      var item1 = dataSourceMap[_key];
+      var item2 = tableHeaderMap[_key];
+      item2.disable = item1.disable;
+      item2.key = item1.key;
+      item2.name = item1.name;
+      item2.selected = item1.selected;
+      item2.sort = item1.sort;
+    }
+    getTableheader(tableHeader);
+    _setOpenModifyHeader(false);
+  };
+  // 关闭
+  var onClose = function onClose() {
+    _setOpenModifyHeader(false);
+  };
   var Row = function Row(_ref) {
     var _React$Children;
     var children = _ref.children,
@@ -71,23 +112,21 @@ export var Setting = function Setting(props) {
     }, attributes), (_React$Children = React.Children) === null || _React$Children === void 0 ? void 0 : _React$Children.map(children, function (child) {
       if (child.key === 'sort') {
         return /*#__PURE__*/React.cloneElement(child, {
-          children: /*#__PURE__*/React.createElement(IconUI, _extends({
+          children: /*#__PURE__*/React.createElement("div", {
+            ref: setActivatorNodeRef
+          }, /*#__PURE__*/React.createElement(IconUI, _extends({
             name: "HamburgerButton",
-            ref: setActivatorNodeRef,
             size: 16,
             style: {
               touchAction: 'none',
               cursor: 'move'
             }
-          }, listeners))
+          }, listeners)))
         });
       }
       return child;
     }));
   };
-  var onClose = function onClose() {
-    setOpenModifyHeader(false);
-  };
   var columns = [{
     key: 'sort',
     width: 40,
@@ -119,13 +158,13 @@ export var Setting = function Setting(props) {
     title: '表名',
     dataIndex: 'name'
   }];
-  // 移动表头
+  // 移动item UI移动后交换数据源
   var onDragEnd = function onDragEnd(event) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
       var arr = [active === null || active === void 0 ? void 0 : active.id, over === null || over === void 0 ? void 0 : over.id];
-      var isMove = tableHeader === null || tableHeader === void 0 ? void 0 : tableHeader.filter(function (item) {
+      var isMove = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
         return item.disable;
       }).map(function (item) {
         return arr.includes(item.key);
@@ -146,15 +185,6 @@ export var Setting = function Setting(props) {
       }
     }
   };
-  // 获取新的表格头部
-  var handleGetSortedData = function handleGetSortedData() {
-    // eslint-disable-next-line array-callback-return
-    dataSource === null || dataSource === void 0 || dataSource.map(function (item, i) {
-      item.sort = i + 1;
-    });
-    getTableheader(dataSource);
-    onClose();
-  };
   return /*#__PURE__*/React.createElement("div", {
     className: "sic-tableui-setting",
     onClick: function onClick(e) {
@@ -164,7 +194,7 @@ export var Setting = function Setting(props) {
     className: "sic-tableui-setting-icon",
     onClick: function onClick(e) {
       e.stopPropagation();
-      setOpenModifyHeader(!openModifyHeader);
+      _setOpenModifyHeader(!openModifyHeader);
     }
   }, /*#__PURE__*/React.createElement(IconUI, {
     name: "Setting",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxxc-ui",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",