ls-pro-common 1.0.76 → 1.0.77

package/es/components/DtlLayout.d.ts

@@ -36,6 +36,7 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     statusField?: string;
     /** 审核状态值 */
     auditStatus?: number;
+    isView?: boolean;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/es/components/DtlLayout.js

@@ -23,7 +23,9 @@ function DtlLayout(props) {
       btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
       btnStatus = props.btnStatus,
       statusField = props.statusField,
-      auditStatus = props.auditStatus;
+      auditStatus = props.auditStatus,
+      _props$isView = props.isView,
+      isView = _props$isView === void 0 ? false : _props$isView;
 
   var _usePermission = usePermission(),
       checkRight = _usePermission.checkRight;
@@ -43,7 +45,8 @@ function DtlLayout(props) {
   };
 
   var btnDisabled = function btnDisabled(btnKey) {
-    // 优先处理自定义的状态
+    if (isView) return true; // 优先处理自定义的状态
+
     if (btnStatus && typeof btnStatus(btnKey) === 'boolean') {
       return btnStatus(btnKey) || false;
     }
@@ -62,7 +65,7 @@ function DtlLayout(props) {
     // ]
     var b = []; // 有新增或更改权限且未审核，开放出保存按钮
 
-    if ((checkRight(2) || checkRight(4)) && !isAudit()) {
+    if ((checkRight(2) || checkRight(4)) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/React.createElement(_Button, {
         key: "btnSave",
         onClick: function onClick() {
@@ -80,7 +83,7 @@ function DtlLayout(props) {
     } // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
 
 
-    if (props.onAudit && checkRight(64) && !isAudit()) {
+    if (props.onAudit && checkRight(64) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/React.createElement(_Button, {
         key: "btnAudit",
         disabled: btnDisabled('btnAudit'),

package/es/components/IconSelector.js

@@ -81,13 +81,13 @@ function IconSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.input.parentNode.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (icon) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [icon]);

package/es/components/ImageSelector.js

@@ -241,13 +241,13 @@ function ImageSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.input.parentNode.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (imgUrl) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [imgUrl]);

package/es/components/InputTable.js

@@ -186,6 +186,8 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     if (!textName && formValue[name]) {
       formValue[textNameProp] = formValue[name];
       formRef === null || formRef === void 0 ? void 0 : formRef.current.setFieldsValue(_objectSpread({}, formValue));
+    } else if (textName && formValue[textName]) {
+      setText(formValue[textName]);
     }
   }, []); // 处理返回数据
 
@@ -343,18 +345,19 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       }, "\u786E\u8BA4")];
     },
     headerTitle: "\u53CC\u51FB\u9009\u4E2D\u5F53\u524D\u884C\u6570\u636E"
-  }, tableConfig));
+  }, tableConfig)); // 处理有值时，可清空
+
   useEffect(function () {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
 
     try {
-      var el = inputRef.current.input.parentNode.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (text) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [text, rest, fieldProps]);

package/es/components/common.less

@@ -305,4 +305,10 @@ a:hover {
     max-height: calc(100vh - 180px);
     overflow-y: auto;
   }
+}
+
+.ant-input-has-value:hover{
+   .ant-input-clear-icon{
+    visibility: visible;
+   }
 }

package/es/http/index.js

@@ -91,7 +91,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               reLogin();
             } else if (noMsg !== '1') {
               if (faultCode) {
-                httpError(retMsg, requestId, faultCode, options.url);
+                httpError(retMsg, retCode, faultCode, options.url);
               } else {
                 showError(retMsg + options.url);
               }
@@ -131,7 +131,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
                 reLogin();
               } else {
                 if (_faultCode) {
-                  httpError(_retMsg, _requestId, _faultCode, options.url);
+                  httpError(_retMsg, _retCode, _faultCode, options.url);
                 } else {
                   showError(_retMsg);
                 }

package/es/utils/index.d.ts

@@ -104,7 +104,7 @@ export declare const showAlert: (text: React.ReactDOM, title?: string, type?: 'e
     destroy: () => void;
     update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 };
-export declare const httpError: (retMsg?: string | undefined, requestId?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
+export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
 export declare const exitAlert: () => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;

package/es/utils/index.js

@@ -264,8 +264,8 @@ export var showAlert = function showAlert(text) {
     content: text
   });
 };
-export var httpError = function httpError(retMsg, requestId, faultCode, url) {
-  var msg = /*#__PURE__*/React.createElement(React.Fragment, null, retMsg, /*#__PURE__*/React.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/React.createElement("b", null, faultCode));
+export var httpError = function httpError(retMsg, retCode, faultCode, url) {
+  var msg = /*#__PURE__*/React.createElement(React.Fragment, null, "\u9519\u8BEF\u539F\u56E0:", /*#__PURE__*/React.createElement("b", null, retMsg), /*#__PURE__*/React.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/React.createElement("b", null, retCode), /*#__PURE__*/React.createElement("br", null), "\u6545\u969C\u7801:", /*#__PURE__*/React.createElement("b", null, faultCode));
   showAlert(msg, '请求接口出错', 'error');
 };
 export var exitAlert = function exitAlert() {

package/lib/components/DtlLayout.d.ts

@@ -36,6 +36,7 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     statusField?: string;
     /** 审核状态值 */
     auditStatus?: number;
+    isView?: boolean;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/lib/components/DtlLayout.js

@@ -40,7 +40,9 @@ function DtlLayout(props) {
       btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
       btnStatus = props.btnStatus,
       statusField = props.statusField,
-      auditStatus = props.auditStatus;
+      auditStatus = props.auditStatus,
+      _props$isView = props.isView,
+      isView = _props$isView === void 0 ? false : _props$isView;
 
   var _usePermission = (0, _usePermission2.default)(),
       checkRight = _usePermission.checkRight;
@@ -60,7 +62,8 @@ function DtlLayout(props) {
   };
 
   var btnDisabled = function btnDisabled(btnKey) {
-    // 优先处理自定义的状态
+    if (isView) return true; // 优先处理自定义的状态
+
     if (btnStatus && typeof btnStatus(btnKey) === 'boolean') {
       return btnStatus(btnKey) || false;
     }
@@ -79,7 +82,7 @@ function DtlLayout(props) {
     // ]
     var b = []; // 有新增或更改权限且未审核，开放出保存按钮
 
-    if ((checkRight(2) || checkRight(4)) && !isAudit()) {
+    if ((checkRight(2) || checkRight(4)) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
         key: "btnSave",
         onClick: function onClick() {
@@ -97,7 +100,7 @@ function DtlLayout(props) {
     } // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
 
 
-    if (props.onAudit && checkRight(64) && !isAudit()) {
+    if (props.onAudit && checkRight(64) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
         key: "btnAudit",
         disabled: btnDisabled('btnAudit'),

package/lib/components/IconSelector.js

@@ -104,13 +104,13 @@ function IconSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.input.parentNode.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (icon) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [icon]);

package/lib/components/ImageSelector.js

@@ -271,13 +271,13 @@ function ImageSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.input.parentNode.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (imgUrl) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [imgUrl]);

package/lib/components/InputTable.js

@@ -214,6 +214,8 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     if (!textName && formValue[name]) {
       formValue[textNameProp] = formValue[name];
       formRef === null || formRef === void 0 ? void 0 : formRef.current.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+    } else if (textName && formValue[textName]) {
+      setText(formValue[textName]);
     }
   }, []); // 处理返回数据
 
@@ -372,19 +374,20 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
       }, "\u786E\u8BA4")];
     },
     headerTitle: "\u53CC\u51FB\u9009\u4E2D\u5F53\u524D\u884C\u6570\u636E"
-  }, tableConfig));
+  }, tableConfig)); // 处理有值时，可清空
+
 
   (0, _react.useEffect)(function () {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
 
     try {
-      var el = inputRef.current.input.parentNode.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (text) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [text, rest, fieldProps]);

package/lib/components/common.less

@@ -305,4 +305,10 @@ a:hover {
     max-height: calc(100vh - 180px);
     overflow-y: auto;
   }
+}
+
+.ant-input-has-value:hover{
+   .ant-input-clear-icon{
+    visibility: visible;
+   }
 }

package/lib/http/index.js

@@ -110,7 +110,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               (0, _utils.reLogin)();
             } else if (noMsg !== '1') {
               if (faultCode) {
-                (0, _utils.httpError)(retMsg, requestId, faultCode, options.url);
+                (0, _utils.httpError)(retMsg, retCode, faultCode, options.url);
               } else {
                 (0, _utils.showError)(retMsg + options.url);
               }
@@ -150,7 +150,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
                 (0, _utils.reLogin)();
               } else {
                 if (_faultCode) {
-                  (0, _utils.httpError)(_retMsg, _requestId, _faultCode, options.url);
+                  (0, _utils.httpError)(_retMsg, _retCode, _faultCode, options.url);
                 } else {
                   (0, _utils.showError)(_retMsg);
                 }

package/lib/utils/index.d.ts

@@ -104,7 +104,7 @@ export declare const showAlert: (text: React.ReactDOM, title?: string, type?: 'e
     destroy: () => void;
     update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 };
-export declare const httpError: (retMsg?: string | undefined, requestId?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
+export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
 export declare const exitAlert: () => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;

package/lib/utils/index.js

@@ -370,8 +370,8 @@ var showAlert = function showAlert(text) {
 
 exports.showAlert = showAlert;
 
-var httpError = function httpError(retMsg, requestId, faultCode, url) {
-  var msg = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, retMsg, /*#__PURE__*/_react.default.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/_react.default.createElement("b", null, faultCode));
+var httpError = function httpError(retMsg, retCode, faultCode, url) {
+  var msg = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "\u9519\u8BEF\u539F\u56E0:", /*#__PURE__*/_react.default.createElement("b", null, retMsg), /*#__PURE__*/_react.default.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/_react.default.createElement("b", null, retCode), /*#__PURE__*/_react.default.createElement("br", null), "\u6545\u969C\u7801:", /*#__PURE__*/_react.default.createElement("b", null, faultCode));
 
   showAlert(msg, '请求接口出错', 'error');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.56",
+    "ls-pro-table": "2.62.57",
     "ls-pro-form": "1.52.33",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",