@yilianjituan/yilian_dgerm 1.0.5 → 1.0.7-alpha.1

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

@@ -1,76 +1,80 @@
 /// <reference types="react" />
-import { SelectProps } from "antd";
+import { SelectProps } from 'antd';
 export interface OptionItem {
     /**
      * @description  用于key
      */
     id: string;
     /**
-    * @description 获取或者回填的值结构
-    */
+     * @description 获取或者回填的值结构
+     */
     value: (item: any) => string;
     /**
-    * @description list展示项
-    */
+     * @description list展示项
+     */
     lable: (item: any) => string | React.ReactNode;
+    /**
+     * @description 选项的额外属性
+     */
+    optionProps?: (item: any) => any;
 }
 export interface DropDownSelectProps extends SelectProps {
     /**
-    * @description http请求
-    */
+     * @description http请求
+     */
     http: any;
     /**
-    * @description 需要查询的接口
-    */
+     * @description 需要查询的接口
+     */
     url: string;
     /**
-    * @description http方法
-    * @default get
-    */
+     * @description http方法
+     * @default get
+     */
     method?: string;
     /**
-    * @description 选择后的回调，参数是传入的value
-    */
+     * @description 选择后的回调，参数是传入的value
+     */
     handleSelect?: (value: string, option?: any) => void;
     /**
-    * @description 需要展示的和传出去的值
-    */
+     * @description 需要展示的和传出去的值
+     */
     showValue: OptionItem;
     /**
-    * @description 是否开启搜索查询
-    */
+     * @description 是否开启搜索查询
+     */
     customInput?: boolean;
     /**
-    * @description 输入搜索时的参数名
-    */
+     * @description 输入搜索时的参数名
+     */
     searchValue?: string;
     /**
-    * @description 选择模式
-    */
+     * @description 选择模式
+     */
     mode?: 'multiple' | 'tags' | undefined;
     /**
-    * @description 额外需要传入的字段
-    */
+     * @description 额外需要传入的字段
+     */
     additionalParameters?: any;
     /**
-    * @description 处理options的回调
-    */
+     * @description 处理options的回调
+     */
     filterOptionsCallback?: (opt: any) => void;
     /**
-    * @description 选择变化的回调
-    */
+     * @description 选择变化的回调
+     */
     onChange?: (value: any) => void;
     /**
-    * @description 动态参数，执行查询需要执行之前处理的参数
-    */
+     * @description 动态参数，执行查询需要执行之前处理的参数
+     */
     dynamicParameter?: any;
     /**
      * @description 动态参数，处理动态参数的方法
      */
     beforeSearch?: (params: any) => void;
     /**
-    * @description 是否开启搜索查询
-    */
+     * @description 是否开启搜索查询
+     */
     changeNoSearch?: boolean;
     /**
      * @description 是否初始化搜索

package/dist/components/DropDownSelect/index.js

@@ -50,7 +50,8 @@ var Index = function Index(props) {
     prop = _objectWithoutProperties(props, _excluded);
   var id = showValue.id,
     value = showValue.value,
-    lable = showValue.lable;
+    lable = showValue.lable,
+    optionProps = showValue.optionProps;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     storeList = _useState2[0],
@@ -210,10 +211,10 @@ var Index = function Index(props) {
       })));
     };
     var options = storeList.map(function (item) {
-      return /*#__PURE__*/React.createElement(Option, {
+      return /*#__PURE__*/React.createElement(Option, _extends({
         key: item[id],
         value: value(item)
-      }, lable(item));
+      }, optionProps === null || optionProps === void 0 ? void 0 : optionProps(item)), lable(item));
     });
     var commonProps = _objectSpread(_objectSpread({}, prop), {}, {
       mode: mode,

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

@@ -1,60 +1,64 @@
-import { SizeType } from "antd/es/config-provider/SizeContext";
+import { SizeType } from 'antd/es/config-provider/SizeContext';
 export interface FilterRadioProps {
     /**
-    * @description key
-    * @default key
-    */
+     * @description key
+     * @default key
+     */
     key: string;
     /**
-    * @description 是否有全选
-    */
+     * @description 是否有全选
+     */
     all: string | undefined;
     /**
-    * @description 是选项列表
-    * @default []
-    */
+     * @description 是选项列表
+     * @default []
+     */
     list: {
         id: string | number;
         name: string;
     }[];
     /**
-    * @description showMore
-    * @default showMore
-    */
+     * @description showMore
+     * @default showMore
+     */
     showMore?: boolean;
     /**
-    * @description name
-    */
+     * @description name
+     */
     name?: '';
     /**
-    * @description label
-    */
+     * @description label
+     */
     label?: string;
     /**
-    * @description 表单配置
-    */
+     * @description 表单配置
+     */
     options: FilterRadioOptions;
     /**
-    * @description 重置
-    */
+     * @description 重置
+     */
     reset: boolean;
     /**
-    * @description 组件尺寸: large | middle | small
-    */
+     * @description 组件尺寸: large | middle | small
+     */
     size?: SizeType;
     /**
-    * @description defaultValue
-    * @default defaultValue
-    */
+     * @description defaultValue
+     * @default defaultValue
+     */
     defaultValue?: string | undefined;
     /**
-    * @description 传入配置：all 、 list
-    */
+     * @description 传入配置：all 、 list
+     */
     componentOptions: any;
     /**
-    * @description 反馈方法
-    */
+     * @description 反馈方法
+     */
     updateCallback: () => void;
+    /**
+     * 防抖时间
+     */
+    debounceTime?: number;
 }
 export interface FilterRadioOptions {
     key: string;

package/dist/components/FilterRadio/index.js

@@ -4,10 +4,10 @@ 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 { useState, useEffect } from 'react';
-import { Form, Radio, DatePicker } from 'antd';
+import { DatePicker, Form, Radio } from 'antd';
 import dayjs from 'dayjs';
-import React from 'react';
+import debounce from 'lodash/debounce';
+import React, { useEffect, useMemo, useState } from 'react';
 import "./index.scss";
 var RangePicker = DatePicker.RangePicker;
 var FilterRadio = function FilterRadio(props) {
@@ -19,7 +19,8 @@ var FilterRadio = function FilterRadio(props) {
     all = props.all,
     options = props.options,
     reset = props.reset,
-    defaultValue = props.defaultValue;
+    defaultValue = props.defaultValue,
+    debounceTime = props.debounceTime;
   var key = options.key;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -30,13 +31,22 @@ var FilterRadio = function FilterRadio(props) {
   useEffect(function () {
     setTimeValue('');
   }, [reset]);
+  var debounceUpdateCallback = useMemo(function () {
+    return debounce(function () {
+      updateCallback();
+    }, debounceTime);
+  }, [updateCallback]);
 
   // 改变选项
   var handleChangeRadio = function handleChangeRadio(e) {
     if (key === 'timeType') {
       setTimeValue(e.target.value);
     }
-    updateCallback();
+    if (debounceTime) {
+      debounceUpdateCallback();
+    } else {
+      updateCallback();
+    }
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "radioInfos"

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

@@ -1,6 +1,8 @@
 import { ReactNode } from 'react';
 import { MethodEnum } from '../../commonType/globalEnum';
 export interface IPageTemPropsData {
+    initialValues?: any;
+    formProps?: any;
     http: any;
     ref?: any;
     rowKey?: string;
@@ -37,7 +39,7 @@ export interface IPageTemPropsData {
 }
 export interface IColumnsProps {
     title: string;
-    dataIndex?: string;
+    dataIndex?: any;
     render?: typeEmptyFunc | ((text: string | number, record: any, index: string | number) => any);
     [name: string]: typeEmptyFunc | string | boolean | undefined | number | any;
 }

package/dist/components/PageTemplate/index.js

@@ -37,7 +37,7 @@ import "./index.scss";
 var FormItem = Form.Item;
 var RangePicker = DatePicker.RangePicker;
 var PageTemplate = function PageTemplate(props, ref) {
-  var _document$querySelect3;
+  var _document$querySelect3, _tableProps$scroll, _tableProps$scroll2;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -56,7 +56,11 @@ var PageTemplate = function PageTemplate(props, ref) {
     exportApi = props.exportApi,
     _props$isScroll = props.isScroll,
     isScroll = _props$isScroll === void 0 ? true : _props$isScroll,
-    buttonTheme = props.buttonTheme;
+    buttonTheme = props.buttonTheme,
+    _props$initialValues = props.initialValues,
+    initialValues = _props$initialValues === void 0 ? {} : _props$initialValues,
+    _props$formProps = props.formProps,
+    formProps = _props$formProps === void 0 ? {} : _props$formProps;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     dataSource = _useState2[0],
@@ -152,7 +156,7 @@ var PageTemplate = function PageTemplate(props, ref) {
         key: 'rowIndex',
         align: 'center',
         fixed: 'left',
-        minWidth: 70,
+        width: 70,
         ellipsis: {
           showTitle: false
         },
@@ -164,8 +168,9 @@ var PageTemplate = function PageTemplate(props, ref) {
     }
     _columns = _columns.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
-        minWidth: item.minWidth || item.title.length * 20 + 20,
-        ellipsis: item.ellipsis || true,
+        minWidth: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? undefined : item.minWidth || item.title.length * 20 + 20,
+        width: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? 70 : item.width,
+        ellipsis: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? false : typeof item.ellipsis === 'boolean' ? item.ellipsis : true,
         align: item.align || 'center',
         fixed: item.fixed || (['action', 'operation', 'handle', 'handle_box'].includes(item.dataIndex) ? 'right' : ['rowIndex'].includes(item.key) ? 'left' : undefined)
       });
@@ -256,9 +261,10 @@ var PageTemplate = function PageTemplate(props, ref) {
     setReset(function (prevState) {
       return !prevState;
     });
-
     // 重置后默认查询
     setTimeout(function () {
+      var pageSize = props.pageSize;
+      pageSizeRef.current = pageSize || 20;
       _onSearch();
     });
   };
@@ -383,12 +389,13 @@ var PageTemplate = function PageTemplate(props, ref) {
           return 'actions';
       }
     };
-    return /*#__PURE__*/React.createElement(Form, {
+    return /*#__PURE__*/React.createElement(Form, _extends({
       layout: "inline",
       form: form,
       onFinish: beforeSearch,
-      autoComplete: "off"
-    }, /*#__PURE__*/React.createElement("div", {
+      autoComplete: "off",
+      initialValues: initialValues
+    }, formProps), /*#__PURE__*/React.createElement("div", {
       className: "filter-container"
     }, /*#__PURE__*/React.createElement("div", {
       className: "filter-box filter-box-base"
@@ -449,16 +456,16 @@ var PageTemplate = function PageTemplate(props, ref) {
     style: {
       marginTop: 10
     },
-    scroll: {
-      x: 1500,
-      y: tableHeight || undefined
-    },
     bordered: true,
     dataSource: dataSource,
-    size: "small"
-  }, tableProps, {
+    size: "small",
     columns: columns,
     tableLayout: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.tableLayout) || 'auto'
+  }, tableProps, {
+    scroll: {
+      x: dataSource.length > 0 ? (tableProps === null || tableProps === void 0 || (_tableProps$scroll = tableProps.scroll) === null || _tableProps$scroll === void 0 ? void 0 : _tableProps$scroll.x) || 'max-content' : 1500,
+      y: dataSource.length > 0 ? (tableProps === null || tableProps === void 0 || (_tableProps$scroll2 = tableProps.scroll) === null || _tableProps$scroll2 === void 0 ? void 0 : _tableProps$scroll2.y) || 'max-content' : 1500
+    }
     // components={{ header: { cell: ResizableTitle } }}
     // columns={mergedColumns(columns, tableRef, (_columns) =>
     //   setColumns(_columns),

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

@@ -10,16 +10,16 @@ interface TitlePropsType {
     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进行控制.
-*/
+ * 设置表格列宽的初始化值
+ * ^判断初始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 };
+export { CustomTable, mergedColumns, ResizableTitle };

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

@@ -59,15 +59,15 @@ var handleResize = function handleResize(index, columns, newColumnsVoid) {
   };
 };
 /**
-* 设置表格列宽的初始化值
-* ^判断初始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进行控制.
-*/
+ * 设置表格列宽的初始化值
+ * ^判断初始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的情况
@@ -159,7 +159,7 @@ var ResizableTitle = function ResizableTitle(props) {
   }, /*#__PURE__*/React.createElement("th", restProps));
 };
 var CustomTable = function CustomTable(props) {
-  var _document$querySelect3;
+  var _document$querySelect3, _restProps$scroll, _restProps$scroll2;
   var components = props.components,
     columns = props.columns,
     dataSource = props.dataSource,
@@ -188,8 +188,9 @@ var CustomTable = function CustomTable(props) {
     var _columns = _toConsumableArray(columns);
     _columns = _columns.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
-        minWidth: item.minWidth || item.title.length * 20 + 20,
-        ellipsis: item.ellipsis || true,
+        minWidth: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? undefined : item.minWidth || item.title.length * 20 + 20,
+        width: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? 70 : item.width,
+        ellipsis: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? false : typeof item.ellipsis === 'boolean' ? item.ellipsis : true,
         align: item.align || 'center',
         fixed: item.fixed || (['action', 'operation', 'handle', 'handle_box'].includes(item.dataIndex) ? 'right' : ['rowIndex'].includes(item.key) ? 'left' : undefined)
       });
@@ -206,11 +207,6 @@ var CustomTable = function CustomTable(props) {
     ref: tableRef
   }, /*#__PURE__*/React.createElement(Table, _extends({
     size: "small"
-  }, restProps, {
-    scroll: {
-      x: 1500,
-      y: tableHeight || undefined
-    }
     // columns={mergedColumns(column as any, tableRef, (_columns) => setColumn(_columns as any)) as any}
     ,
     columns: column
@@ -219,6 +215,11 @@ var CustomTable = function CustomTable(props) {
     components: components,
     dataSource: dataSource || [],
     tableLayout: tableLayout || 'auto'
+  }, restProps, {
+    scroll: {
+      x: dataSource && dataSource.length > 0 ? (restProps === null || restProps === void 0 || (_restProps$scroll = restProps.scroll) === null || _restProps$scroll === void 0 ? void 0 : _restProps$scroll.x) || 'max-content' : 1500,
+      y: dataSource && dataSource.length > 0 ? (restProps === null || restProps === void 0 || (_restProps$scroll2 = restProps.scroll) === null || _restProps$scroll2 === void 0 ? void 0 : _restProps$scroll2.y) || 'max-content' : 1500
+    }
   })));
 };
-export { mergedColumns, ResizableTitle, CustomTable };
+export { CustomTable, mergedColumns, ResizableTitle };

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

@@ -1,5 +1,6 @@
 import { ReactNode } from 'react';
 export interface IndexProps {
+    className?: string;
     text: string;
     rows?: number;
     copy?: boolean;

package/dist/components/TypographyText/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 = ["text", "rows", "copy", "type", "expandable", "ellipsis"];
+var _excluded = ["className", "text", "rows", "copy", "type", "expandable", "ellipsis"];
 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 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; }
@@ -21,7 +21,8 @@ import "./index.scss";
 // 参考antd的Typography，只能用与Paragraph
 /// 如果需要自定义，则手动传入ellipsis，会覆盖默认值
 var Index = function Index(props) {
-  var text = props.text,
+  var className = props.className,
+    text = props.text,
     _props$rows = props.rows,
     rows = _props$rows === void 0 ? 1 : _props$rows,
     _props$copy = props.copy,
@@ -41,7 +42,7 @@ var Index = function Index(props) {
   var textRender = function textRender() {
     return /*#__PURE__*/React.createElement(Typography.Paragraph, _extends({
       // rows = 1时，需要自行设置css，否则会默认全部展示
-      className: rows === 1 && !expanded && !expandable ? 'custom_Typography_row1' : '',
+      className: "".concat(rows === 1 && !expanded && !expandable ? 'custom_Typography_row1' : '', " ").concat(className || ''),
       style: {
         marginBottom: 0,
         color: '#000000'
@@ -62,6 +63,7 @@ var Index = function Index(props) {
     }, rest), /*#__PURE__*/React.createElement(React.Fragment, null, text || ''));
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, !expanded ? /*#__PURE__*/React.createElement(Tooltip, {
+    className: "".concat(className || ''),
     title: text
   }, textRender()) : /*#__PURE__*/React.createElement(React.Fragment, null, textRender()));
 };

package/dist/components/YLModal/index.js

@@ -12,6 +12,8 @@ import React, { useRef, useState } from 'react';
 import { Modal } from 'antd';
 import debounce from 'lodash/debounce';
 import Draggable from 'react-draggable';
+import { CloseOutlined } from '@ant-design/icons';
+
 // 平台常见弹窗宽度分类
 // 1300 审方 开户信息查询详情
 // 1000, 订单 | 药品 | 医生认证
@@ -66,7 +68,10 @@ var YLModal = function YLModal(props) {
     closable: closable,
     maskClosable: false,
     width: width || 700,
-    className: "yl-modal ".concat(className || '')
+    className: "yl-modal custom_modal_close_icon ".concat(className || ''),
+    closeIcon: /*#__PURE__*/React.createElement("span", {
+      className: "custom_close_icon"
+    }, /*#__PURE__*/React.createElement(CloseOutlined, null), "\u5173\u95ED")
   }, restParams, {
     onOk: whetherDebounce && props.onOk ? React.useMemo(function () {
       return debounce(props.onOk, debounceTimeout);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "1.0.5",
+  "version": "1.0.7-alpha.1",
   "description": "A react library developed with dumi",
   "keywords": [
     "React",