ztxkui 2.0.6 → 2.1.0

package/dist/App.js

@@ -35,6 +35,7 @@ import SearchContainer from './components/business/SearchContainer';
 import Upload from './components/Upload';
 import Form from './components/Form';
 import TransList from './components/business/List';
+import GridList from 'components/business/GridList';
 import './styles/index.scss';
 var RangePicker = DatePicker.RangePicker;
 var Item = Form.Item;
@@ -1370,6 +1371,18 @@ function App() {
         }
     }, []);
     return (React.createElement("div", { className: "App", style: { padding: '10px' } },
+        React.createElement("div", { style: { padding: '10px', width: '60%' } },
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 8, title: "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D" }, "\u59D3\u540D"),
+                React.createElement(GridList.Item, { span: 8, title: "\u59D3\u540D" }, "\u59D3\u540D"),
+                React.createElement(GridList.Item, { span: 8, title: "\u59D3\u540D" }, "\u59D3\u540D")),
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 12, titleSpan: 8, title: "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D" }, "\u59D3\u540D"),
+                React.createElement(GridList.Item, { span: 12, titleSpan: 8, title: "\u59D3\u540D" }, "\u59D3\u540D")),
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 24, title: "\u59D3\u540D", titleSpan: 8 }, "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D")),
+            React.createElement(GridList, null,
+                React.createElement(GridList.Item, { span: 24, title: "\u59D3\u540D", titleSpan: 12 }, "\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3\u540D\u59D3"))),
         React.createElement(DetailList, { records: inspectionDetail, labelWidth: 10, labelAlign: "left", apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", 
             // downloadBtnDisable={true}
             hasManOrDate: true, hasSignArea: true, isDark: true }),
@@ -1498,7 +1511,9 @@ function App() {
                         dataSource: dataSource, rowKey: "id", showColumnDynamic: true, 
                         // onAddAndDelHandle={onAddAndDelHandle}
                         // onMoveRow={onMoveRowHandle}
-                        summaryConfig: summaryConfig, summaryFixed: true, scroll: { y: 200 }, onEditableSave: onEditableSaveHandle, rowSelection: rowSelection })))),
+                        summaryConfig: summaryConfig, summaryFixed: true, 
+                        // scroll={{ y: 200 }}
+                        onEditableSave: onEditableSaveHandle, rowSelection: rowSelection })))),
         React.createElement("br", null),
         React.createElement("br", null),
         React.createElement("br", null),

package/dist/Demo.js

@@ -6,7 +6,7 @@ var selectStyle = { width: '200px' };
 function request(options) {
     return fetch(options.url + "?" + stringify(options.params), {
         headers: {
-            'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLpmYjkuprpm4QiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQxMjYxNDExMDY0NzM4NjExNCwxNDEyNjE1Njc3MTE5MjY2ODE3LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ1MjgyMDI5MzgwMjcxMzA5MCwxNDUzOTI1MDAxNTMxNDc4MDE3LDE0NTg3MTIwODIwODIzNTcyNTAsMTQ1ODgyNjIzODE4NTg4OTc5NCwxNDU4ODI3NzAxMDEyMzI0MzUzLDE0NTg4MjgzNjA4MDE1MDkzNzcsMTQ2MDA4OTI2MjAxMjAzMDk3NywxNDYxMTM3Nzg4NjQ1MTI2MTQ2IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTQxMjYwODc0Mjk1MzI4NzY4MiwxNDM4MzIyNTQzMjk1OTI2Mjc0LDE0NDM0NzU0NzU5NzI3MzQ5NzcsMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDYwMDg1NDI2ODE1OTUwODQ5LDE0NjI2MjI5OTIzNzUyMDk5ODYiLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTYzOTI3NTUxNiwib3JnX25hbWUiOiLmuZbljZfkuK3mi5Pkv6Hmga_np5HmioDmnInpmZDlhazlj7giLCJqdGkiOiJjOTM4ZmFlMy05YzA1LTQ1MzQtYTVhNy1mZjllY2VkMTFiOWIiLCJtZW1iZXJfaWQiOjE0MTI5NTMyMDUyNjk1MTYyOTAsImNvbXBhbnlfaWQiOjEzOTcwNzQ2MDU0MTI2OTYwNjYsInN5c3RlbV9pZCI6IjMiLCJkZXB0X25hbWUiOiLkuJrliqHkuIDpg6giLCJhdmF0YXIiOiIiLCJkYXRhX3JvbGVfbmFtZSI6ImFkbWluLHVzZXIsdXNlcixhZG1pbixhZG1pbixhZG1pbix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlciIsImF1dGhvcml0aWVzIjpbImFkbWluIiwidXNlciIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoidXNlcixhZG1pbixhZG1pbixhZG1pbmlzdHJhdG9yLHVzZXIsdXNlciIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOjE0NTc1Mjc3NjU5MTg1MTU1MzUsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWboueJqea1geenkeaKgOaciemZkOWFrOWPuCIsImRlcHRfaWQiOiIxMzk3MDgxOTMwMzI4NDI0NDQ5IiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiJjaGVueXgiLCJyZXN1bWVfaWQiOm51bGx9.Moo8uYZzd7bNGw_jsydYQvyf5lVoJA8LLUNQdkPxXac',
+            'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLpmYjkuprpm4QiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQxMjYxNDExMDY0NzM4NjExNCwxNDEyNjE1Njc3MTE5MjY2ODE3LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ1MjgyMDI5MzgwMjcxMzA5MCwxNDUzOTI1MDAxNTMxNDc4MDE3LDE0NTg3MTIwODIwODIzNTcyNTAsMTQ1ODgyNjIzODE4NTg4OTc5NCwxNDU4ODI3NzAxMDEyMzI0MzUzLDE0NTg4MjgzNjA4MDE1MDkzNzcsMTQ2MDA4OTI2MjAxMjAzMDk3NywxNDYxMTM3Nzg4NjQ1MTI2MTQ2IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTQxMjYwODc0Mjk1MzI4NzY4MiwxNDM4MzIyNTQzMjk1OTI2Mjc0LDE0NDM0NzU0NzU5NzI3MzQ5NzcsMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDYwMDg1NDI2ODE1OTUwODQ5LDE0NjI2MjI5OTIzNzUyMDk5ODYiLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTYzOTQ4NDUzNSwib3JnX25hbWUiOiLmuZbljZfkuK3mi5Pkv6Hmga_np5HmioDmnInpmZDlhazlj7giLCJqdGkiOiIwN2EyYjA2MS1lNWY0LTQ4ZTEtOWIwOC1hNmI1ODQxMWY5M2UiLCJtZW1iZXJfaWQiOjE0MTI5NTMyMDUyNjk1MTYyOTAsImNvbXBhbnlfaWQiOjEzOTcwNzQ2MDU0MTI2OTYwNjYsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjoi5Lia5Yqh5LiA6YOoIiwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbix1c2VyLHVzZXIsYWRtaW4sYWRtaW4sYWRtaW4sdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIiLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6InVzZXIsYWRtaW4sYWRtaW4sYWRtaW5pc3RyYXRvcix1c2VyLHVzZXIiLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxNDEyOTUzODA0MzMzNTU1NzE0Iiwib3JnX2lkIjoxNDU3NTI3NzY1OTE4NTE1NTM1LCJuaWNrX25hbWUiOiLpmYjkuprpm4QiLCJjb21wYW55X25hbWUiOiLmtZnllYbkuK3mi5Ppm4blm6LnianmtYHnp5HmioDmnInpmZDlhazlj7giLCJkZXB0X2lkIjoiMTM5NzA4MTkzMDMyODQyNDQ0OSIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.0Jd8QuqAcnoSPULKPBqwmuFWRwTACvNrB99xIynYB9s',
         },
         method: options.method,
     }).then(function (response) { return response.json(); });
@@ -16,6 +16,10 @@ function Demo() {
     var _a = useState([]), list = _a[0], setList = _a[1];
     var _b = useState([]), defaultList = _b[0], setDefaultList = _b[1];
     var _c = useState(''), value = _c[0], setValue = _c[1];
+    var _d = useState({
+        tenantId: '000000',
+        isCreateUser: 0,
+    }), params = _d[0], setParams = _d[1];
     // 模拟接口请求
     useEffect(function () {
         var timeoutId = setTimeout(function () {
@@ -47,7 +51,12 @@ function Demo() {
                     projectName: '项目12',
                 },
             ]);
-            // setValue('1462433051208761603');
+            setValue('1462433051208762629');
+            setParams({
+                tenantId: '000000',
+                isCreateUser: 0,
+                orgId: 1457527765918515201,
+            });
         }, 2000);
         return function () {
             if (timeoutId) {
@@ -59,13 +68,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, joinKey: "test1", onChange: function (value, option, fullData) {
-                console.log(value, option, fullData);
-            } }),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E"),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u5E76\u7F13\u5B58\u6570\u636E"),
         React.createElement("h2", null, "\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22"),
-        React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", 
+        React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", value: value, showAll: true, onChange: function (value, option, fullData) {
+                setValue(value);
+            }, params: JSON.stringify(params), 
             // value={value}
             mode: "multiple" })));
 }

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

@@ -79,6 +79,10 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
      * 远程搜索主键Key值
      */
     remoteSearchDataKey?: string;
+    /**
+     * 是否启用远程搜索主键Key值
+     */
+    isRemoteSearchDataKey?: boolean;
     /**
      * 接口数据格式转换
      */
@@ -99,6 +103,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, remoteSearchDataKey, transformData, joinKey, joinStr, ...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, remoteSearchDataKey, isRemoteSearchDataKey, 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,14 +71,17 @@ 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, remoteSearchDataKey = _a.remoteSearchDataKey, 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", "remoteSearchDataKey", "transformData", "joinKey", "joinStr"]);
+    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, remoteSearchDataKey = _a.remoteSearchDataKey, _e = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _e === void 0 ? true : _e, transformData = _a.transformData, joinKey = _a.joinKey, _f = _a.joinStr, joinStr = _f === void 0 ? '-' : _f, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr"]);
     // 下拉数据源
-    var _f = useFetchState([]), selectList = _f[0], setSelectList = _f[1];
+    var _g = useFetchState([]), selectList = _g[0], setSelectList = _g[1];
     // 多选时，自己需要合并的数据
-    var _g = useFetchState([]), multipleList = _g[0], setMultipleList = _g[1];
-    var _h = useFetchState(false), loading = _h[0], setLoading = _h[1];
+    var _h = useFetchState([]), multipleList = _h[0], setMultipleList = _h[1];
+    var _j = useFetchState(false), loading = _j[0], setLoading = _j[1];
     var fetchId = useRef(0); // 请求Id，每次请求都会加1
-    var _j = useFetchState(false), firstLoading = _j[0], setFirstLoading = _j[1];
+    // 是否使用过远程搜索主键key
+    var _k = useFetchState(false), firstLoading = _k[0], setFirstLoading = _k[1];
+    // 第一次清空时，才做远程查询
+    var _l = useFetchState(false), firstClearData = _l[0], setFirstClearData = _l[1];
     // 如果selectList 发生改变，那么触发onCompleted事件
     useEffect(function () {
         if (Array.isArray(selectList) && onCompleted) {
@@ -141,7 +144,7 @@ function EnhanceSelect(_a) {
         getData(request, {
             url: url,
             method: method,
-            params: __assign(__assign({ size: 50, page: 1 }, outParams), searchParams),
+            params: __assign(__assign({ size: 30, page: 1 }, outParams), searchParams),
         })
             .then(function (resData) {
             var _a, _b, _c;
@@ -162,6 +165,15 @@ function EnhanceSelect(_a) {
                     result = ((_c = (_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.records) || [];
                 }
             }
+            // 如果根据id查过了，那么需要把这些数据添加到自定义合并数组中
+            if (dataKeyValue) {
+                var values = dataKeyValue.split(',');
+                var currentData = values.map(function (valueItem) {
+                    return result.find(function (item) { return item[dataKey] === valueItem; });
+                });
+                currentData = currentData === null || currentData === void 0 ? void 0 : currentData.filter(function (item) { return item; });
+                setMultipleList(currentData);
+            }
             setSelectList(result);
         })
             .catch(function (err) {
@@ -180,6 +192,7 @@ function EnhanceSelect(_a) {
         setSelectList,
         transformData,
         setLoading,
+        setMultipleList,
     ]);
     var searchHandle = function (value) {
         // 当value有值时才进行搜索
@@ -237,21 +250,34 @@ function EnhanceSelect(_a) {
         remoteSearch,
     ]);
     // 3、远程搜索，url必须传递
+    // 关于远程查询，最好的做法还是后台根据主键再去查一次详情数据，这样就能保证
+    // 查出来的数据就能保证不止一条
     useEffect(function () {
         if (!url || !remoteSearch) {
             return;
         }
         // console.log('TEST: 远程搜索');
-        if (!firstLoading) {
-            if (!restProps.value) {
-                getRemoteDataHandle('', '');
-            }
-            else {
-                if (typeof restProps.value === 'string' ||
-                    Array.isArray(restProps.value)) {
-                    setFirstLoading(true);
-                    getRemoteDataHandle('', restProps.value);
-                }
+        // 如果初始化请求已经做过了，那么这个副作用直接返回
+        if (firstLoading) {
+            // console.log('已经通过id访问了');
+            return;
+        }
+        // 这种情况不需要启用远程搜索key值
+        if (!isRemoteSearchDataKey) {
+            getRemoteDataHandle('', '');
+            setFirstLoading(true);
+            return;
+        }
+        if (!restProps.value) {
+            // console.log('第一次请求数据');
+            getRemoteDataHandle('', '');
+        }
+        else {
+            if (typeof restProps.value === 'string' ||
+                Array.isArray(restProps.value)) {
+                // console.log('第二次请求数据，默认为需要根据主键去请求', restProps.value);
+                setFirstLoading(true);
+                getRemoteDataHandle('', restProps.value);
             }
         }
     }, [
@@ -260,6 +286,7 @@ function EnhanceSelect(_a) {
         getRemoteDataHandle,
         restProps.value,
         firstLoading,
+        isRemoteSearchDataKey,
         setFirstLoading,
     ]);
     // 数据合并
@@ -315,6 +342,13 @@ function EnhanceSelect(_a) {
     };
     // onChange 方法
     var onChangeHandle = function (value, option) {
+        if (((Array.isArray(value) && value.length === 0) || !value) &&
+            remoteSearch &&
+            !firstClearData) {
+            console.log('第一次清空数据时，做一次远程查询');
+            setFirstClearData(true);
+            getRemoteDataHandle('', '');
+        }
         var _defaultList = Array.isArray(defaultList) ? defaultList : [];
         var currentList = concatData(concatData(selectList || [], _defaultList), multipleList || []);
         if (currentList && Array.isArray(currentList)) {

package/dist/components/Table/table.js

@@ -38,7 +38,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { DndProvider } from 'react-dnd';
 /**默认scroll配置 */
 // const _scroll = { y: 500, x: 1000 };
-var _scroll = { x: 1000 };
+var _scroll = { x: 1000, y: 500 };
 /**
  * @description 定义可拖拽行
  *              定义可编辑列

package/dist/components/business/Common/UserForgetPassword/index.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+interface IProps {
+    visible: boolean;
+    onCancel: any;
+    setUserPassword?: any;
+    request: any;
+    encryptionHandle: any;
+    setUserPasswordOption?: any;
+}
+declare const ForgetPassword: React.FC<IProps>;
+export default ForgetPassword;

package/dist/components/business/Common/UserForgetPassword/index.js

@@ -0,0 +1,235 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import React, { useState, useCallback, useRef, useEffect } from 'react';
+import { Modal, Form, SearchContainer, Input, Container, Button, message, } from '../../../../index';
+import { validate, commonMessage } from 'ztxkutils/dist/validate';
+var SearchLeft = SearchContainer.SearchLeft, Item = SearchContainer.SearchItem;
+var countDownMaxTime = 60; // 倒计时最大时间
+var ForgetPassword = function (_a) {
+    var visible = _a.visible, onCancel = _a.onCancel, setUserPassword = _a.setUserPassword, request = _a.request, setUserPasswordOption = _a.setUserPasswordOption, encryptionHandle = _a.encryptionHandle;
+    var form = Form.useForm()[0];
+    var _b = useState(false), loading = _b[0], setLoading = _b[1];
+    // 发送短信验证码相关操作
+    var _c = useState(false), codeLoading = _c[0], setCodeLoading = _c[1];
+    var _d = useState(countDownMaxTime), countDown = _d[0], setCountDown = _d[1];
+    var setIntervalCount = useRef();
+    // 开始倒计时
+    useEffect(function () {
+        // 倒计时
+        if (countDown === countDownMaxTime - 1) {
+            setIntervalCount.current = setInterval(function () {
+                if (countDown === 1) {
+                    clearInterval(setIntervalCount.current);
+                }
+                setCountDown(function (preCountDown) { return preCountDown - 1; });
+            }, 1000);
+        }
+        else if (countDown === 0) {
+            setIntervalCount.current && clearInterval(setIntervalCount.current);
+            setCodeLoading(false);
+            setCountDown(countDownMaxTime);
+        }
+    }, [countDown]);
+    /**发送短信验证码 */
+    var onSendCode = function () {
+        setCodeLoading(true);
+        var phone = form.getFieldValue('phone');
+        if (!phone) {
+            message.error('请输入您的手机号');
+            setCodeLoading(false);
+            return;
+        }
+        if (!validate.phoneValidate.test(phone)) {
+            message.error(commonMessage.phoneMessage);
+            setCodeLoading(false);
+            return;
+        }
+        setTimeout(function () {
+            setCountDown(countDownMaxTime - 1);
+        }, 1000);
+        request({
+            url: '/api/zmdms-auth/oauth/sms',
+            method: 'GET',
+            params: {
+                phone: phone,
+            },
+        })
+            .then(function (res) {
+            var _a = res.data, msg = _a.msg, success = _a.success;
+            if (success === 'true') {
+                // message.success(msg || '验证码发送成功!');
+                // setUserPassword && setUserPassword();
+            }
+            else {
+                message.warning(msg || '验证码发送失败!');
+            }
+        })
+            .catch(function (err) {
+            var _a, _b;
+            message.warning(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '验证码发送失败!');
+        });
+    };
+    /**提交验证 */
+    var vallidateFn = useCallback(function (callback) { return __awaiter(void 0, void 0, void 0, function () {
+        var err_1, errorFields;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    // 表单验证
+                    return [4 /*yield*/, form.validateFields()];
+                case 1:
+                    // 表单验证
+                    _a.sent();
+                    // 验证成功 提交数据
+                    callback();
+                    return [3 /*break*/, 3];
+                case 2:
+                    err_1 = _a.sent();
+                    errorFields = err_1.errorFields;
+                    if (errorFields) {
+                        message.warning(errorFields[0].errors + '');
+                    }
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
+            }
+        });
+    }); }, [form]);
+    /**发起提交 */
+    var submitParamsHandle = useCallback(function () {
+        setLoading(true);
+        var params = form.getFieldsValue();
+        var submitParams = {
+            phone: params.phone,
+            code: params.code,
+            newPassword: encryptionHandle(params.newPassword),
+            newPassword1: encryptionHandle(params.newPassword1),
+        };
+        request(setUserPasswordOption
+            ? __assign(__assign({}, setUserPasswordOption), { data: __assign(__assign({}, setUserPasswordOption.data), submitParams) }) : {
+            url: '/api/zmdms-user/forget-password',
+            method: 'POST',
+            data: submitParams,
+            isFormData: true,
+        })
+            .then(function (res) {
+            setLoading(false);
+            var _a = res.data, msg = _a.msg, code = _a.code;
+            if (code === 200) {
+                message.success(msg || '密码修改成功!');
+                setUserPassword && setUserPassword();
+            }
+            else {
+                message.warning(msg || '密码修改失败!');
+            }
+        })
+            .catch(function (err) {
+            var _a, _b;
+            setLoading(false);
+            message.warning(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '密码修改失败!');
+        });
+    }, [form, encryptionHandle, request, setUserPasswordOption, setUserPassword]);
+    var onSaveHandle = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            vallidateFn(function () {
+                submitParamsHandle();
+            });
+            return [2 /*return*/];
+        });
+    }); }, [vallidateFn, submitParamsHandle]);
+    var footerDomFn = function () {
+        return (React.createElement(Button, { type: "primary", onClick: onSaveHandle, loading: loading }, "\u786E\u8BA4\u4FEE\u6539"));
+    };
+    return (React.createElement(Modal, { loading: loading, visible: visible, onCancel: onCancel, title: "\u5FD8\u8BB0\u5BC6\u7801", width: "80%", footer: footerDomFn() },
+        React.createElement(Container, null,
+            React.createElement(Form, { name: "forget-password-making", form: form },
+                React.createElement(SearchContainer, { dark: true },
+                    React.createElement(SearchLeft, null,
+                        React.createElement("div", { style: { width: '100%' } },
+                            React.createElement(Item, { label: "\u624B\u673A\u53F7", name: "phone", rules: [
+                                    { required: true, message: '请输入您的手机号' },
+                                    {
+                                        pattern: validate.phoneValidate,
+                                        message: commonMessage.phoneMessage,
+                                    },
+                                ] },
+                                React.createElement(Input, { placeholder: "\u8BF7\u8F93\u5165\u60A8\u7684\u624B\u673A\u53F7" }))),
+                        React.createElement("div", { style: { width: '100%', display: 'flex' } },
+                            React.createElement(Item, { label: "\u77ED\u4FE1\u9A8C\u8BC1\u7801", name: "code", rules: [{ required: true, message: '请输入您的短信验证码' }] },
+                                React.createElement(Input, { placeholder: "\u8BF7\u8F93\u5165\u60A8\u7684\u77ED\u4FE1\u9A8C\u8BC1\u7801" })),
+                            React.createElement(Button, { type: "primary", onClick: onSendCode, loading: codeLoading },
+                                "\u53D1\u9001\u9A8C\u8BC1\u7801 ",
+                                codeLoading ? "(" + countDown + "s)" : '')),
+                        React.createElement("div", { style: { width: '100%', display: 'flex' } },
+                            React.createElement(Item, { name: "newPassword", label: "\u65B0\u5BC6\u7801", rules: [
+                                    { required: true, message: '请输入新密码' },
+                                    {
+                                        pattern: validate.passwordValidate,
+                                        message: commonMessage.passwordMessage,
+                                    },
+                                ] },
+                                React.createElement(Input, { autoComplete: "new-password", type: "password", placeholder: "\u8BF7\u8F93\u5165\u65B0\u5BC6\u7801" })),
+                            React.createElement("div", null,
+                                React.createElement("p", { style: { height: 32, lineHeight: '32px', color: 'red' } }, "\u75319-128\u4F4D\u7684\u5B57\u6BCD+\u6570\u5B57\uFF0C\u5B57\u6BCD+\u7279\u6B8A\u5B57\u7B26\uFF0C\u6570\u5B57+\u7279\u6B8A\u5B57\u7B26\u7EC4\u6210"))),
+                        React.createElement(Item, { name: "newPassword1", label: "\u786E\u8BA4\u65B0\u5BC6\u7801", rules: [
+                                { required: true, message: '请确认密码' },
+                                function (_a) {
+                                    var getFieldValue = _a.getFieldValue;
+                                    return ({
+                                        validator: function (rule, value) {
+                                            if (!value || getFieldValue('newPassword') === value) {
+                                                return Promise.resolve();
+                                            }
+                                            return Promise.reject('两次密码输入不一致');
+                                        },
+                                    });
+                                },
+                            ], dependencies: ['newPassword'] },
+                            React.createElement(Input, { autoComplete: "new-password", type: "password", placeholder: "\u786E\u8BA4\u65B0\u5BC6\u7801" }))))))));
+};
+export default ForgetPassword;

package/dist/components/business/Common/index.d.ts

@@ -1,3 +1,4 @@
 import UserInfo from './UserInfo';
 import UserPassword from './UserPassword';
-export { UserInfo, UserPassword };
+import UserForgetPassword from './UserForgetPassword';
+export { UserInfo, UserPassword, UserForgetPassword };

package/dist/components/business/Common/index.js

@@ -1,3 +1,4 @@
 import UserInfo from './UserInfo';
 import UserPassword from './UserPassword';
-export { UserInfo, UserPassword };
+import UserForgetPassword from './UserForgetPassword';
+export { UserInfo, UserPassword, UserForgetPassword };

package/dist/components/business/GridList/item.d.ts

@@ -3,6 +3,8 @@ import { ColProps } from 'antd/lib/col';
 export interface IProps extends ColProps {
     title: string;
     colon?: boolean;
+    span: number;
+    titleSpan?: number;
 }
 declare const Item: React.FC<IProps>;
 export default Item;

package/dist/components/business/GridList/item.js

@@ -24,12 +24,12 @@ import React from 'react';
 import { Col } from 'antd';
 import classNames from 'classnames';
 var Item = function (_a) {
-    var children = _a.children, className = _a.className, title = _a.title, colon = _a.colon, restProps = __rest(_a, ["children", "className", "title", "colon"]);
+    var children = _a.children, className = _a.className, title = _a.title, colon = _a.colon, span = _a.span, titleSpan = _a.titleSpan, restProps = __rest(_a, ["children", "className", "title", "colon", "span", "titleSpan"]);
     var classes = classNames('zt-grid-item', className);
-    return (React.createElement(Col, __assign({ className: classes }, restProps),
-        React.createElement("span", { className: "zt-grid-item--title" },
+    return (React.createElement(Col, __assign({ className: classes, span: span }, restProps),
+        React.createElement("span", { className: "zt-grid-item--title", style: titleSpan ? { width: (titleSpan / span) * 38 + "%" } : {} },
             title,
             colon && '：'),
-        React.createElement("span", { className: "zt-grid-item--text" }, children)));
+        React.createElement("span", { className: "zt-grid-item--text", style: titleSpan ? { width: 100 - (titleSpan / span) * 38 + "%" } : {} }, children)));
 };
 export default Item;

package/dist/index.js

@@ -1,52 +1,70 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-import { ConfigProvider } from 'antd';
-import zhCN from 'antd/lib/locale/zh_CN';
-import * as dayjs from 'dayjs';
-import zhCn from 'dayjs/locale/zh-cn';
-import { BrowserRouter, Switch, Route, Link } from 'react-router-dom';
-import Demo from './Demo';
-import TreeSelectDemo from './TreeSelectDemo';
-import TreeDemo from './TreeDemo';
-import UploadDemo from './UploadDemo';
-import CollapseDemo from './DemoCom/CollapseDemo';
-import TimelineDemo from './DemoCom/TimelineDemo';
-import WeChatDemo from './DemoCom/WechatDemo';
-dayjs.locale(zhCn);
-ReactDOM.render(
-// <React.StrictMode>
-React.createElement(ConfigProvider, { locale: zhCN },
-    React.createElement(BrowserRouter, null,
-        React.createElement(Switch, null,
-            React.createElement(Route, { exact: true, path: "/" },
-                React.createElement(App, null)),
-            React.createElement(Route, { exact: true, path: "/select" },
-                React.createElement(Demo, null)),
-            React.createElement(Route, { exact: true, path: "/tree-select" },
-                React.createElement(TreeSelectDemo, null)),
-            React.createElement(Route, { exact: true, path: "/tree" },
-                React.createElement(TreeDemo, null)),
-            React.createElement(Route, { exact: true, path: "/upload" },
-                React.createElement(UploadDemo, null)),
-            React.createElement(Route, { exact: true, path: "/collapse" },
-                React.createElement(CollapseDemo, null)),
-            React.createElement(Route, { exact: true, path: "/timeline" },
-                React.createElement(TimelineDemo, null)),
-            React.createElement(Route, { exact: true, path: "/wechat" },
-                React.createElement(WeChatDemo, null)),
-            React.createElement(Route, { exact: true, path: "/test" },
-                React.createElement("div", null,
-                    React.createElement("h1", null,
-                        React.createElement(Link, { to: "/select" }, "select")),
-                    React.createElement("h1", null,
-                        React.createElement(Link, { to: "/tree-select" }, "tree select")),
-                    React.createElement("h1", null,
-                        React.createElement(Link, { to: "/tree" }, "tree")),
-                    React.createElement("h1", null,
-                        React.createElement(Link, { to: "/upload" }, "upload"))))))), 
-// </React.StrictMode>,
-document.getElementById('root'));
+// import React from 'react';
+// import ReactDOM from 'react-dom';
+// import App from './App';
+// import { ConfigProvider } from 'antd';
+// import zhCN from 'antd/lib/locale/zh_CN';
+// import * as dayjs from 'dayjs';
+// import zhCn from 'dayjs/locale/zh-cn';
+// import { BrowserRouter, Switch, Route, Link } from 'react-router-dom';
+// import Demo from './Demo';
+// import TreeSelectDemo from './TreeSelectDemo';
+// import TreeDemo from './TreeDemo';
+// import UploadDemo from './UploadDemo';
+// import CollapseDemo from './DemoCom/CollapseDemo';
+// import TimelineDemo from './DemoCom/TimelineDemo';
+// import WeChatDemo from './DemoCom/WechatDemo';
+// dayjs.locale(zhCn);
+// ReactDOM.render(
+//   // <React.StrictMode>
+//   <ConfigProvider locale={zhCN}>
+//     <BrowserRouter>
+//       <Switch>
+//         <Route exact path="/">
+//           <App />
+//         </Route>
+//         <Route exact path="/select">
+//           <Demo />
+//         </Route>
+//         <Route exact path="/tree-select">
+//           <TreeSelectDemo />
+//         </Route>
+//         <Route exact path="/tree">
+//           <TreeDemo />
+//         </Route>
+//         <Route exact path="/upload">
+//           <UploadDemo />
+//         </Route>
+//         <Route exact path="/collapse">
+//           <CollapseDemo />
+//         </Route>
+//         <Route exact path="/timeline">
+//           <TimelineDemo />
+//         </Route>
+//         <Route exact path="/wechat">
+//           <WeChatDemo />
+//         </Route>
+//         <Route exact path="/test">
+//           <div>
+//             <h1>
+//               <Link to="/select">select</Link>
+//             </h1>
+//             <h1>
+//               <Link to="/tree-select">tree select</Link>
+//             </h1>
+//             <h1>
+//               <Link to="/tree">tree</Link>
+//             </h1>
+//             <h1>
+//               <Link to="/upload">upload</Link>
+//             </h1>
+//           </div>
+//         </Route>
+//       </Switch>
+//     </BrowserRouter>
+//   </ConfigProvider>,
+//   // </React.StrictMode>,
+//   document.getElementById('root')
+// );
 export { default as Button } from './components/Button';
 export { default as Calendar } from './components/Calendar';
 export { default as Checkbox } from './components/Checkbox';

package/package.json

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