@yilianjituan/yilian_dgerm 0.0.1-alpha.38 → 0.0.1-alpha.40

package/dist/components/DropDownSelect/index.interface.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 export interface OptionItem {
     /**
@@ -11,7 +12,7 @@ export interface OptionItem {
     /**
     * @description list展示项
     */
-    lable: (item: any) => string;
+    lable: (item: any) => string | React.ReactNode;
 }
 export interface DropDownSelectProps extends SelectProps {
     /**
@@ -71,4 +72,8 @@ export interface DropDownSelectProps extends SelectProps {
     * @description 是否开启搜索查询
     */
     changeNoSearch?: boolean;
+    /**
+     * @description 是否初始化搜索
+     */
+    isInitSearch?: boolean;
 }

package/dist/components/DropDownSelect/index.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 = ["http", "url", "method", "handleSelect", "showValue", "customInput", "searchValue", "additionalParameters", "dynamicParameter", "beforeSearch", "filterOptionsCallback", "onChange", "changeNoSearch", "mode"];
+var _excluded = ["http", "url", "method", "handleSelect", "showValue", "customInput", "searchValue", "additionalParameters", "dynamicParameter", "beforeSearch", "filterOptionsCallback", "onChange", "changeNoSearch", "mode", "isInitSearch"];
 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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -45,6 +45,8 @@ var Index = function Index(props) {
     changeNoSearch = _props$changeNoSearch === void 0 ? true : _props$changeNoSearch,
     _props$mode = props.mode,
     mode = _props$mode === void 0 ? undefined : _props$mode,
+    _props$isInitSearch = props.isInitSearch,
+    isInitSearch = _props$isInitSearch === void 0 ? false : _props$isInitSearch,
     prop = _objectWithoutProperties(props, _excluded);
   var id = showValue.id,
     value = showValue.value,
@@ -60,8 +62,14 @@ var Index = function Index(props) {
   var totalPagesRef = useRef(1); //总页数
   var pageRef = useRef(1); //当前页
   var paramsRef = useRef(''); //查询参数·
+  var selectValueRef = useRef(''); //当前选中的值
   var storeListRef = useRef([]); //列表
   var selectRef = useRef({});
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isFetchedData = _useState6[0],
+    setIsFetchedData = _useState6[1]; // 是否需要获取数据
+  var _additionalParameters = dynamicParameter && beforeSearch ? beforeSearch(dynamicParameter) : additionalParameters;
 
   /**
    * 查询接口
@@ -89,7 +97,7 @@ var Index = function Index(props) {
   */
   var getStoreList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(type) {
-      var _additionalParameters, data, target, options;
+      var data, target, options;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -100,20 +108,20 @@ var Index = function Index(props) {
             return _context2.abrupt("return");
           case 2:
             setSelectState(true);
-            _additionalParameters = dynamicParameter && beforeSearch ? beforeSearch(dynamicParameter) : additionalParameters;
-            _context2.next = 6;
-            return inquireDiseases(_objectSpread(_defineProperty(_defineProperty(_defineProperty({}, searchValue, paramsRef.current), "pageNo", pageRef.current), "pageSize", 10), _additionalParameters ? _additionalParameters : {}));
-          case 6:
+            _context2.next = 5;
+            return inquireDiseases(_objectSpread(_defineProperty(_defineProperty(_defineProperty({}, searchValue, paramsRef.current), "pageNo", pageRef.current), "pageSize", 10), _additionalParameters || {}));
+          case 5:
             data = _context2.sent;
             if (data.code === "OK") {
               target = data.result;
               totalPagesRef.current = target.totalPages;
-              options = filterOptionsCallback ? filterOptionsCallback(target.content) : target.content || target;
+              options = filterOptionsCallback ? filterOptionsCallback(target.content || target) : target.content || target;
               storeListRef.current = type === 'scoll' ? [].concat(_toConsumableArray(storeListRef.current), _toConsumableArray(options)) : options;
               setStoreList(storeListRef.current || []);
+              setIsFetchedData(false); // 设置不需要获取数据
               setSelectState(false);
             }
-          case 8:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -124,8 +132,14 @@ var Index = function Index(props) {
     };
   }();
   useEffect(function () {
-    getStoreList();
-  }, []);
+    if (isInitSearch) {
+      getStoreList();
+    }
+  }, [isInitSearch]);
+  useEffect(function () {
+    setIsFetchedData(true); // 设置需要获取数据
+  }, [_additionalParameters]);
+
   // 搜索
   var onFilterChange = _.debounce(function (e) {
     if (typeof e === 'string') {
@@ -134,15 +148,17 @@ var Index = function Index(props) {
       getStoreList();
     }
   }, 300);
+
   // 选择
   var onChangeSelect = function onChangeSelect(value, option) {
     var _selectRef$current;
     if (changeNoSearch && typeof value === 'string') {
-      paramsRef.current = value;
+      selectValueRef.current = value;
     }
     mode === undefined && ((_selectRef$current = selectRef.current) === null || _selectRef$current === void 0 ? void 0 : _selectRef$current.blur());
     handleSelect === null || handleSelect === void 0 || handleSelect(value, option);
   };
+
   // 下拉加载
   var companyScroll = function companyScroll(e) {
     var target = e.target;
@@ -150,22 +166,34 @@ var Index = function Index(props) {
       scrollHeight = target.scrollHeight,
       scrollTop = target.scrollTop;
     if (Math.ceil(scrollTop + offsetHeight) === scrollHeight) {
-      pageRef.current = pageRef.current + 1;
-      if (pageRef.current <= totalPagesRef.current) {
-        getStoreList('scoll');
+      if (pageRef.current < totalPagesRef.current) {
+        // 检查当前页是否小于总页数
+        pageRef.current += 1; // 增加当前页码
+        getStoreList('scoll'); // 获取下一页数据
       }
     }
   };
+
   // 失焦
   var onBlurSelect = function onBlurSelect() {
-    return !!paramsRef.current && handleSelect && handleSelect(paramsRef.current);
+    paramsRef.current && setIsFetchedData(true); // 如果有搜索内容，则需要获取数据
+    if (!!selectValueRef.current) {
+      handleSelect === null || handleSelect === void 0 || handleSelect(selectValueRef.current);
+    }
   };
+
+  // 聚焦
   var onFocusSelect = function onFocusSelect() {
-    paramsRef.current = '';
-    pageRef.current = 1;
-    setStoreList([]); // 获取焦点时重置列表，否则会偶现没有滚动条
-    getStoreList();
+    if (isFetchedData) {
+      // 需要获取数据
+      paramsRef.current = '';
+      pageRef.current = 1; // 重置当前页码
+      setStoreList([]); // 获取焦点时重置列表，否则会偶现没有滚动条
+      getStoreList();
+    }
   };
+
+  // 下拉框渲染
   var renderCom = function renderCom() {
     var dropdownRender = function dropdownRender(menu) {
       return /*#__PURE__*/React.createElement("div", null, menu, /*#__PURE__*/React.createElement("div", {
@@ -210,7 +238,8 @@ var Index = function Index(props) {
       }
     });
     return /*#__PURE__*/React.createElement(Select, _extends({}, commonProps, {
-      ref: selectRef
+      ref: selectRef,
+      filterOption: false
     }), options);
   };
   return renderCom();

package/dist/components/PageTemplate/index.js

@@ -35,6 +35,7 @@ import { exportCompile } from "../../utils/common";
 import React from 'react';
 import { DropDownSelect } from "../..";
 import dayjs from 'dayjs';
+import { mergedColumns, ResizableTitle } from "./resizable";
 var FormItem = Form.Item;
 var RangePicker = DatePicker.RangePicker;
 var PageTemplate = function PageTemplate(props, ref) {
@@ -91,6 +92,7 @@ var PageTemplate = function PageTemplate(props, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     additionalExport = _useState16[0],
     setAdditionalExport = _useState16[1]; // 额外的按钮
+  var tableRef = useRef(null); // 引用 Table 外层容器
 
   useImperativeHandle(ref, function () {
     return {
@@ -392,7 +394,8 @@ var PageTemplate = function PageTemplate(props, ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "page-template__filter"
   }, renderFilter()), /*#__PURE__*/React.createElement("div", {
-    className: "page-template__content"
+    className: "page-template__content",
+    ref: tableRef
   }, /*#__PURE__*/React.createElement("div", {
     className: "page-template__toolbar"
   }, toolbar), /*#__PURE__*/React.createElement(Table, _extends({
@@ -420,7 +423,14 @@ var PageTemplate = function PageTemplate(props, ref) {
     bordered: true,
     dataSource: dataSource
   }, tableProps, {
-    columns: columns
+    components: {
+      header: {
+        cell: ResizableTitle
+      }
+    },
+    columns: mergedColumns(columns, tableRef, function (_columns) {
+      return setColumns(_columns);
+    })
   }))), isSpinLoading && /*#__PURE__*/React.createElement(ExportExcels, exportProps));
 };
 export default /*#__PURE__*/forwardRef(PageTemplate);

package/dist/components/PageTemplate/resizable/index.d.ts

@@ -0,0 +1,25 @@
+import { TableProps, type TableColumnsType } from 'antd';
+import React, { RefObject } from 'react';
+import './index.scss';
+interface DataType {
+    [key: string]: any;
+}
+interface TitlePropsType {
+    width: number;
+    onResize: (e: React.SyntheticEvent<Element>, data: any) => void;
+    isEnd?: boolean;
+}
+/**
+* 设置表格列宽的初始化值
+* ^判断初始columns中设置的width是否为number
+* ^使用ref获取所有的列宽，存储在widthsList，如果width不为number，则取获取的dom宽或者默认为150
+*
+* @param columns - 初始化的columns.
+* @param tableRef - table外层的div的ref，用于获取table的dom的列宽.
+* @param newColumnsVoid - callback，传出新的columns.
+* @return 给columns里的增加onResize属性，用于在Resizable进行控制.
+*/
+declare const mergedColumns: (columns: TableColumnsType<DataType>, tableRef: RefObject<HTMLDivElement>, newColumnsVoid: (columns: any) => void) => (import("antd").TableColumnGroupType<DataType> | import("antd").TableColumnType<DataType>)[];
+declare const ResizableTitle: React.FC<Readonly<React.HTMLAttributes<HTMLTableCellElement> & TitlePropsType>>;
+declare const CustomTable: React.FC<TableProps<any>>;
+export { mergedColumns, ResizableTitle, CustomTable };

package/dist/components/PageTemplate/resizable/index.js

@@ -0,0 +1,152 @@
+var _excluded = ["onResize", "width", "isEnd"],
+  _excluded2 = ["components", "columns", "dataSource"];
+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); }
+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; }
+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); }
+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 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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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); }
+import { Table } from 'antd';
+import React, { useEffect, useRef } from 'react';
+import { Resizable } from 'react-resizable';
+import "./index.scss";
+/**
+ * 处理单元格大小
+ * 
+ * @param index 当前列的索引，用于标识是哪一列的宽度发生了变化
+ * @param columns 表格的列配置数组，包含了所有列的配置信息
+ * @param newColumnsVoid 一个回调函数，用于应用新的列配置
+ */
+var handleResize = function handleResize(index, columns, newColumnsVoid) {
+  return function (_, _ref) {
+    var size = _ref.size;
+    try {
+      // 检查索引是否超出范围
+      if (index < 0 || index >= columns.length) {
+        console.error('Index out of bounds:', index);
+        return;
+      }
+
+      // 更新指定列的宽度
+      var newColumns = columns.map(function (column, i) {
+        return i === index ? _objectSpread(_objectSpread({}, column), {}, {
+          width: size.width
+        }) : column;
+      });
+
+      // 返回新的列配置
+      newColumnsVoid(newColumns);
+    } catch (error) {
+      console.error('Error in handleResize:', error);
+    }
+  };
+};
+/**
+* 设置表格列宽的初始化值
+* ^判断初始columns中设置的width是否为number
+* ^使用ref获取所有的列宽，存储在widthsList，如果width不为number，则取获取的dom宽或者默认为150
+*
+* @param columns - 初始化的columns.
+* @param tableRef - table外层的div的ref，用于获取table的dom的列宽.
+* @param newColumnsVoid - callback，传出新的columns.
+* @return 给columns里的增加onResize属性，用于在Resizable进行控制.
+*/
+var mergedColumns = function mergedColumns(columns, tableRef, newColumnsVoid) {
+  if (!columns || columns.length === 0) {
+    return []; // 处理columns为空或长度为0的情况
+  }
+  var widthsList = {};
+  var headerCells = null; // 缓存headerCells以减少DOM查询
+
+  if (tableRef.current) {
+    try {
+      if (!headerCells) {
+        headerCells = tableRef.current.querySelectorAll('th'); // 缓存headerCells以减少DOM查询
+      }
+      headerCells.forEach(function (cell, index) {
+        widthsList[index] = cell.clientWidth;
+      });
+    } catch (error) {
+      console.log('Error while fetching header cells:', error); // 异常处理
+    }
+  }
+  return columns === null || columns === void 0 ? void 0 : columns.map(function (col, index) {
+    return _objectSpread(_objectSpread({}, col), {}, {
+      onHeaderCell: function onHeaderCell(column) {
+        return {
+          width: typeof column.width === 'number' ? column.width : widthsList[index] || 150,
+          // 设置默认宽度
+          isEnd: index === columns.length - 1,
+          // 判断是否是最后一个
+          onResize: handleResize(index, columns, newColumnsVoid)
+        };
+      }
+    });
+  });
+};
+var ResizableTitle = function ResizableTitle(props) {
+  var _onResize = props.onResize,
+    width = props.width,
+    isEnd = props.isEnd,
+    restProps = _objectWithoutProperties(props, _excluded);
+  return /*#__PURE__*/React.createElement(Resizable, {
+    width: width,
+    height: 0,
+    handle: /*#__PURE__*/React.createElement("span", _extends({
+      className: "react-resizable-handle"
+    }, isEnd ? {
+      style: {
+        width: '5px',
+        insetInlineEnd: '0'
+      }
+    } : {}, {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    })),
+    onResize: function onResize(event, data) {
+      return _onResize === null || _onResize === void 0 ? void 0 : _onResize(event, data);
+    },
+    draggableOpts: {
+      enableUserSelectHack: false
+    }
+  }, /*#__PURE__*/React.createElement("th", restProps));
+};
+var CustomTable = function CustomTable(props) {
+  var components = props.components,
+    columns = props.columns,
+    dataSource = props.dataSource,
+    restProps = _objectWithoutProperties(props, _excluded2);
+  var tableRef = useRef(null); // 引用 Table 外层容器
+  var _React$useState = React.useState(columns),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    column = _React$useState2[0],
+    setColumn = _React$useState2[1];
+  useEffect(function () {
+    setColumn(columns);
+  }, [dataSource]);
+  var customComponents = _objectSpread({
+    header: _objectSpread({
+      cell: ResizableTitle
+    }, components === null || components === void 0 ? void 0 : components.header)
+  }, components);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: tableRef
+  }, /*#__PURE__*/React.createElement(Table, _extends({}, restProps, {
+    columns: mergedColumns(column, tableRef, function (_columns) {
+      return setColumn(_columns);
+    }),
+    components: customComponents,
+    dataSource: dataSource || []
+  })));
+};
+export { mergedColumns, ResizableTitle, CustomTable };

package/dist/components/PageTemplate/resizable/index.scss

@@ -0,0 +1,14 @@
+.react-resizable {
+  position: relative;
+  background-clip: padding-box;
+}
+
+.react-resizable-handle {
+  position: absolute;
+  inset-inline-end: -5px;
+  bottom: 0;
+  z-index: 1;
+  width: 10px;
+  height: 100%;
+  cursor: col-resize;
+}

package/dist/index.d.ts

@@ -19,4 +19,5 @@ export { default as SuperInput } from './components/SuperInput';
 export { default as TabsMode } from './components/TabsMode';
 export { default as VideoProgressModal } from './components/VideoProgressModal';
 export { default as YLModal } from './components/YLModal';
+export { mergedColumns, ResizableTitle, CustomTable } from './components/PageTemplate/resizable';
 export { default as TestBtn } from './business/TestBtn';

package/dist/index.js

@@ -20,6 +20,6 @@ export { default as SuperInput } from "./components/SuperInput";
 export { default as TabsMode } from "./components/TabsMode";
 export { default as VideoProgressModal } from "./components/VideoProgressModal";
 export { default as YLModal } from "./components/YLModal";
-
+export { mergedColumns, ResizableTitle, CustomTable } from "./components/PageTemplate/resizable"; // 用于单个table的列宽拖拽
 // 业务组件
 export { default as TestBtn } from "./business/TestBtn";

package/dist/react-app-env.d.ts

@@ -15,4 +15,5 @@ declare module "lodash/throttle";
 
 declare module "lodash/omit";
 declare module "qs";
-declare module "@hanyk/rc-viewer";
+declare module "@hanyk/rc-viewer";
+declare module "react-resizable";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "0.0.1-alpha.38",
+  "version": "0.0.1-alpha.40",
   "description": "A react library developed with dumi",
   "keywords": [
     "React",
@@ -59,7 +59,7 @@
     "@ant-design/icons": "^5.5.1",
     "@hanyk/rc-viewer": "^0.0.3",
     "ahooks": "^3.7.2",
-    "antd": "^5.18.0",
+    "antd": "^5.21.6",
     "axios": "^1.7.7",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.11",
@@ -69,7 +69,8 @@
     "lodash": "^4.17.20",
     "qs": "^6.9.7",
     "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
+    "react-dom": ">=16.9.0",
+    "react-resizable": "^3.0.5"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",