@bchr/bchr-front-lib 0.6.1 → 0.6.3

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

@@ -8,8 +8,10 @@ exports["default"] = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _HttpService = _interopRequireDefault(require("../../../services/HttpService"));
+var _excluded = ["ui_render_type", "initValue", "value", "onChange", "requestUrl", "appconfig", "appConfig", "maskLength", "placeholder", "maxLength", "allowClear", "onKeyDown", "onPaste"];
 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 _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -20,54 +22,80 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 var MASK_LENGTH = 8;
+var normalizeValue = function normalizeValue(value) {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  return String(value);
+};
 var maskValue = function maskValue(value, maskLength) {
   if (value === null || value === undefined || value === "") {
     return "";
   }
   return "*".repeat(maskLength);
 };
+var limitText = function limitText(text, maxLength) {
+  if (typeof maxLength === "number" && maxLength > 0 && text.length > maxLength) {
+    return text.slice(0, maxLength);
+  }
+  return text;
+};
 var InputPasswordDecrypt = function InputPasswordDecrypt(props) {
   var ui_render_type = props.ui_render_type,
     initValue = props.initValue,
+    value = props.value,
+    onChange = props.onChange,
     requestUrl = props.requestUrl,
     appconfig = props.appconfig,
     appConfig = props.appConfig,
-    maskLength = props.maskLength;
+    maskLength = props.maskLength,
+    placeholder = props.placeholder,
+    maxLength = props.maxLength,
+    _props$allowClear = props.allowClear,
+    allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
+    onKeyDown = props.onKeyDown,
+    onPaste = props.onPaste,
+    restInputProps = _objectWithoutProperties(props, _excluded);
   var resolvedMaskLength = Number.isInteger(maskLength) && maskLength > 0 ? maskLength : MASK_LENGTH;
   var serviceConfig = appconfig || appConfig;
-  var _useState = (0, _react.useState)(false),
+  var incomingValue = normalizeValue(value !== undefined ? value : initValue);
+  var _useState = (0, _react.useState)(incomingValue),
     _useState2 = _slicedToArray(_useState, 2),
-    toggle = _useState2[0],
-    setToggle = _useState2[1];
-  var _useState3 = (0, _react.useState)(maskValue(initValue, resolvedMaskLength)),
+    realValue = _useState2[0],
+    setRealValue = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    toggleVal = _useState4[0],
-    setToggleVal = _useState4[1];
-  var _useState5 = (0, _react.useState)(false),
+    toggle = _useState4[0],
+    setToggle = _useState4[1];
+  var _useState5 = (0, _react.useState)(maskValue(initValue, resolvedMaskLength)),
     _useState6 = _slicedToArray(_useState5, 2),
-    loading = _useState6[0],
-    setLoading = _useState6[1];
+    toggleVal = _useState6[0],
+    setToggleVal = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    loading = _useState8[0],
+    setLoading = _useState8[1];
   var timerRef = (0, _react.useRef)(null);
   var requestSeqRef = (0, _react.useRef)(0);
+  var realValueRef = (0, _react.useRef)(incomingValue);
+  var originalRef = (0, _react.useRef)(incomingValue);
+  var emittedRef = (0, _react.useRef)(incomingValue);
+  var editingRef = (0, _react.useRef)(false);
+  var maskLengthRef = (0, _react.useRef)(resolvedMaskLength);
+  realValueRef.current = ui_render_type === "modify" ? realValue : normalizeValue(initValue);
+  maskLengthRef.current = resolvedMaskLength;
   var clearHideTimer = function clearHideTimer() {
     if (timerRef.current) {
       clearTimeout(timerRef.current);
       timerRef.current = null;
     }
   };
-  (0, _react.useEffect)(function () {
-    setToggle(false);
-    setToggleVal(maskValue(initValue, resolvedMaskLength));
-    setLoading(false);
-    return function () {
-      requestSeqRef.current += 1;
-      clearHideTimer();
-    };
-  }, [initValue, resolvedMaskLength]);
   var hidePlainText = function hidePlainText() {
     clearHideTimer();
-    setToggleVal(maskValue(initValue, resolvedMaskLength));
+    setToggleVal(maskValue(realValueRef.current, maskLengthRef.current));
     setToggle(false);
   };
   var showPlainText = function showPlainText(plainText) {
@@ -76,13 +104,63 @@ var InputPasswordDecrypt = function InputPasswordDecrypt(props) {
     setToggle(true);
     timerRef.current = setTimeout(function () {
       timerRef.current = null;
-      setToggleVal(maskValue(initValue, resolvedMaskLength));
+      setToggleVal(maskValue(realValueRef.current, maskLengthRef.current));
       setToggle(false);
     }, 5000);
   };
+  (0, _react.useEffect)(function () {
+    return function () {
+      requestSeqRef.current += 1;
+      clearHideTimer();
+    };
+  }, []);
+  (0, _react.useEffect)(function () {
+    if (ui_render_type === "modify") {
+      return undefined;
+    }
+    setToggle(false);
+    setToggleVal(maskValue(initValue, resolvedMaskLength));
+    setLoading(false);
+    return function () {
+      requestSeqRef.current += 1;
+      clearHideTimer();
+    };
+  }, [ui_render_type, initValue, resolvedMaskLength]);
+  (0, _react.useEffect)(function () {
+    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]);
+  var commitValue = function commitValue(nextValue, reveal) {
+    var 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
+        }
+      });
+    }
+  };
   var onToggleFull = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-      var requestSeq, result, _t;
+      var secret, requestSeq, result, _t;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
@@ -99,82 +177,157 @@ var InputPasswordDecrypt = function InputPasswordDecrypt(props) {
             }
             return _context.a(2);
           case 2:
-            if (requestUrl) {
+            secret = realValueRef.current;
+            if (!(ui_render_type === "modify" && (secret === "" || editingRef.current || secret !== originalRef.current))) {
+              _context.n = 4;
+              break;
+            }
+            if (!(secret === "")) {
               _context.n = 3;
               break;
             }
-            _antd.message.error("请为组件注入属性【requestUrl】");
             return _context.a(2);
           case 3:
+            showPlainText(secret);
+            return _context.a(2);
+          case 4:
+            if (secret) {
+              _context.n = 5;
+              break;
+            }
+            return _context.a(2);
+          case 5:
+            if (requestUrl) {
+              _context.n = 6;
+              break;
+            }
+            _antd.message.error("请为组件注入属性【requestUrl】");
+            return _context.a(2);
+          case 6:
             if (serviceConfig) {
-              _context.n = 4;
+              _context.n = 7;
               break;
             }
             _antd.message.error("请为组件注入属性【appconfig】");
             return _context.a(2);
-          case 4:
+          case 7:
             requestSeq = requestSeqRef.current + 1;
             requestSeqRef.current = requestSeq;
             setLoading(true);
-            _context.p = 5;
-            _context.n = 6;
+            _context.p = 8;
+            _context.n = 9;
             return new _HttpService["default"](requestUrl, serviceConfig).post("decrypt", {
-              data: initValue
+              data: secret
             });
-          case 6:
+          case 9:
             result = _context.v;
             if (!(requestSeq !== requestSeqRef.current)) {
-              _context.n = 7;
+              _context.n = 10;
               break;
             }
             return _context.a(2);
-          case 7:
+          case 10:
             if (!(typeof result !== "string")) {
-              _context.n = 8;
+              _context.n = 11;
               break;
             }
             _antd.message.error("解密失败");
             return _context.a(2);
-          case 8:
+          case 11:
             showPlainText(result);
-            _context.n = 11;
+            _context.n = 14;
             break;
-          case 9:
-            _context.p = 9;
+          case 12:
+            _context.p = 12;
             _t = _context.v;
             if (!(requestSeq !== requestSeqRef.current)) {
-              _context.n = 10;
+              _context.n = 13;
               break;
             }
             return _context.a(2);
-          case 10:
+          case 13:
             if (_t && _t.responseJSON && _t.responseJSON.msg) {
               _antd.message.error(_t.responseJSON.msg);
             } else {
               _antd.message.error("解密失败");
             }
-          case 11:
-            _context.p = 11;
+          case 14:
+            _context.p = 14;
             if (requestSeq === requestSeqRef.current) {
               setLoading(false);
             }
-            return _context.f(11);
-          case 12:
+            return _context.f(14);
+          case 15:
             return _context.a(2);
         }
-      }, _callee, null, [[5, 9, 11, 12]]);
+      }, _callee, null, [[8, 12, 14, 15]]);
     }));
     return function onToggleFull() {
       return _ref.apply(this, arguments);
     };
   }();
+  var onModifyKeyDown = function 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();
+    var nextValue = editingRef.current ? realValueRef.current + event.key : event.key;
+    commitValue(nextValue, false);
+  };
+  var onModifyPaste = function onModifyPaste(event) {
+    if (onPaste) {
+      onPaste(event);
+    }
+    if (toggle || event.defaultPrevented) {
+      return;
+    }
+    var text = event.clipboardData ? event.clipboardData.getData("text") : "";
+    event.preventDefault();
+    if (!text) {
+      return;
+    }
+    var nextValue = editingRef.current ? realValueRef.current + text : text;
+    commitValue(nextValue, false);
+  };
+  var onModifyChange = function onModifyChange(event) {
+    var nextValue = event.target.value;
+    if (!toggle) {
+      if (nextValue === "") {
+        commitValue("", false);
+      }
+      return;
+    }
+    commitValue(nextValue, true);
+  };
   if (ui_render_type === "modify") {
-    return /*#__PURE__*/_react["default"].createElement(_antd.Input, {
-      value: toggleVal,
+    var modifyDisplay = toggle ? toggleVal : maskValue(realValue, resolvedMaskLength);
+    return /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({}, restInputProps, {
+      value: modifyDisplay,
+      placeholder: placeholder,
+      allowClear: allowClear,
+      maxLength: toggle && typeof maxLength === "number" ? maxLength : undefined,
+      onChange: onModifyChange,
+      onKeyDown: onModifyKeyDown,
+      onPaste: onModifyPaste,
       addonAfter: /*#__PURE__*/_react["default"].createElement("span", {
-        className: "iconfont ".concat(toggle ? "icon-bchr-show" : "icon-bchr-hide")
+        className: "iconfont ".concat(toggle ? "icon-bchr-show" : "icon-bchr-hide"),
+        style: {
+          cursor: "pointer"
+        },
+        onClick: onToggleFull
       })
-    });
+    }));
   } else if (ui_render_type === "browse") {
     return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("span", null, toggleVal, /*#__PURE__*/_react["default"].createElement("span", {
       className: "iconfont ".concat(toggle ? "icon-bchr-show" : "icon-bchr-hide"),

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,14 +331,31 @@ 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,
               maskLength: _this2.props.maskLength,
               requestUrl: _this2.props.file_service_path,
               appconfig: _this2.props.appconfig || _this2.props.appConfig
-            })) : /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
+            })) : /*#__PURE__*/_react["default"].createElement(_InputPasswordDecrypt["default"], _extends({
               key: form_id + "_" + code,
+              ui_render_type: 'modify',
+              initValue: initialValue,
+              maskLength: _this2.props.maskLength,
+              requestUrl: _this2.props.file_service_path,
+              appconfig: _this2.props.appconfig || _this2.props.appConfig,
               placeholder: "请填写" + name,
               allowClear: true,
               maxLength: field_length && field_length > 0 ? field_length : null,
@@ -843,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 {
@@ -1217,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

@@ -11,6 +11,7 @@ var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _icons = require("@ant-design/icons");
 var _consts = require("../consts");
+var _InputPasswordDecrypt = _interopRequireDefault(require("../InputPasswordDecrypt"));
 var _zh_CN = _interopRequireDefault(require("antd/es/locale/zh_CN"));
 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); }
@@ -284,6 +285,27 @@ var GridForModify = /*#__PURE__*/function (_React$Component) {
             onChange: this.inputOnChange.bind(this, dataItem, fieldConfig)
           }));
           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],
+            maskLength: this.props.maskLength,
+            requestUrl: this.props.requestUrl || file_service_path,
+            appconfig: this.props.appconfig || this.props.appConfig,
+            placeholder: "请填写" + name,
+            allowClear: true,
+            onChange: this.inputOnChange.bind(this, dataItem, fieldConfig, onChange)
+          });
+          break;
         default:
           component = /*#__PURE__*/_react["default"].createElement(_antd.Input, {
             title: dataItem[code],

package/package.json

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

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

@@ -4,6 +4,13 @@ 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 "";
@@ -11,15 +18,47 @@ const maskValue = (value, maskLength) => {
     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, requestUrl, appconfig, appConfig, maskLength} = 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) {
@@ -28,19 +67,9 @@ const InputPasswordDecrypt = (props) => {
         }
     };
 
-    useEffect(() => {
-        setToggle(false);
-        setToggleVal(maskValue(initValue, resolvedMaskLength));
-        setLoading(false);
-        return () => {
-            requestSeqRef.current += 1;
-            clearHideTimer();
-        };
-    }, [initValue, resolvedMaskLength]);
-
     const hidePlainText = () => {
         clearHideTimer();
-        setToggleVal(maskValue(initValue, resolvedMaskLength));
+        setToggleVal(maskValue(realValueRef.current, maskLengthRef.current));
         setToggle(false);
     };
 
@@ -50,11 +79,61 @@ const InputPasswordDecrypt = (props) => {
         setToggle(true);
         timerRef.current = setTimeout(() => {
             timerRef.current = null;
-            setToggleVal(maskValue(initValue, resolvedMaskLength));
+            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();
@@ -63,6 +142,18 @@ const InputPasswordDecrypt = (props) => {
         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;
@@ -76,7 +167,7 @@ const InputPasswordDecrypt = (props) => {
         requestSeqRef.current = requestSeq;
         setLoading(true);
         try {
-            const result = await new HttpService(requestUrl, serviceConfig).post("decrypt", {data: initValue});
+            const result = await new HttpService(requestUrl, serviceConfig).post("decrypt", {data: secret});
             if (requestSeq !== requestSeqRef.current) {
                 return;
             }
@@ -101,8 +192,66 @@ const InputPasswordDecrypt = (props) => {
         }
     };
 
+    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") {
-        return <Input value={toggleVal} addonAfter={<span className={`iconfont ${toggle ? "icon-bchr-show" : "icon-bchr-hide"}`}/>}/>;
+        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>

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";
@@ -405,7 +406,7 @@ class FormForModify extends React.Component{
                 case UI_RENDER_TYPE.INPUT_PASSWORD:
                     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}/>
+                                <InputPassword ui_render_type={'browse'} initValue={displayValue}/>
                             </div>
                         )
                         :
@@ -420,6 +421,29 @@ class FormForModify extends React.Component{
                             />
                         );
                     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}/>
+                            </div>
+                        )
+                        :
+                        (
+                            <InputPasswordDecrypt
+                                key={form_id + "_" + code}
+                                ui_render_type={'modify'}
+                                initValue={initialValue}
+                                maskLength={this.props.maskLength}
+                                requestUrl={this.props.file_service_path}
+                                appconfig={this.props.appconfig || this.props.appConfig}
+                                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.TEXT_AREA:
                     component = b_readonly || this.disabledExpression(dataItem, data) ? (
                             <div>
@@ -781,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");
@@ -1358,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

@@ -16,6 +16,7 @@ import {
 import moment from "moment";
 import {QuestionCircleOutlined, UploadOutlined} from '@ant-design/icons';
 import {DateFormat, UI_RENDER_TYPE} from "../consts";
+import InputPasswordDecrypt from "../InputPasswordDecrypt";
 import zhCN from "antd/es/locale/zh_CN";
 
 class GridForModify extends React.Component{
@@ -257,6 +258,29 @@ class GridForModify extends React.Component{
                     </Upload>
 
 
+                );
+                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'}
+                        initValue={dataItem[code]}
+                        maskLength={this.props.maskLength}
+                        requestUrl={this.props.requestUrl || file_service_path}
+                        appconfig={this.props.appconfig || this.props.appConfig}
+                        placeholder={"请填写" + name}
+                        allowClear
+                        onChange={this.inputOnChange.bind(this, dataItem, fieldConfig, onChange)}/>
                 );
                 break;
             default: