ns-base-module 1.1.71 → 1.1.73

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);
+            }
           }
         });
       }
@@ -66,6 +86,9 @@ var CopyCol = function CopyCol(_ref) {
   };
   return /*#__PURE__*/React.createElement("span", {
     className: "copy-icon-wrap",
+    style: {
+      display: "block"
+    },
     onClick: function onClick() {
       return handleCopy();
     }

package/dist/Entry/components/Input.js

@@ -9,8 +9,8 @@ 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; }
 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); }
-import React, { useState, useEffect } from 'react';
-import { Input } from 'antd';
+import { Input } from "antd";
+import React, { useEffect, useState } from "react";
 var TextAreaWrapper = Input.TextArea;
 var SearchWrapper = Input.Search;
 var PasswordWrapper = Input.Password;
@@ -19,14 +19,17 @@ var InputWrapper = function InputWrapper(props) {
   return /*#__PURE__*/React.createElement(Input, _extends({
     allowClear: true
   }, props, {
-    className: "disabled-input ".concat((_props$className = props === null || props === void 0 ? void 0 : props.className) !== null && _props$className !== void 0 ? _props$className : '')
+    className: "disabled-input ".concat((_props$className = props === null || props === void 0 ? void 0 : props.className) !== null && _props$className !== void 0 ? _props$className : "")
   }));
 };
 var TextArea = function TextArea(props) {
   return /*#__PURE__*/React.createElement(TextAreaWrapper, props);
 };
 var Search = function Search(props) {
-  return /*#__PURE__*/React.createElement(SearchWrapper, props);
+  var _props$className2;
+  return /*#__PURE__*/React.createElement(SearchWrapper, _extends({}, props, {
+    className: "".concat((_props$className2 = props === null || props === void 0 ? void 0 : props.className) !== null && _props$className2 !== void 0 ? _props$className2 : "", " entry-form-border ")
+  }));
 };
 var Password = function Password(props) {
   return /*#__PURE__*/React.createElement(PasswordWrapper, props);
@@ -83,4 +86,4 @@ InputWrapper.Password = Password;
 InputWrapper.InputBlur = InputBlur;
 InputWrapper.TextAreaBlur = TextAreaBlur;
 export default InputWrapper;
-export { TextArea, Search, Password, InputBlur };
+export { InputBlur, Password, Search, TextArea };

package/dist/Entry/components/index.scss

@@ -95,3 +95,89 @@
     }
   }
 }
+
+// 2.0UI样式覆盖
+.ant-input-affix-wrapper:focus,
+.ant-input-affix-wrapper-focused {
+  // border-bottom-color: fade(var(--primary-color), 100%);
+  border-bottom-color: color-mix(
+    in srgb,
+    var(--form-border-color) 100%,
+    transparent
+  ) !important;
+  border-radius: 0 !important;
+  // box-shadow: 0 2px 0 fade(var(--form-border-color), 100%);
+  box-shadow: 0 2px 0
+    color-mix(in srgb, var(--form-border-color) 100%, transparent) !important;
+}
+.ant-select-focused:not(.ant-select-disabled).ant-select:not(
+    .ant-select-customize-input
+  )
+  .ant-select-selector {
+  // border-bottom-color: fade(var(--form-border-color), 100%);
+  border-bottom-color: color-mix(
+    in srgb,
+    var(--form-border-color) 100%,
+    transparent
+  ) !important;
+  border-radius: 0 !important;
+  // box-shadow: 0 2px 0 fade(var(--form-border-color), 100%);
+  box-shadow: 0 2px 0
+    color-mix(in srgb, var(--form-border-color) 100%, transparent) !important;
+}
+
+.entry-form-border {
+  border-color: var(--form-border-color);
+  border-top: 0;
+  border-right: 0;
+  border-bottom: 1px solid var(--form-border-color);
+  border-left: 0;
+  border-radius: 0;
+  &.ant-input-affix-wrapper-disabled {
+    &:hover {
+      border-bottom-color: transparent;
+      box-shadow: none;
+    }
+  }
+  &.ant-input-number-group-wrapper {
+    .ant-input-number {
+      border: none;
+    }
+  }
+  &:focus {
+    // border-bottom-color: fade(var(--primary-color), 100%);
+    border-bottom-color: color-mix(
+      in srgb,
+      var(--form-border-color) 100%,
+      transparent
+    ) !important;
+    border-radius: 0 !important;
+    // box-shadow: 0 2px 0 fade(var(--form-border-color), 100%);
+    box-shadow: 0 2px 0
+      color-mix(in srgb, var(--form-border-color) 100%, transparent) !important;
+  }
+  &:hover {
+    // border-bottom-color: fade(var(--primary-color), 100%);
+    border-bottom-color: color-mix(
+      in srgb,
+      var(--form-border-color) 100%,
+      transparent
+    ) !important;
+    border-radius: 0 !important;
+    // box-shadow: 0 2px 0 fade(var(--form-border-color), 100%);
+    box-shadow: 0 2px 0
+      color-mix(in srgb, var(--form-border-color) 100%, transparent) !important;
+  }
+  &.ant-input-number-focused {
+    // border-bottom-color: fade(var(--primary-color), 100%);
+    border-bottom-color: color-mix(
+      in srgb,
+      var(--form-border-color) 100%,
+      transparent
+    ) !important;
+    border-radius: 0 !important;
+    // box-shadow: 0 2px 0 fade(var(--form-border-color), 100%);
+    box-shadow: 0 2px 0
+      color-mix(in srgb, var(--form-border-color) 100%, transparent) !important;
+  }
+}

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,9 @@ var Filter = function Filter(props) {
     setSearchval = _useState6[1];
   var searchValue = useRef("");
   var searchEmnuValue = useRef([]); // 枚举搜索
-
+  var srolRef = useRef(null);
+  var orderTypeRef = useRef("");
+  var orderKeyRef = useRef("");
   var page = useRef({
     pageNum: 1,
     pageSize: 40,
@@ -92,8 +97,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:
@@ -137,17 +142,44 @@ var Filter = function Filter(props) {
               pageSize: page.current.pageSize,
               distinctField: [dataIndex],
               variablePara: variablePara,
-              orderKey: orderKey,
-              orderType: orderType
+              orderKey: orderKeyRef.current || orderKey,
+              orderType: orderTypeRef.current || 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) {
@@ -172,9 +204,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();
         }
@@ -186,23 +216,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();
@@ -329,7 +362,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));
@@ -366,10 +403,16 @@ var Filter = function Filter(props) {
   };
   var handleSort = function handleSort(key) {
     if (checkSort === "asc" && key === "asc" || checkSort === "desc" && key === "desc") {
+      orderTypeRef.current = "";
+      orderKeyRef.current = "";
       onSort === null || onSort === void 0 || onSort("");
+      getDates();
       return;
     }
     onSort === null || onSort === void 0 || onSort(key);
+    orderKeyRef.current = dataIndex;
+    orderTypeRef.current = key;
+    getDates();
   };
   var selectSearch = function selectSearch(e) {
     setSelectValue(e);
@@ -377,17 +420,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() {
@@ -410,14 +449,6 @@ var Filter = function Filter(props) {
     allowClear: true,
     onSearch: onSearch,
     onPaste: handlePaste
-    // placeholder={
-    //   (dictItems && dictItems.length) || !(menuCode && formTemplateCode)
-    //     ? initLang({
-    //         id: "button.rest.filterTip",
-    //         defaultValue: "只能筛选当前页",
-    //       })
-    //     : ""
-    // }
   }), /*#__PURE__*/React.createElement(React.Fragment, null, !!searchList.length && /*#__PURE__*/React.createElement(Checkbox, {
     checked: allChecked,
     indeterminate: checked.length > 0 && checked.length < list.length,
@@ -430,26 +461,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

@@ -24,11 +24,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  */
 import { Popover } from "antd";
 import React, { useMemo, useState } from "react";
-import { CaretDownOutlined } from "@ant-design/icons";
 import { get, isEmpty } from "lodash";
+import IconCreate from "../Icon";
 import Filter from "./Filter";
-// import { filterContext } from '@/my-context';
-
 var content = function content(_ref) {
   var list = _ref.list,
     onSort = _ref.onSort,
@@ -90,19 +88,26 @@ var Index = function Index(_ref2) {
   // 活动的icon显示
   var visibilityStyle = useMemo(function () {
     var _value = get(props === null || props === void 0 ? void 0 : props.filterSearch, "".concat(dataIndex, ".value"), "");
-    if (!_value) return null;
     if (!dataIndex) return null;
+    if (!_value) {
+      if (isEmpty(filterValue)) return null;
+      if (!filterValue[dataIndex] || isEmpty(list)) return null;
+      if (list.length === filterValue[dataIndex].length) return null;
+    }
     if (orderKey !== null && orderKey !== void 0 && orderKey.includes(dataIndex)) return {
-      visibility: "visible"
+      visibility: "visible",
+      display: "block",
+      color: "#06B50F"
     };
     if (searchFlag) return {
-      visibility: "visible"
+      visibility: "visible",
+      display: "block",
+      color: "#06B50F"
     };
-    if (isEmpty(filterValue)) return null;
-    if (!filterValue[dataIndex] || isEmpty(list)) return null;
-    if (list.length === filterValue[dataIndex].length) return null;
     return {
-      visibility: "visible"
+      visibility: "visible",
+      display: "block",
+      color: "#06B50F"
     };
   }, [filterValue, list, dataIndex, orderKey, searchFlag, props.filterSearch]);
   var onFilterSearchValue = function onFilterSearchValue(value) {
@@ -126,11 +131,12 @@ var Index = function Index(_ref2) {
       dataSource: dataSource,
       open: open
     }, props))
-  }, /*#__PURE__*/React.createElement(CaretDownOutlined, {
+  }, /*#__PURE__*/React.createElement(IconCreate, {
     className: "proTableFilter",
+    type: "icon-ns-biaodan-shaixuan",
     style: _objectSpread({
       marginLeft: 4,
-      color: "#888"
+      color: "var(--header-text-color, #888)"
     }, visibilityStyle)
   }));
 };