@bchr/bchr-front-lib 0.6.2 → 0.6.3

package/lib/base/layout/ui_tpl/consts.js

@@ -7,6 +7,7 @@ exports.UI_RENDER_TYPE = exports.EXPORT_GRID_HEADER_CELL_OPTIONS = exports.EXPOR
 var UI_RENDER_TYPE = exports.UI_RENDER_TYPE = {
   INPUT: "input",
   INPUT_PASSWORD: "inputPassword",
+  INPUT_PASSWORD_DECRYPT: "inputPasswordDecrypt",
   INPUT_NUMBER: "inputNumber",
   TEXT_AREA: "textArea",
   DATE: "date",

package/lib/base/layout/ui_tpl/form/FormForBrowse.js

@@ -10,6 +10,7 @@ var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _moment = _interopRequireDefault(require("moment"));
 var _consts = require("../consts");
+var _InputPassword = _interopRequireDefault(require("../InputPassword"));
 var _InputPasswordDecrypt = _interopRequireDefault(require("../InputPasswordDecrypt"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -289,6 +290,7 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
           case _consts.UI_RENDER_TYPE.INPUT:
           case _consts.UI_RENDER_TYPE.INPUT_NUMBER:
           case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+          case _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
           case _consts.UI_RENDER_TYPE.TEXT_AREA:
           case _consts.UI_RENDER_TYPE.SELECT:
           case _consts.UI_RENDER_TYPE.TREE_SELECT:
@@ -320,6 +322,12 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
         }
         components = /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, value));
         if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD) {
+          components = /*#__PURE__*/_react["default"].createElement("div", null, initialValues[code] && /*#__PURE__*/_react["default"].createElement(_InputPassword["default"], {
+            ui_render_type: 'browse',
+            initValue: initialValues[code]
+          }));
+        }
+        if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT) {
           components = /*#__PURE__*/_react["default"].createElement("div", null, initialValues[code] && /*#__PURE__*/_react["default"].createElement(_InputPasswordDecrypt["default"], {
             ui_render_type: 'browse',
             initValue: initialValues[code],

package/lib/base/layout/ui_tpl/form/FormForModify.js

@@ -11,6 +11,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _consts = require("../consts");
 var _zh_CN = _interopRequireDefault(require("antd/es/locale/zh_CN"));
 var _HttpService = _interopRequireDefault(require("../../../../services/HttpService"));
+var _InputPassword = _interopRequireDefault(require("../InputPassword"));
 var _InputPasswordDecrypt = _interopRequireDefault(require("../InputPasswordDecrypt"));
 require("../../../AppFormulaFunctions");
 var _BaseAppUtils = require("../../../BaseAppUtils");
@@ -330,6 +331,18 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
             }, ext_props));
             break;
           case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+            component = b_readonly || _this2.disabledExpression(dataItem, data) ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_InputPassword["default"], {
+              ui_render_type: 'browse',
+              initValue: displayValue
+            })) : /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
+              key: form_id + "_" + code,
+              placeholder: "请填写" + name,
+              allowClear: true,
+              maxLength: field_length && field_length > 0 ? field_length : null,
+              onChange: _this2.inputOnChange.bind(_this2, dataItem, onChange)
+            }, ext_props));
+            break;
+          case _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
             component = b_readonly || _this2.disabledExpression(dataItem, data) ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_InputPasswordDecrypt["default"], {
               ui_render_type: 'browse',
               initValue: displayValue,
@@ -848,7 +861,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         return Promise.resolve();
       } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_NUMBER) {
         return value != null ? Promise.resolve() : Promise.reject("validate fail");
-      } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT || ui_render_type === _consts.UI_RENDER_TYPE.TEXT_AREA || ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD) {
+      } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT || ui_render_type === _consts.UI_RENDER_TYPE.TEXT_AREA || ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD || ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT) {
         if (!value) {
           return Promise.reject("validate fail");
         } else {
@@ -1222,6 +1235,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         case _consts.UI_RENDER_TYPE.INPUT:
         case _consts.UI_RENDER_TYPE.INPUT_NUMBER:
         case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+        case _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
         case _consts.UI_RENDER_TYPE.TEXT_AREA:
         case _consts.UI_RENDER_TYPE.TREE_SELECT:
           value = formItemValue;

package/lib/base/layout/ui_tpl/grid/GridForBrowse.js

@@ -14,6 +14,7 @@ var _consts = require("../consts");
 var _GridFilterRowIndicator = _interopRequireDefault(require("./GridFilterRowIndicator"));
 var _zh_CN = _interopRequireDefault(require("antd/es/locale/zh_CN"));
 var _GridColumnCustomToolBar = _interopRequireDefault(require("./GridColumnCustomToolBar"));
+var _InputPassword = _interopRequireDefault(require("../InputPassword"));
 var _InputPasswordDecrypt = _interopRequireDefault(require("../InputPasswordDecrypt"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -202,6 +203,7 @@ var GridForBrowse = /*#__PURE__*/function (_React$Component) {
               switch (ui_render_type) {
                 case _consts.UI_RENDER_TYPE.INPUT:
                 case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+                case _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
                 case _consts.UI_RENDER_TYPE.SELECT:
                 case _consts.UI_RENDER_TYPE.TREE_SELECT:
                 case _consts.UI_RENDER_TYPE.UPLOAD:
@@ -527,6 +529,7 @@ var GridForBrowse = /*#__PURE__*/function (_React$Component) {
       switch (ui_render_type) {
         case _consts.UI_RENDER_TYPE.INPUT:
         case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+        case _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
         case _consts.UI_RENDER_TYPE.INPUT_NUMBER:
         case _consts.UI_RENDER_TYPE.SELECT:
         case _consts.UI_RENDER_TYPE.TREE_SELECT:
@@ -567,7 +570,7 @@ var GridForBrowse = /*#__PURE__*/function (_React$Component) {
           className: "form-item-control-input-ext-icon",
           onClick: this.downloadOnClick.bind(this, dataItem[code])
         }) : null, value);
-      } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD) {
+      } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD || ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT) {
         return /*#__PURE__*/_react["default"].createElement("td", {
           className: props.className,
           style: grid_default_locked ? {
@@ -584,7 +587,10 @@ var GridForBrowse = /*#__PURE__*/function (_React$Component) {
           dangerouslySetInnerHTML: {
             __html: column_value_prefix
           }
-        }), dataItem[code] ? /*#__PURE__*/_react["default"].createElement(_InputPasswordDecrypt["default"], {
+        }), dataItem[code] ? ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD ? /*#__PURE__*/_react["default"].createElement(_InputPassword["default"], {
+          ui_render_type: 'browse',
+          initValue: dataItem[code]
+        }) : /*#__PURE__*/_react["default"].createElement(_InputPasswordDecrypt["default"], {
           ui_render_type: 'browse',
           initValue: dataItem[code],
           maskLength: this.props.maskLength,

package/lib/base/layout/ui_tpl/grid/GridForModify.js

@@ -286,6 +286,15 @@ var GridForModify = /*#__PURE__*/function (_React$Component) {
           }));
           break;
         case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+          component = /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+            title: dataItem[code],
+            placeholder: "请填写" + name,
+            defaultValue: dataItem[code],
+            allowClear: true,
+            onChange: this.inputOnChange.bind(this, dataItem, fieldConfig, onChange)
+          });
+          break;
+        case _consts.UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
           component = /*#__PURE__*/_react["default"].createElement(_InputPasswordDecrypt["default"], {
             ui_render_type: 'modify',
             initValue: dataItem[code],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/layout/ui_tpl/InputPasswordDecrypt.js

@@ -1,262 +1,262 @@
-import React, {Fragment, useEffect, useRef, useState} from "react";
-import {Input, message} from "antd";
-import HttpService from "../../../services/HttpService";
-
-const MASK_LENGTH = 8;
-
-const normalizeValue = (value) => {
-    if (value === null || value === undefined) {
-        return "";
-    }
-    return String(value);
-};
-
-const maskValue = (value, maskLength) => {
-    if (value === null || value === undefined || value === "") {
-        return "";
-    }
-    return "*".repeat(maskLength);
-};
-
-const limitText = (text, maxLength) => {
-    if (typeof maxLength === "number" && maxLength > 0 && text.length > maxLength) {
-        return text.slice(0, maxLength);
-    }
-    return text;
-};
-
-const InputPasswordDecrypt = (props) => {
-    let {
-        ui_render_type,
-        initValue,
-        value,
-        onChange,
-        requestUrl,
-        appconfig,
-        appConfig,
-        maskLength,
-        placeholder,
-        maxLength,
-        allowClear = true,
-        onKeyDown,
-        onPaste,
-        ...restInputProps
-    } = props;
-    const resolvedMaskLength = Number.isInteger(maskLength) && maskLength > 0 ? maskLength : MASK_LENGTH;
-    const serviceConfig = appconfig || appConfig;
-    const incomingValue = normalizeValue(value !== undefined ? value : initValue);
-    const [realValue, setRealValue] = useState(incomingValue);
-    const [toggle, setToggle] = useState(false);
-    const [toggleVal, setToggleVal] = useState(maskValue(initValue, resolvedMaskLength));
-    const [loading, setLoading] = useState(false);
-    const timerRef = useRef(null);
-    const requestSeqRef = useRef(0);
-    const realValueRef = useRef(incomingValue);
-    const originalRef = useRef(incomingValue);
-    const emittedRef = useRef(incomingValue);
-    const editingRef = useRef(false);
-    const maskLengthRef = useRef(resolvedMaskLength);
-
-    realValueRef.current = ui_render_type === "modify" ? realValue : normalizeValue(initValue);
-    maskLengthRef.current = resolvedMaskLength;
-
-    const clearHideTimer = () => {
-        if (timerRef.current) {
-            clearTimeout(timerRef.current);
-            timerRef.current = null;
-        }
-    };
-
-    const hidePlainText = () => {
-        clearHideTimer();
-        setToggleVal(maskValue(realValueRef.current, maskLengthRef.current));
-        setToggle(false);
-    };
-
-    const showPlainText = (plainText) => {
-        clearHideTimer();
-        setToggleVal(plainText);
-        setToggle(true);
-        timerRef.current = setTimeout(() => {
-            timerRef.current = null;
-            setToggleVal(maskValue(realValueRef.current, maskLengthRef.current));
-            setToggle(false);
-        }, 5000);
-    };
-
-    useEffect(() => {
-        return () => {
-            requestSeqRef.current += 1;
-            clearHideTimer();
-        };
-    }, []);
-
-    useEffect(() => {
-        if (ui_render_type === "modify") {
-            return undefined;
-        }
-        setToggle(false);
-        setToggleVal(maskValue(initValue, resolvedMaskLength));
-        setLoading(false);
-        return () => {
-            requestSeqRef.current += 1;
-            clearHideTimer();
-        };
-    }, [ui_render_type, initValue, resolvedMaskLength]);
-
-    useEffect(() => {
-        if (ui_render_type !== "modify" || incomingValue === emittedRef.current) {
-            return undefined;
-        }
-        emittedRef.current = incomingValue;
-        originalRef.current = incomingValue;
-        editingRef.current = false;
-        realValueRef.current = incomingValue;
-        setRealValue(incomingValue);
-        requestSeqRef.current += 1;
-        clearHideTimer();
-        setToggle(false);
-        setToggleVal(maskValue(incomingValue, resolvedMaskLength));
-        setLoading(false);
-    }, [ui_render_type, incomingValue, resolvedMaskLength]);
-
-    const commitValue = (nextValue, reveal) => {
-        const normalized = limitText(normalizeValue(nextValue), maxLength);
-        emittedRef.current = normalized;
-        editingRef.current = true;
-        realValueRef.current = normalized;
-        setRealValue(normalized);
-        if (reveal) {
-            showPlainText(normalized);
-        }
-        if (onChange) {
-            onChange({target: {value: normalized}});
-        }
-    };
-
-    const onToggleFull = async () => {
-        if (toggle) {
-            hidePlainText();
-            return;
-        }
-        if (loading) {
-            return;
-        }
-
-        const secret = realValueRef.current;
-        if (ui_render_type === "modify" && (secret === "" || editingRef.current || secret !== originalRef.current)) {
-            if (secret === "") {
-                return;
-            }
-            showPlainText(secret);
-            return;
-        }
-        if (!secret) {
-            return;
-        }
-        if (!requestUrl) {
-            message.error("请为组件注入属性【requestUrl】");
-            return;
-        }
-        if (!serviceConfig) {
-            message.error("请为组件注入属性【appconfig】");
-            return;
-        }
-
-        const requestSeq = requestSeqRef.current + 1;
-        requestSeqRef.current = requestSeq;
-        setLoading(true);
-        try {
-            const result = await new HttpService(requestUrl, serviceConfig).post("decrypt", {data: secret});
-            if (requestSeq !== requestSeqRef.current) {
-                return;
-            }
-            if (typeof result !== "string") {
-                message.error("解密失败");
-                return;
-            }
-            showPlainText(result);
-        } catch (error) {
-            if (requestSeq !== requestSeqRef.current) {
-                return;
-            }
-            if (error && error.responseJSON && error.responseJSON.msg) {
-                message.error(error.responseJSON.msg);
-            } else {
-                message.error("解密失败");
-            }
-        } finally {
-            if (requestSeq === requestSeqRef.current) {
-                setLoading(false);
-            }
-        }
-    };
-
-    const onModifyKeyDown = (event) => {
-        if (onKeyDown) {
-            onKeyDown(event);
-        }
-        if (toggle || event.defaultPrevented || event.ctrlKey || event.metaKey || event.altKey || event.isComposing) {
-            return;
-        }
-        if (event.key === "Backspace" || event.key === "Delete") {
-            event.preventDefault();
-            commitValue("", false);
-            return;
-        }
-        if (event.key.length !== 1) {
-            return;
-        }
-        event.preventDefault();
-        const nextValue = editingRef.current ? realValueRef.current + event.key : event.key;
-        commitValue(nextValue, false);
-    };
-
-    const onModifyPaste = (event) => {
-        if (onPaste) {
-            onPaste(event);
-        }
-        if (toggle || event.defaultPrevented) {
-            return;
-        }
-        const text = event.clipboardData ? event.clipboardData.getData("text") : "";
-        event.preventDefault();
-        if (!text) {
-            return;
-        }
-        const nextValue = editingRef.current ? realValueRef.current + text : text;
-        commitValue(nextValue, false);
-    };
-
-    const onModifyChange = (event) => {
-        const nextValue = event.target.value;
-        if (!toggle) {
-            if (nextValue === "") {
-                commitValue("", false);
-            }
-            return;
-        }
-        commitValue(nextValue, true);
-    };
-
-    if (ui_render_type === "modify") {
-        const modifyDisplay = toggle ? toggleVal : maskValue(realValue, resolvedMaskLength);
-        return <Input
-            {...restInputProps}
-            value={modifyDisplay}
-            placeholder={placeholder}
-            allowClear={allowClear}
-            maxLength={toggle && typeof maxLength === "number" ? maxLength : undefined}
-            onChange={onModifyChange}
-            onKeyDown={onModifyKeyDown}
-            onPaste={onModifyPaste}
-            addonAfter={<span className={`iconfont ${toggle ? "icon-bchr-show" : "icon-bchr-hide"}`} style={{cursor: "pointer"}} onClick={onToggleFull}/>}
-        />;
-    } else if (ui_render_type === "browse") {
-        return <Fragment>
-            <span>{toggleVal}<span className={`iconfont ${toggle ? "icon-bchr-show" : "icon-bchr-hide"}`} style={{cursor: "pointer", margin: "0 5px", color: "#337DB7", fontWeight: "bolder"}} onClick={onToggleFull}/></span>
-        </Fragment>;
-    }
-};
-
-export default InputPasswordDecrypt;
+import React, {Fragment, useEffect, useRef, useState} from "react";
+import {Input, message} from "antd";
+import HttpService from "../../../services/HttpService";
+
+const MASK_LENGTH = 8;
+
+const normalizeValue = (value) => {
+    if (value === null || value === undefined) {
+        return "";
+    }
+    return String(value);
+};
+
+const maskValue = (value, maskLength) => {
+    if (value === null || value === undefined || value === "") {
+        return "";
+    }
+    return "*".repeat(maskLength);
+};
+
+const limitText = (text, maxLength) => {
+    if (typeof maxLength === "number" && maxLength > 0 && text.length > maxLength) {
+        return text.slice(0, maxLength);
+    }
+    return text;
+};
+
+const InputPasswordDecrypt = (props) => {
+    let {
+        ui_render_type,
+        initValue,
+        value,
+        onChange,
+        requestUrl,
+        appconfig,
+        appConfig,
+        maskLength,
+        placeholder,
+        maxLength,
+        allowClear = true,
+        onKeyDown,
+        onPaste,
+        ...restInputProps
+    } = props;
+    const resolvedMaskLength = Number.isInteger(maskLength) && maskLength > 0 ? maskLength : MASK_LENGTH;
+    const serviceConfig = appconfig || appConfig;
+    const incomingValue = normalizeValue(value !== undefined ? value : initValue);
+    const [realValue, setRealValue] = useState(incomingValue);
+    const [toggle, setToggle] = useState(false);
+    const [toggleVal, setToggleVal] = useState(maskValue(initValue, resolvedMaskLength));
+    const [loading, setLoading] = useState(false);
+    const timerRef = useRef(null);
+    const requestSeqRef = useRef(0);
+    const realValueRef = useRef(incomingValue);
+    const originalRef = useRef(incomingValue);
+    const emittedRef = useRef(incomingValue);
+    const editingRef = useRef(false);
+    const maskLengthRef = useRef(resolvedMaskLength);
+
+    realValueRef.current = ui_render_type === "modify" ? realValue : normalizeValue(initValue);
+    maskLengthRef.current = resolvedMaskLength;
+
+    const clearHideTimer = () => {
+        if (timerRef.current) {
+            clearTimeout(timerRef.current);
+            timerRef.current = null;
+        }
+    };
+
+    const hidePlainText = () => {
+        clearHideTimer();
+        setToggleVal(maskValue(realValueRef.current, maskLengthRef.current));
+        setToggle(false);
+    };
+
+    const showPlainText = (plainText) => {
+        clearHideTimer();
+        setToggleVal(plainText);
+        setToggle(true);
+        timerRef.current = setTimeout(() => {
+            timerRef.current = null;
+            setToggleVal(maskValue(realValueRef.current, maskLengthRef.current));
+            setToggle(false);
+        }, 5000);
+    };
+
+    useEffect(() => {
+        return () => {
+            requestSeqRef.current += 1;
+            clearHideTimer();
+        };
+    }, []);
+
+    useEffect(() => {
+        if (ui_render_type === "modify") {
+            return undefined;
+        }
+        setToggle(false);
+        setToggleVal(maskValue(initValue, resolvedMaskLength));
+        setLoading(false);
+        return () => {
+            requestSeqRef.current += 1;
+            clearHideTimer();
+        };
+    }, [ui_render_type, initValue, resolvedMaskLength]);
+
+    useEffect(() => {
+        if (ui_render_type !== "modify" || incomingValue === emittedRef.current) {
+            return undefined;
+        }
+        emittedRef.current = incomingValue;
+        originalRef.current = incomingValue;
+        editingRef.current = false;
+        realValueRef.current = incomingValue;
+        setRealValue(incomingValue);
+        requestSeqRef.current += 1;
+        clearHideTimer();
+        setToggle(false);
+        setToggleVal(maskValue(incomingValue, resolvedMaskLength));
+        setLoading(false);
+    }, [ui_render_type, incomingValue, resolvedMaskLength]);
+
+    const commitValue = (nextValue, reveal) => {
+        const normalized = limitText(normalizeValue(nextValue), maxLength);
+        emittedRef.current = normalized;
+        editingRef.current = true;
+        realValueRef.current = normalized;
+        setRealValue(normalized);
+        if (reveal) {
+            showPlainText(normalized);
+        }
+        if (onChange) {
+            onChange({target: {value: normalized}});
+        }
+    };
+
+    const onToggleFull = async () => {
+        if (toggle) {
+            hidePlainText();
+            return;
+        }
+        if (loading) {
+            return;
+        }
+
+        const secret = realValueRef.current;
+        if (ui_render_type === "modify" && (secret === "" || editingRef.current || secret !== originalRef.current)) {
+            if (secret === "") {
+                return;
+            }
+            showPlainText(secret);
+            return;
+        }
+        if (!secret) {
+            return;
+        }
+        if (!requestUrl) {
+            message.error("请为组件注入属性【requestUrl】");
+            return;
+        }
+        if (!serviceConfig) {
+            message.error("请为组件注入属性【appconfig】");
+            return;
+        }
+
+        const requestSeq = requestSeqRef.current + 1;
+        requestSeqRef.current = requestSeq;
+        setLoading(true);
+        try {
+            const result = await new HttpService(requestUrl, serviceConfig).post("decrypt", {data: secret});
+            if (requestSeq !== requestSeqRef.current) {
+                return;
+            }
+            if (typeof result !== "string") {
+                message.error("解密失败");
+                return;
+            }
+            showPlainText(result);
+        } catch (error) {
+            if (requestSeq !== requestSeqRef.current) {
+                return;
+            }
+            if (error && error.responseJSON && error.responseJSON.msg) {
+                message.error(error.responseJSON.msg);
+            } else {
+                message.error("解密失败");
+            }
+        } finally {
+            if (requestSeq === requestSeqRef.current) {
+                setLoading(false);
+            }
+        }
+    };
+
+    const onModifyKeyDown = (event) => {
+        if (onKeyDown) {
+            onKeyDown(event);
+        }
+        if (toggle || event.defaultPrevented || event.ctrlKey || event.metaKey || event.altKey || event.isComposing) {
+            return;
+        }
+        if (event.key === "Backspace" || event.key === "Delete") {
+            event.preventDefault();
+            commitValue("", false);
+            return;
+        }
+        if (event.key.length !== 1) {
+            return;
+        }
+        event.preventDefault();
+        const nextValue = editingRef.current ? realValueRef.current + event.key : event.key;
+        commitValue(nextValue, false);
+    };
+
+    const onModifyPaste = (event) => {
+        if (onPaste) {
+            onPaste(event);
+        }
+        if (toggle || event.defaultPrevented) {
+            return;
+        }
+        const text = event.clipboardData ? event.clipboardData.getData("text") : "";
+        event.preventDefault();
+        if (!text) {
+            return;
+        }
+        const nextValue = editingRef.current ? realValueRef.current + text : text;
+        commitValue(nextValue, false);
+    };
+
+    const onModifyChange = (event) => {
+        const nextValue = event.target.value;
+        if (!toggle) {
+            if (nextValue === "") {
+                commitValue("", false);
+            }
+            return;
+        }
+        commitValue(nextValue, true);
+    };
+
+    if (ui_render_type === "modify") {
+        const modifyDisplay = toggle ? toggleVal : maskValue(realValue, resolvedMaskLength);
+        return <Input
+            {...restInputProps}
+            value={modifyDisplay}
+            placeholder={placeholder}
+            allowClear={allowClear}
+            maxLength={toggle && typeof maxLength === "number" ? maxLength : undefined}
+            onChange={onModifyChange}
+            onKeyDown={onModifyKeyDown}
+            onPaste={onModifyPaste}
+            addonAfter={<span className={`iconfont ${toggle ? "icon-bchr-show" : "icon-bchr-hide"}`} style={{cursor: "pointer"}} onClick={onToggleFull}/>}
+        />;
+    } else if (ui_render_type === "browse") {
+        return <Fragment>
+            <span>{toggleVal}<span className={`iconfont ${toggle ? "icon-bchr-show" : "icon-bchr-hide"}`} style={{cursor: "pointer", margin: "0 5px", color: "#337DB7", fontWeight: "bolder"}} onClick={onToggleFull}/></span>
+        </Fragment>;
+    }
+};
+
+export default InputPasswordDecrypt;

package/src/base/layout/ui_tpl/consts.js

@@ -1,6 +1,7 @@
 const UI_RENDER_TYPE = {
     INPUT: "input",
     INPUT_PASSWORD: "inputPassword",
+    INPUT_PASSWORD_DECRYPT: "inputPasswordDecrypt",
     INPUT_NUMBER: "inputNumber",
     TEXT_AREA: "textArea",
     DATE: "date",

package/src/base/layout/ui_tpl/form/FormForBrowse.js

@@ -4,6 +4,7 @@ import {Badge, Col, ConfigProvider, Form, Row, Tooltip} from "antd";
 import {DownloadOutlined, QuestionCircleOutlined} from '@ant-design/icons';
 import moment from "moment";
 import {UI_RENDER_TYPE} from "../consts";
+import InputPassword from "../InputPassword";
 import InputPasswordDecrypt from "../InputPasswordDecrypt";
 
 class FormForBrowse extends React.Component{
@@ -318,6 +319,7 @@ class FormForBrowse extends React.Component{
                 case UI_RENDER_TYPE.INPUT:
                 case UI_RENDER_TYPE.INPUT_NUMBER:
                 case UI_RENDER_TYPE.INPUT_PASSWORD:
+                case UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
                 case UI_RENDER_TYPE.TEXT_AREA:
                 case UI_RENDER_TYPE.SELECT:
                 case UI_RENDER_TYPE.TREE_SELECT:
@@ -355,6 +357,16 @@ class FormForBrowse extends React.Component{
             );
 
             if (ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD) {
+                components = (
+                    <div>
+                        {
+                            initialValues[code] && <InputPassword ui_render_type={'browse'} initValue={initialValues[code]}/>
+                        }
+                    </div>
+                )
+            }
+
+            if (ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT) {
                 components = (
                     <div>
                         {

package/src/base/layout/ui_tpl/form/FormForModify.js

@@ -21,6 +21,7 @@ import moment from "moment";
 import {UI_RENDER_TYPE} from "../consts";
 import zhCN from "antd/es/locale/zh_CN";
 import HttpService from "../../../../services/HttpService";
+import InputPassword from "../InputPassword";
 import InputPasswordDecrypt from "../InputPasswordDecrypt";
 import '../../../AppFormulaFunctions'
 import {treeDataToListByChildFieldName} from "../../../BaseAppUtils";
@@ -403,6 +404,24 @@ class FormForModify extends React.Component{
                         );
                     break;
                 case UI_RENDER_TYPE.INPUT_PASSWORD:
+                    component = b_readonly || this.disabledExpression(dataItem, data) ? (
+                            <div>
+                                <InputPassword ui_render_type={'browse'} initValue={displayValue}/>
+                            </div>
+                        )
+                        :
+                        (
+                            <Input
+                                key={form_id + "_" + code}
+                                placeholder={"请填写" + name}
+                                allowClear
+                                maxLength={field_length && field_length > 0 ? field_length : null}
+                                onChange={this.inputOnChange.bind(this, dataItem, onChange)}
+                                {...ext_props}
+                            />
+                        );
+                    break;
+                case UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
                     component = b_readonly || this.disabledExpression(dataItem, data) ? (
                             <div>
                                 <InputPasswordDecrypt ui_render_type={'browse'} initValue={displayValue} maskLength={this.props.maskLength} requestUrl={this.props.file_service_path} appconfig={this.props.appconfig || this.props.appConfig}/>
@@ -786,7 +805,8 @@ class FormForModify extends React.Component{
         }
         else if (ui_render_type === UI_RENDER_TYPE.INPUT
             || ui_render_type === UI_RENDER_TYPE.TEXT_AREA
-            || ui_render_type ===  UI_RENDER_TYPE.INPUT_PASSWORD ) {
+            || ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD
+            || ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT) {
 
             if (!value) {
                 return  Promise.reject("validate fail");
@@ -1363,6 +1383,7 @@ class FormForModify extends React.Component{
             case UI_RENDER_TYPE.INPUT:
             case UI_RENDER_TYPE.INPUT_NUMBER:
             case UI_RENDER_TYPE.INPUT_PASSWORD:
+            case UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
             case UI_RENDER_TYPE.TEXT_AREA:
             case UI_RENDER_TYPE.TREE_SELECT:
                 value = formItemValue;

package/src/base/layout/ui_tpl/grid/GridForBrowse.js

@@ -8,6 +8,7 @@ import {EXPORT_GRID_CELL_OPTIONS, EXPORT_GRID_HEADER_CELL_OPTIONS, UI_RENDER_TYP
 import GridFilterRowIndicator from "./GridFilterRowIndicator";
 import zhCN from "antd/es/locale/zh_CN";
 import GridColumnCustomToolBar from "./GridColumnCustomToolBar";
+import InputPassword from "../InputPassword";
 import InputPasswordDecrypt from "../InputPasswordDecrypt";
 
 class GridForBrowse extends React.Component{
@@ -384,6 +385,7 @@ class GridForBrowse extends React.Component{
         switch (ui_render_type) {
             case UI_RENDER_TYPE.INPUT:
             case UI_RENDER_TYPE.INPUT_PASSWORD:
+            case UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
             case UI_RENDER_TYPE.INPUT_NUMBER:
             case UI_RENDER_TYPE.SELECT:
             case UI_RENDER_TYPE.TREE_SELECT:
@@ -426,7 +428,8 @@ class GridForBrowse extends React.Component{
                     {value}
                 </td>
             );
-        } else if (ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD) {
+        } else if (ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD
+            || ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT) {
             return (
                 <td className={props.className}
                     style={grid_default_locked ? {left: column_locked_left + 'px', right: "0px"} : {}}>
@@ -443,7 +446,10 @@ class GridForBrowse extends React.Component{
                     }
 
                     {
-                        dataItem[code] ? <InputPasswordDecrypt ui_render_type={'browse'} initValue={dataItem[code]} maskLength={this.props.maskLength} requestUrl={this.props.requestUrl} appconfig={this.props.appconfig || this.props.appConfig}/> : null
+                        dataItem[code] ? (ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD
+                            ? <InputPassword ui_render_type={'browse'} initValue={dataItem[code]}/>
+                            : <InputPasswordDecrypt ui_render_type={'browse'} initValue={dataItem[code]} maskLength={this.props.maskLength} requestUrl={this.props.requestUrl} appconfig={this.props.appconfig || this.props.appConfig}/>)
+                        : null
                     }
                 </td>
             );
@@ -507,6 +513,7 @@ class GridForBrowse extends React.Component{
                     switch (ui_render_type) {
                         case UI_RENDER_TYPE.INPUT:
                         case UI_RENDER_TYPE.INPUT_PASSWORD:
+                        case UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
                         case UI_RENDER_TYPE.SELECT:
                         case UI_RENDER_TYPE.TREE_SELECT:
                         case UI_RENDER_TYPE.UPLOAD:

package/src/base/layout/ui_tpl/grid/GridForModify.js

@@ -261,6 +261,16 @@ class GridForModify extends React.Component{
                 );
                 break;
             case UI_RENDER_TYPE.INPUT_PASSWORD:
+                component = (
+                    <Input
+                        title={dataItem[code]}
+                        placeholder={"请填写" + name}
+                        defaultValue={dataItem[code]}
+                        allowClear
+                        onChange={this.inputOnChange.bind(this, dataItem, fieldConfig, onChange)}/>
+                );
+                break;
+            case UI_RENDER_TYPE.INPUT_PASSWORD_DECRYPT:
                 component = (
                     <InputPasswordDecrypt
                         ui_render_type={'modify'}