ls-pro-common 3.0.98 → 3.1.0

package/es/components/InputTable.js

@@ -244,25 +244,29 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     };
   }();
   var initName = function initName(val) {
-    var _columns$find;
+    var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!val) return;
-    var fieldName = ((_columns$find = columns.find(function (o) {
+    // 当返回值列不在表格配置中不查询，因为有可能会导致查询别名问题报错。
+    var valueColumn = columns.find(function (o) {
       return o.dataIndex === valueField;
-    })) === null || _columns$find === void 0 ? void 0 : _columns$find.searchField) || valueField;
+    });
+    if (!valueColumn) return;
+    var fieldName = valueColumn.searchField; //优先取开发人员配置的searchField,没有配置取valueField
+    if (!fieldName) {
+      fieldName = (isV2 ? 'search.' : '') + valueField;
+    }
     var param = {
       current: 1,
       pageSize: 1000
     };
     if (Array.isArray(val)) val = val.join(',');
     if (val.toString().includes(',')) {
-      fieldName += '_in';
-    }
-    if (isV2) {
-      fieldName = 'search.' + fieldName;
+      fieldName = fieldName.split('_')[0] + '_in';
     }
     param[fieldName] = val;
     loadData(param).then(function (result) {
       initRows.current = result.data;
+      if (!updateTxt) return;
       var rows = (result.data || []).filter(function (o) {
         return o;
       });
@@ -284,12 +288,15 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     var txt = (_formValue$textNamePr = formValue === null || formValue === void 0 ? void 0 : formValue[textNameProp]) !== null && _formValue$textNamePr !== void 0 ? _formValue$textNamePr : record === null || record === void 0 ? void 0 : record[textNameProp];
     var val = (_formValue$name = formValue === null || formValue === void 0 ? void 0 : formValue[name]) !== null && _formValue$name !== void 0 ? _formValue$name : record === null || record === void 0 ? void 0 : record[name];
     setText(txt !== null && txt !== void 0 ? txt : val);
-    if (val && !txt) {
-      formValue[textNameProp] = val;
-      setFormValue(formValue);
-      // 多值选择或选择的初始值不在第一页时显示有问题
-      if (textField !== valueField) {
-        initName(val);
+    if (val) {
+      if (!txt) {
+        formValue[textNameProp] = val;
+        setFormValue(formValue);
+        if (textField !== valueField) {
+          initName(val);
+        }
+      } else if (multiple) {
+        initName(val, false);
       }
     }
   }, [rowKey]);

package/es/utils/modal.js

@@ -198,7 +198,7 @@ export var reLogin = function reLogin() {
     getContainer: getFullScreenElement() || document.body,
     afterClose: function afterClose() {
       timeout = false;
-      (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
+      (window.top || window).location.href = location.pathname === '/' ? '/login/' : '/login/?redirect=' + encodeURIComponent(location.href);
     }
   });
 };

package/lib/components/InputTable.js

@@ -244,25 +244,29 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     };
   }();
   var initName = function initName(val) {
-    var _columns$find;
+    var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!val) return;
-    var fieldName = ((_columns$find = columns.find(function (o) {
+    // 当返回值列不在表格配置中不查询，因为有可能会导致查询别名问题报错。
+    var valueColumn = columns.find(function (o) {
       return o.dataIndex === valueField;
-    })) === null || _columns$find === void 0 ? void 0 : _columns$find.searchField) || valueField;
+    });
+    if (!valueColumn) return;
+    var fieldName = valueColumn.searchField; //优先取开发人员配置的searchField,没有配置取valueField
+    if (!fieldName) {
+      fieldName = (isV2 ? 'search.' : '') + valueField;
+    }
     var param = {
       current: 1,
       pageSize: 1000
     };
     if (Array.isArray(val)) val = val.join(',');
     if (val.toString().includes(',')) {
-      fieldName += '_in';
-    }
-    if (isV2) {
-      fieldName = 'search.' + fieldName;
+      fieldName = fieldName.split('_')[0] + '_in';
     }
     param[fieldName] = val;
     loadData(param).then(function (result) {
       initRows.current = result.data;
+      if (!updateTxt) return;
       var rows = (result.data || []).filter(function (o) {
         return o;
       });
@@ -284,12 +288,15 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     var txt = (_formValue$textNamePr = formValue === null || formValue === void 0 ? void 0 : formValue[textNameProp]) !== null && _formValue$textNamePr !== void 0 ? _formValue$textNamePr : record === null || record === void 0 ? void 0 : record[textNameProp];
     var val = (_formValue$name = formValue === null || formValue === void 0 ? void 0 : formValue[name]) !== null && _formValue$name !== void 0 ? _formValue$name : record === null || record === void 0 ? void 0 : record[name];
     setText(txt !== null && txt !== void 0 ? txt : val);
-    if (val && !txt) {
-      formValue[textNameProp] = val;
-      setFormValue(formValue);
-      // 多值选择或选择的初始值不在第一页时显示有问题
-      if (textField !== valueField) {
-        initName(val);
+    if (val) {
+      if (!txt) {
+        formValue[textNameProp] = val;
+        setFormValue(formValue);
+        if (textField !== valueField) {
+          initName(val);
+        }
+      } else if (multiple) {
+        initName(val, false);
       }
     }
   }, [rowKey]);

package/lib/utils/modal.js

@@ -198,7 +198,7 @@ export var reLogin = function reLogin() {
     getContainer: getFullScreenElement() || document.body,
     afterClose: function afterClose() {
       timeout = false;
-      (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
+      (window.top || window).location.href = location.pathname === '/' ? '/login/' : '/login/?redirect=' + encodeURIComponent(location.href);
     }
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.98",
+  "version": "3.1.0",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [