ns-base-module 2.0.5 → 2.0.7

package/dist/CopyCol/index.js

@@ -1,21 +1,41 @@
+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 { CopyOutlined } from "@ant-design/icons";
 import { message } from "antd";
 import { get } from "lodash";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { initLang } from "../utils/language";
 var CopyCol = function CopyCol(_ref) {
   var dataSource = _ref.dataSource,
     dataIndex = _ref.dataIndex,
     list = _ref.list;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    dataSource_ = _useState2[0],
+    setDataSource_ = _useState2[1];
   // 复制
+
+  useEffect(function () {
+    if (dataSource) {
+      setDataSource_(dataSource);
+    }
+  }, [JSON.stringify(dataSource)]);
   var handleCopy = function handleCopy() {
     try {
       var str = "";
-      if (dataSource) {
-        dataSource === null || dataSource === void 0 || dataSource.forEach(function (item) {
-          var val = get(item, dataIndex, "");
-          if (val && (typeof val === "string" || typeof val === "number")) {
-            str = str ? "".concat(str, "\r\n").concat(val) : "".concat(val);
+      if (dataSource_) {
+        dataSource_ === null || dataSource_ === void 0 || dataSource_.forEach(function (item) {
+          if (typeof item === "string" || typeof item === "number") {
+            str = str ? "".concat(str, "\r\n").concat(item) : "".concat(item);
+          } else {
+            var val = get(item, dataIndex, "");
+            if (val && (typeof val === "string" || typeof val === "number")) {
+              str = str ? "".concat(str, "\r\n").concat(val) : "".concat(val);
+            }
           }
         });
       }
@@ -31,17 +51,44 @@ var CopyCol = function CopyCol(_ref) {
         message.warn("该类型不支持复制");
         return;
       }
-      navigator.clipboard.writeText(str).then(function () {
-        message.info("复制成功");
-      }).catch(function (err) {
-        message.error("复制失败");
-      });
+      if (navigator.clipboard) {
+        navigator.clipboard.writeText(str).then(function () {
+          message.info("复制成功");
+        }).catch(function (err) {
+          message.error("复制失败");
+        });
+      } else {
+        fallbackCopyText(str);
+      }
     } catch (error) {
       message.error("复制失败");
     }
   };
+  var fallbackCopyText = function fallbackCopyText(text) {
+    var textArea = document.createElement("textarea");
+    textArea.value = text;
+    // 隐藏文本域（避免影响页面）
+    textArea.style.position = "fixed";
+    textArea.style.top = "-999px";
+    textArea.style.left = "-999px";
+    document.body.appendChild(textArea);
+    textArea.select(); // 选中内容
+    try {
+      var success = document.execCommand("copy");
+      if (success) {
+        message.info("复制成功");
+      }
+    } catch (err) {
+      message.error("复制失败");
+    } finally {
+      document.body.removeChild(textArea); // 清理 DOM
+    }
+  };
   return /*#__PURE__*/React.createElement("span", {
     className: "copy-icon-wrap",
+    style: {
+      display: "block"
+    },
     onClick: function onClick() {
       return handleCopy();
     }

package/dist/FilterPopover/Filter.js

@@ -21,10 +21,12 @@ import { ArrowDownOutlined, ArrowUpOutlined } from "@ant-design/icons";
 import { Button, Divider } from "antd";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import InfiniteScroll from "react-infinite-scroll-component";
+// import InfiniteScroll from "../sollr/index";
+
 import Checkbox from "../Entry/components/Checkbox";
 import Input from "../Entry/components/Input";
 import CopyCol from "../CopyCol";
-import { cloneDeep, find, flattenDeep, get } from "lodash";
+import { cloneDeep, find, flattenDeep, get, isFunction } from "lodash";
 import "../../style/components/FilterPopover.scss";
 import { initLang } from "../utils/language";
 // import request from "../utils/request";
@@ -52,6 +54,7 @@ var Filter = function Filter(props) {
     menuCode = props.menuCode,
     argument = props.argument,
     request = props.request,
+    newRequest = props.newRequest,
     open = props.open,
     variablePara = props.variablePara,
     exportAllParam = props.exportAllParam;
@@ -71,7 +74,7 @@ var Filter = function Filter(props) {
     setSearchval = _useState6[1];
   var searchValue = useRef("");
   var searchEmnuValue = useRef([]); // 枚举搜索
-
+  var srolRef = useRef(null);
   var page = useRef({
     pageNum: 1,
     pageSize: 40,
@@ -92,8 +95,8 @@ var Filter = function Filter(props) {
   // 获取列表
   var getDates = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _searchEmnuValue$curr, _res$data, _res$data2;
-      var _list, checkValues, _label, _searchArgument, params, res, datas, arr, _datas;
+      var _searchEmnuValue$curr;
+      var _list, checkValues, _label, _searchArgument, params, res, datas, _res, _res2, dataRow, arr, _datas;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -136,16 +139,45 @@ var Filter = function Filter(props) {
               pageNum: page.current.pageNum,
               pageSize: page.current.pageSize,
               distinctField: [dataIndex],
-              variablePara: variablePara
+              variablePara: variablePara,
+              orderKey: orderKey,
+              orderType: orderType
             };
-            _context.next = 11;
+            res = {};
+            datas = [];
+            if (!isFunction(request)) {
+              _context.next = 18;
+              break;
+            }
+            _context.next = 14;
             return request === null || request === void 0 ? void 0 : request("/querier/menu", {
               method: "POST",
               data: params
             });
-          case 11:
+          case 14:
             res = _context.sent;
             datas = get(res, "data.rows", []) || [];
+            setTotal((_res = res) === null || _res === void 0 || (_res = _res.data) === null || _res === void 0 ? void 0 : _res.total);
+            page.current.total = (_res2 = res) === null || _res2 === void 0 || (_res2 = _res2.data) === null || _res2 === void 0 ? void 0 : _res2.total;
+          case 18:
+            if (!isFunction(newRequest)) {
+              _context.next = 25;
+              break;
+            }
+            _context.next = 21;
+            return newRequest === null || newRequest === void 0 ? void 0 : newRequest({
+              url: "/api/querier/menu",
+              method: "POST",
+              data: _objectSpread(_objectSpread(_objectSpread({}, props === null || props === void 0 ? void 0 : props.requestOrderParam), params), {}, {
+                withFieldConfigs: false
+              })
+            });
+          case 21:
+            dataRow = _context.sent;
+            datas = get(dataRow, "rows", []) || [];
+            setTotal(dataRow === null || dataRow === void 0 ? void 0 : dataRow.total);
+            page.current.total = dataRow === null || dataRow === void 0 ? void 0 : dataRow.total;
+          case 25:
             arr = [];
             if (dataIndex) {
               datas.map(function (d) {
@@ -170,9 +202,7 @@ var Filter = function Filter(props) {
                 setChecked([].concat(_toConsumableArray(checked), arr));
               }
             }
-            setTotal(res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.total);
-            page.current.total = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total;
-          case 21:
+          case 31:
           case "end":
             return _context.stop();
         }
@@ -184,23 +214,26 @@ var Filter = function Filter(props) {
   }();
   var updateOpen = useRef(false);
   useEffect(function () {
-    if (updateOpen.current === open) return;
-    updateOpen.current = open; // 防止当前筛选被更新
+    console.log("updateOpen.currentupdateOpen.current:", open, argument, updateOpen.current);
+
+    // if (updateOpen.current === open) return;
+    // updateOpen.current = open; // 防止当前筛选被更新
 
     if (open) {
       // 半选状态 - 不刷新列表
-      if (!(checked.length > 0 && checked.length < list.length)) {
-        page.current.pageNum = 1;
-        page.current.total = 20;
-        searchValue.current = "";
-        setSearchval("");
-        setList([]);
-        setChecked([]);
-        getDates();
-      }
+      // if (!(checked.length > 0 && checked.length < list.length)) {
+      page.current.pageNum = 1;
+      page.current.total = 20;
+      searchValue.current = "";
+      setSearchval("");
+      setList([]);
+      setChecked([]);
+      getDates();
+      // }
     }
   }, [dictItems, JSON.stringify(argument), open]);
   var loadMoreData = function loadMoreData() {
+    console.log("jiahzihl");
     if (page.current.pageNum * page.current.pageSize >= page.current.total) return;
     page.current.pageNum = page.current.pageNum + 1;
     getDates();
@@ -327,7 +360,11 @@ var Filter = function Filter(props) {
   var searchListCheckBox = function searchListCheckBox() {
     return searchList.map(function (item, index) {
       return /*#__PURE__*/React.createElement("div", {
-        key: "".concat(item)
+        key: "".concat(item),
+        style: {
+          display: "block",
+          width: "100%"
+        }
       }, /*#__PURE__*/React.createElement(Checkbox, {
         value: item
       }, item));
@@ -375,17 +412,13 @@ var Filter = function Filter(props) {
   var handleSelectSearch = function handleSelectSearch() {
     onSearch(selectValue);
   };
-
-  // const hasEntryItem = useMemo(() => {
-  //   return entryType && _TYPES.includes(entryType);
-  // }, [entryType]);
-
+  console.log("list.lengthlist.length:", list.length, dataIndex + "-" + "scrollableDiv");
   return /*#__PURE__*/React.createElement("div", {
     className: "filter-wrapper-body"
   }, sort && /*#__PURE__*/React.createElement("div", {
     className: "sort"
   }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(CopyCol, {
-    dataSource: dataSource,
+    dataSource: searchList,
     dataIndex: dataIndex
   })), /*#__PURE__*/React.createElement("span", {
     onClick: function onClick() {
@@ -420,26 +453,28 @@ var Filter = function Filter(props) {
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "filter-group",
+    ref: srolRef,
     id: "".concat(dataIndex, "-scrollableDiv")
-  }, /*#__PURE__*/React.createElement(InfiniteScroll, {
+  }, srolRef.current && /*#__PURE__*/React.createElement(InfiniteScroll, {
     dataLength: list.length,
     next: loadMoreData,
     hasMore: page.current.pageNum * page.current.pageSize < total,
     loader: /*#__PURE__*/React.createElement(Divider, {
       plain: true,
       style: {
-        margin: 10
+        margin: "10px 0"
       }
     }),
     endMessage: /*#__PURE__*/React.createElement(Divider, {
       plain: true,
       style: {
-        margin: 10
+        margin: "10px 0"
       }
     })
     // endMessage={<Divider plain>无更多数据</Divider>}
+    // scrollableTarget={`${dataIndex}-scrollableDiv`}
     ,
-    scrollableTarget: "".concat(dataIndex, "-scrollableDiv")
+    scrollableTarget: srolRef.current
   }, /*#__PURE__*/React.createElement(CheckboxGroup, {
     value: checked,
     onChange: onChange

package/dist/FilterPopover/index.js

@@ -87,6 +87,7 @@ var Index = function Index(_ref2) {
 
   // 活动的icon显示
   var visibilityStyle = useMemo(function () {
+    console.log("filterValuefilterValue:", filterValue);
     var _value = get(props === null || props === void 0 ? void 0 : props.filterSearch, "".concat(dataIndex, ".value"), "");
     if (!dataIndex) return null;
     if (!_value) {
@@ -96,14 +97,17 @@ var Index = function Index(_ref2) {
     }
     if (orderKey !== null && orderKey !== void 0 && orderKey.includes(dataIndex)) return {
       visibility: "visible",
+      display: "block",
       color: "#06B50F"
     };
     if (searchFlag) return {
       visibility: "visible",
+      display: "block",
       color: "#06B50F"
     };
     return {
       visibility: "visible",
+      display: "block",
       color: "#06B50F"
     };
   }, [filterValue, list, dataIndex, orderKey, searchFlag, props.filterSearch]);

package/dist/TableHeaderConfigPopover/Dustbin.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["onChange", "showArrows"];
+var _excluded = ["onChange", "showArrows", "isRoot"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -14,7 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { HolderOutlined, VerticalAlignBottomOutlined, VerticalAlignMiddleOutlined, VerticalAlignTopOutlined } from "@ant-design/icons";
-import { Slider, Tooltip } from "antd";
+import { Slider, Switch, Tooltip } from "antd";
 import React from "react";
 import { useDrag, useDrop } from "react-dnd";
 import "../../style/components/TableHeaderConfigPopover.scss";
@@ -40,6 +40,7 @@ var Box = function Box(_ref) {
 var Dustbin = function Dustbin(_ref2) {
   var _onChange = _ref2.onChange,
     showArrows = _ref2.showArrows,
+    isRoot = _ref2.isRoot,
     props = _objectWithoutProperties(_ref2, _excluded);
   var item = props.item;
   var _useDrop = useDrop({
@@ -83,7 +84,7 @@ var Dustbin = function Dustbin(_ref2) {
       flex: 1
     },
     onChange: function onChange(e) {
-      return _onChange(e, item);
+      return _onChange(e, item, "width");
     },
     value: typeof item.width === "number" ? item.width : 0
   }), /*#__PURE__*/React.createElement("span", {
@@ -103,6 +104,14 @@ var Dustbin = function Dustbin(_ref2) {
     onClick: function onClick(e) {
       return props.onFixed(item.dataIndex, "right", e);
     }
-  })));
+  })), !!isRoot && /*#__PURE__*/React.createElement(Switch, {
+    checkedChildren: "\u6298\u53E0",
+    unCheckedChildren: "\u5C55\u5F00",
+    size: "small",
+    checked: item.frontEndFold === true || item.frontEndFold === undefined && ["FIRST", "LAST", "NONEDATA"].includes(item.hierarchyState),
+    onChange: function onChange(e) {
+      return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e, item, "frontEndFold");
+    }
+  }));
 };
 export default Dustbin;