ztxkui 1.7.5 → 1.7.9

package/dist/Demo.js

@@ -23,14 +23,21 @@ function Demo() {
                 {
                     id: '1',
                     name: '你好',
+                    test1: 'JS',
                 },
                 {
                     id: '2',
                     name: '张三',
+                    test1: 'Node',
                 },
                 {
                     id: '3',
                     name: '李四',
+                    test1: 'Webpack',
+                },
+                {
+                    id: '4',
+                    name: '王五',
                 },
             ]);
             setDefaultList([
@@ -50,12 +57,12 @@ function Demo() {
         React.createElement(Link, { to: "/test" }, "test"),
         React.createElement("h1", null, "\u4F5C\u4E3A\u6F14\u793A\u4F7F\u7528"),
         React.createElement("h2", null, "\u5982\u679C\u6570\u636E\u662F\u901A\u8FC7\u5916\u90E8\u83B7\u53D6\u7684\uFF0C\u53EF\u4EE5\u901A\u8FC7\u4F20\u9012list\u5C5E\u6027"),
-        React.createElement(EnhanceSelect, { style: selectStyle, list: list, showAll: true }),
+        React.createElement(EnhanceSelect, { style: selectStyle, list: list, showAll: true, joinKey: "test1" }),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E"),
         React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/list", params: JSON.stringify({
                 status: 50,
                 companyId: '1397074605412696066',
-            }), request: request }),
+            }), request: request, joinKey: "depName" }),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u5E76\u7F13\u5B58\u6570\u636E"),
         React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/list", params: JSON.stringify({
                 status: 50,

package/dist/TreeSelectDemo.js

@@ -63,7 +63,7 @@ function TreeSelectDemo() {
         React.createElement(Link, { to: "/test" }, "test"),
         React.createElement("h1", null, "\u4F5C\u4E3A\u6F14\u793A\u4F7F\u7528"),
         React.createElement("h2", null, "\u5982\u679C\u6570\u636E\u662F\u901A\u8FC7\u5916\u90E8\u83B7\u53D6\u7684\uFF0C\u53EF\u4EE5\u901A\u8FC7\u4F20\u9012list\u5C5E\u6027"),
-        React.createElement(EnhanceTreeSelect, { style: selectStyle, treeData: treeData }),
+        React.createElement(EnhanceTreeSelect, { style: selectStyle, treeData: treeData, treeNodeLabelProp: "key" }),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u4E00\u6B21\u6027\u83B7\u53D6\u6570\u636E"),
         React.createElement(EnhanceTreeSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-system/dept/lazy-tree", params: JSON.stringify({
                 status: 50,

package/dist/components/EnhanceSelect/index.d.ts

@@ -37,6 +37,14 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
      * 下拉框显示值对应的KEY
      */
     titleKey?: string;
+    /**
+     * 拼接字段对应的key
+     */
+    joinKey?: string | string[];
+    /**
+     * 拼接形式
+     */
+    joinStr?: string;
     /**
      * 是否显示全部，全部的value为空字符串
      */
@@ -87,6 +95,6 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
  *    { code: 200, data: { records: [] } } || { status: 200, data: { code: 200, data: { records: [] } } }
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
-declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, transformData, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, transformData, joinKey, joinStr, ...restProps }: IProps<VT>): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof EnhanceSelect>;
 export default _default;

package/dist/components/EnhanceSelect/index.js

@@ -71,9 +71,9 @@ function getData(request, options) {
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
 function EnhanceSelect(_a) {
-    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, transformData = _a.transformData, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "transformData"]);
+    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, transformData = _a.transformData, joinKey = _a.joinKey, _e = _a.joinStr, joinStr = _e === void 0 ? '-' : _e, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "transformData", "joinKey", "joinStr"]);
     // 下拉数据源
-    var _e = useFetchState([]), selectList = _e[0], setSelectList = _e[1];
+    var _f = useFetchState([]), selectList = _f[0], setSelectList = _f[1];
     // 如果selectList 发生改变，那么触发onCompleted事件
     useEffect(function () {
         if (Array.isArray(selectList) && onCompleted) {
@@ -220,7 +220,21 @@ function EnhanceSelect(_a) {
                     var key = componentKey ? item[componentKey] : item[dataKey];
                     var value = item[dataKey];
                     var title = item[titleKey];
-                    return (React.createElement(Select.Option, { key: key, value: value, title: title }, title));
+                    var joinTitle = [];
+                    if (joinKey) {
+                        joinTitle = Array.isArray(joinKey)
+                            ? joinKey.map(function (joinItem) { return item[joinItem]; })
+                            : item[joinKey]
+                                ? [item[joinKey]]
+                                : [];
+                    }
+                    if (Array.isArray(joinTitle)) {
+                        joinTitle.unshift(title);
+                    }
+                    else {
+                        joinTitle = [title];
+                    }
+                    return (React.createElement(Select.Option, { key: key, value: value, title: title, disabled: item === null || item === void 0 ? void 0 : item.disabled }, Array.isArray(joinTitle) ? joinTitle === null || joinTitle === void 0 ? void 0 : joinTitle.join(joinStr) : ''));
                 })));
     }
     // 本地搜索
@@ -248,6 +262,6 @@ function EnhanceSelect(_a) {
             onChange && onChange(value, option);
         }
     };
-    return (React.createElement(Select, __assign({ allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle }, restProps), renderSelectOption()));
+    return (React.createElement(Select, __assign({ allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle, optionLabelProp: "title" }, restProps), renderSelectOption()));
 }
 export default memo(EnhanceSelect);

package/dist/components/EnhanceTreeSelect/index.d.ts

@@ -41,7 +41,7 @@ export interface IProps<T> extends Omit<TreeSelectProps<T>, 'onChange'> {
     /**
      * 数据发生改变时触发
      */
-    onChange?: (value: string, option: string, completeData?: any) => void;
+    onChange?: any;
 }
 /**
  * 增强下拉树

package/dist/index.d.ts

@@ -34,6 +34,6 @@ export { default as EnhanceTreeSelect } from './components/EnhanceTreeSelect';
 export { default as Collapse } from './components/Collapse';
 export { default as GridList } from './components/business/GridList';
 export { default as Timeline } from './components/Timeline';
-export { ConfigProvider, Drawer, message, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tag, Empty, Tooltip, Descriptions, Image, } from 'antd';
+export { ConfigProvider, Drawer, message, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tag, Empty, Tooltip, Descriptions, Image, Popover, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/dist/index.js

@@ -97,6 +97,6 @@ export { default as EnhanceTreeSelect } from './components/EnhanceTreeSelect';
 export { default as Collapse } from './components/Collapse';
 export { default as GridList } from './components/business/GridList';
 export { default as Timeline } from './components/Timeline';
-export { ConfigProvider, Drawer, message, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tag, Empty, Tooltip, Descriptions, Image, } from 'antd';
+export { ConfigProvider, Drawer, message, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tag, Empty, Tooltip, Descriptions, Image, Popover, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "1.7.5",
+  "version": "1.7.9",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",