zmdms-webui 1.1.2 → 1.1.3

package/dist/es/login/forget-password.js

@@ -10,7 +10,7 @@ import { message } from 'antd';
 
 var countDownMaxTime = 10;
 var ForgetPassword = function (_a) {
-    var checkUserPhone = _a.checkUserPhone, sendCode = _a.sendCode, submitRequest = _a.submitRequest;
+    var checkUserPhone = _a.checkUserPhone, sendCode = _a.sendCode, submitRequest = _a.submitRequest, open = _a.open, setOpen = _a.setOpen;
     var form = MemoForm.useForm()[0];
     var _b = useCountDwon(), countDown = _b[0], setCountDown = _b[1];
     /**发送短信验证码 */
@@ -169,13 +169,16 @@ var ForgetPassword = function (_a) {
             }
         });
     }); }, [form]);
-    return (jsx(ModalComponent, __assign({ title: "\u5FD8\u8BB0\u5BC6\u7801", width: "80%", forceRender: true, onOkValidate: onOkValidate, okText: "\u786E\u8BA4\u4FEE\u6539", onOk: function () {
+    return (jsx(ModalComponent, __assign({ title: "\u5FD8\u8BB0\u5BC6\u7801", width: "80%", forceRender: true, onOkValidate: onOkValidate, okText: "\u786E\u8BA4\u4FEE\u6539", cancelText: "\u53D6\u6D88", onCancel: function () {
+            setOpen(false);
+        }, onOk: function () {
             var params = form.getFieldsValue();
             return submitRequest(params)
                 .then(function (res) {
                 var _a = res.data, msg = _a.msg, code = _a.code;
                 if (code === 200) {
                     message.success(msg || "密码修改成功!");
+                    setOpen(false);
                 }
                 else {
                     message.warning(msg || "密码修改失败!");
@@ -185,7 +188,7 @@ var ForgetPassword = function (_a) {
                 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) || "密码修改失败!");
             });
-        }, open: true }, { children: jsx(MemoForm, { form: form, items: items, type: "list", directionColumn: true }) })));
+        }, open: open }, { children: jsx(MemoForm, { form: form, items: items, type: "list", directionColumn: true }) })));
 };
 function useCountDwon() {
     var _a = useState(countDownMaxTime), countDown = _a[0], setCountDown = _a[1];

package/dist/es/login/index.d.ts

@@ -11,6 +11,9 @@ interface IProps {
     onFinishHandle?: (values: any) => void;
     loading?: boolean;
     customRender?: (props: ILoginChildrenProps) => React__default.ReactElement;
+    checkUserPhone?: any;
+    sendCode?: any;
+    submitRequest?: any;
 }
 interface ILoginChildrenProps {
     form: FormInstance<any>;

package/dist/es/login/index.js

@@ -1,6 +1,6 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { Form, Checkbox } from 'antd';
 import { decrypt, encrypt } from './utils.js';
 import ForgetPassword from './forget-password.js';
@@ -14,7 +14,8 @@ var USERNAME_KEY = "PUsvG";
 var USERPWS_KEY = "kVhfO";
 var KEY = "simide";
 var Login = function (props) {
-    var loginLogo = props.loginLogo, loginBg = props.loginBg, onFinishHandle = props.onFinishHandle, loading = props.loading, customRender = props.customRender;
+    var loginLogo = props.loginLogo, loginBg = props.loginBg, onFinishHandle = props.onFinishHandle, loading = props.loading, customRender = props.customRender, checkUserPhone = props.checkUserPhone, sendCode = props.sendCode, submitRequest = props.submitRequest;
+    var _a = useState(false), open = _a[0], setOpen = _a[1];
     var form = Form.useForm()[0];
     useEffect(function () {
         var localData = localStorage.getItem(LOCAL_KEY);
@@ -62,7 +63,9 @@ var Login = function (props) {
                             required: true,
                             message: "请输入您的密码",
                         },
-                    ] }, { children: jsx(MemoInput.Password, { size: "large", autoComplete: "current-password", prefix: jsx(IconFont, { type: "icon-mima", style: { fontSize: "14px", color: "rgba(0,0,0,.65)" } }) }) })), jsx(Item, { children: jsx(ButtonCom, __assign({ htmlType: "submit", block: true, className: "form__item--button", loading: loading }, { children: "\u767B\u5F55" })) }), jsxs("div", __assign({ className: "form__item--remember" }, { children: [jsx(Item, __assign({ name: "remember", valuePropName: "checked" }, { children: jsx(Checkbox, { children: "\u8BB0\u4F4F\u5BC6\u7801" }) })), jsx("div", __assign({ className: "form__item--remember-forget" }, { children: "\u5FD8\u8BB0\u5BC6\u7801" }))] })), jsx(ForgetPassword, {})] })) })));
+                    ] }, { children: jsx(MemoInput.Password, { size: "large", autoComplete: "current-password", prefix: jsx(IconFont, { type: "icon-mima", style: { fontSize: "14px", color: "rgba(0,0,0,.65)" } }) }) })), jsx(Item, { children: jsx(ButtonCom, __assign({ htmlType: "submit", block: true, className: "form__item--button", loading: loading }, { children: "\u767B\u5F55" })) }), jsxs("div", __assign({ className: "form__item--remember" }, { children: [jsx(Item, __assign({ name: "remember", valuePropName: "checked" }, { children: jsx(Checkbox, { children: "\u8BB0\u4F4F\u5BC6\u7801" }) })), jsx("div", __assign({ className: "form__item--remember-forget", onClick: function () {
+                                setOpen(true);
+                            } }, { children: "\u5FD8\u8BB0\u5BC6\u7801" }))] })), jsx(ForgetPassword, { open: open, setOpen: setOpen, checkUserPhone: checkUserPhone, sendCode: sendCode, submitRequest: submitRequest })] })) })));
 };
 Login.displayName = "ZTXK_WEBUI_Login";
 

package/dist/es/select/hooks.js

@@ -78,7 +78,7 @@ function createRenderItem(item, options) {
     };
 }
 function useRenderChildren(props) {
-    var list = props.list, defaultList = props.defaultList, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, joinStr = props.joinStr, lineFeedKey = props.lineFeedKey, lineFeedStr = props.lineFeedStr, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues, isDisabled = props.isDisabled, createKey = props.createKey, createId = props.createId;
+    var list = props.list, defaultList = props.defaultList, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, joinStr = props.joinStr, lineFeedKey = props.lineFeedKey, lineFeedStr = props.lineFeedStr, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues, createKey = props.createKey, createId = props.createId;
     var resultList = useMemo(function () {
         return concatHandle(list, {
             arr2: defaultList,
@@ -113,9 +113,6 @@ function useRenderChildren(props) {
                             disabledValues.includes(value)) {
                             disabled = true;
                         }
-                        if (isDisabled) {
-                            disabled = isDisabled(item, index, resultList);
-                        }
                         return (jsxs(MemoSelect.Option, __assign({ 
                             // key={key}
                             value: value, 

package/dist/es/select/interface.d.ts

@@ -48,13 +48,9 @@ interface ISelectProps extends SelectProps {
      */
     showAll?: boolean;
     /**
-     * 禁用的选项列表 一个dataKey列表
+     * 禁用的选项列表
      */
     disabledValues?: string[];
-    /**
-     * 是否禁用
-     */
-    isDisabled?: (item: any, index: number, allList: any) => boolean;
     /**
      * 代理onChange方法
      */

package/dist/es/select/select.js

@@ -24,7 +24,7 @@ function textContent(children) {
     return "";
 }
 var Select = function (props, ref) {
-    var list = props.list, defaultList = props.defaultList, createKey = props.createKey, createId = props.createId, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, _c = props.joinStr, joinStr = _c === void 0 ? "-" : _c, lineFeedKey = props.lineFeedKey, _d = props.lineFeedStr, lineFeedStr = _d === void 0 ? "-" : _d, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues, isDisabled = props.isDisabled, _e = props.dropdownMatchSelectWidth, dropdownMatchSelectWidth = _e === void 0 ? 100 : _e, onChange = props.onChange, onSearch = props.onSearch, isRemoteSearch = props.isRemoteSearch, dropdownButton = props.dropdownButton, dropdownRender = props.dropdownRender, resetProps = __rest(props, ["list", "defaultList", "createKey", "createId", "dataKey", "titleKey", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "showAll", "children", "disabledValues", "isDisabled", "dropdownMatchSelectWidth", "onChange", "onSearch", "isRemoteSearch", "dropdownButton", "dropdownRender"]);
+    var list = props.list, defaultList = props.defaultList, createKey = props.createKey, createId = props.createId, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, _c = props.joinStr, joinStr = _c === void 0 ? "-" : _c, lineFeedKey = props.lineFeedKey, _d = props.lineFeedStr, lineFeedStr = _d === void 0 ? "-" : _d, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues, _e = props.dropdownMatchSelectWidth, dropdownMatchSelectWidth = _e === void 0 ? 100 : _e, onChange = props.onChange, onSearch = props.onSearch, isRemoteSearch = props.isRemoteSearch, dropdownButton = props.dropdownButton, dropdownRender = props.dropdownRender, resetProps = __rest(props, ["list", "defaultList", "createKey", "createId", "dataKey", "titleKey", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "showAll", "children", "disabledValues", "dropdownMatchSelectWidth", "onChange", "onSearch", "isRemoteSearch", "dropdownButton", "dropdownRender"]);
     // 记录当前选中项 只有当多选模式下 才需要用到这个选项
     var _f = useRemeberCheckedValues(), parseCheckedValues = _f.parseCheckedValues, currentCheckedValuesRef = _f.currentCheckedValuesRef;
     /**
@@ -42,7 +42,6 @@ var Select = function (props, ref) {
         showAll: showAll,
         children: children,
         disabledValues: disabledValues,
-        isDisabled: isDisabled,
         value: resetProps.value,
         mode: resetProps.mode,
         createKey: createKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -139,4 +139,4 @@
     "screenfull": "^6.0.2",
     "virtuallist-antd": "^0.8.0-beta.1"
   }
-}
+}