ls-pro-common 3.0.89 → 3.0.90

package/lib/components/InputTable.js

@@ -7,9 +7,9 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey", "method", "changeOnSelect", "record"],
   _excluded2 = ["current", "pageSize"];
@@ -40,7 +40,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     setText = _useState6[1];
   var inputRef = useRef();
   useImperativeHandle(ref, function () {
-    return inputRef.current;
+    return _objectSpread(_objectSpread({}, inputRef.current), {}, {
+      clear: handleClear
+    });
   });
   var columns = prop.columns,
     url = prop.url,
@@ -101,7 +103,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   var tableKey = (tableConfig === null || tableConfig === void 0 ? void 0 : tableConfig.rowKey) || valueField || 'id';
   //显示输入框绑定的name,如果不设置textName,设置为$name__text
   var textNameProp = useMemo(function () {
-    return textName || name + '__text';
+    return textName ? textName : name + '__text';
   }, [textName, name]);
   // 输入框回车时，调用查询参数字段
   var searchKey = useMemo(function () {
@@ -124,11 +126,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   }, [columns, searchField, valueField, textField]);
   var loadData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
-      var current, pageSize, rest, data, _tableRef$current, _tableRef$current$cle, result, rows, _formRef$current, _formRef$current$getF, formValue, val, _selectRowRef$current, arr, pageSelectedRows;
+      var current, pageSize, restParams, data, _tableRef$current, _tableRef$current$cle, result, rows, formValue, val, _selectRowRef$current, arr, pageSelectedRows;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            current = param.current, pageSize = param.pageSize, rest = _objectWithoutProperties(param, _excluded2);
+            current = param.current, pageSize = param.pageSize, restParams = _objectWithoutProperties(param, _excluded2);
             data = {};
             if (isV2) {
               data['page.pn'] = current;
@@ -137,10 +139,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               data.page = current;
               data.pageSize = pageSize;
             }
-            if (Object.keys(rest).length && !isV2) {
-              data.where = rest;
+            if (Object.keys(restParams).length && !isV2) {
+              data.where = restParams;
             } else {
-              data = _objectSpread(_objectSpread({}, data), rest);
+              data = _objectSpread(_objectSpread({}, data), restParams);
             }
             if (!keepSelect) {
               selectRowRef.current = [];
@@ -171,10 +173,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
             }
             // 多选时，找出当前页的默认选中项
             if (multiple) {
-              formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : (_formRef$current$getF = _formRef$current.getFieldsValue) === null || _formRef$current$getF === void 0 ? void 0 : _formRef$current$getF.call(_formRef$current)) || {};
-              if (rowKey) {
-                formValue = formValue[rowKey] || {};
-              }
+              formValue = getFormValue();
               val = formValue[name] || (record === null || record === void 0 ? void 0 : record[name]);
               if (val) {
                 arr = val.split(',');
@@ -208,48 +207,69 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       return _ref.apply(this, arguments);
     };
   }();
-  // 初始化数据
+  var getFormValue = function getFormValue() {
+    var _formRef$current2, _formRef$current2$get;
+    if (rowKey) {
+      var _formRef$current, _formRef$current$getF, _formRef$current$getF2;
+      return formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : (_formRef$current$getF = _formRef$current.getFieldsValue) === null || _formRef$current$getF === void 0 ? void 0 : (_formRef$current$getF2 = _formRef$current$getF.call(_formRef$current)) === null || _formRef$current$getF2 === void 0 ? void 0 : _formRef$current$getF2[rowKey];
+    }
+    return formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2);
+  };
+  var setFormValue = function setFormValue(formValue) {
+    if (rowKey) {
+      var _formRef$current3, _formRef$current3$set;
+      formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$set = _formRef$current3.setFieldsValue) === null || _formRef$current3$set === void 0 ? void 0 : _formRef$current3$set.call(_formRef$current3, _defineProperty({}, rowKey, formValue));
+    } else {
+      var _formRef$current4, _formRef$current4$set;
+      formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$set = _formRef$current4.setFieldsValue) === null || _formRef$current4$set === void 0 ? void 0 : _formRef$current4$set.call(_formRef$current4, formValue);
+    }
+  };
+  // 初始化数据,主要设置名称
   useEffect(function () {
-    setTimeout(function () {
-      var _rest$onChange;
-      var txt = '',
-        val = '';
-      var row;
-      if (rowKey) {
-        try {
-          var _formRef$current2, _formRef$current2$get, _formRef$current2$get2, _row, _row2;
-          row = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : (_formRef$current2$get2 = _formRef$current2$get.call(_formRef$current2)) === null || _formRef$current2$get2 === void 0 ? void 0 : _formRef$current2$get2[rowKey];
-          txt = ((_row = row) === null || _row === void 0 ? void 0 : _row[textNameProp]) || (record === null || record === void 0 ? void 0 : record[textNameProp]);
-          val = (_row2 = row) === null || _row2 === void 0 ? void 0 : _row2[name];
-        } catch (_unused) {}
-      } else {
-        var _formRef$current3, _formRef$current3$get, _formRef$current4, _formRef$current4$get;
-        txt = formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$get = _formRef$current3.getFieldValue) === null || _formRef$current3$get === void 0 ? void 0 : _formRef$current3$get.call(_formRef$current3, textNameProp);
-        val = formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$get = _formRef$current4.getFieldValue) === null || _formRef$current4$get === void 0 ? void 0 : _formRef$current4$get.call(_formRef$current4, name);
-      }
-      if (txt) {
-        setText(txt);
-      } else if (val) {
-        setText(val);
-        if (rowKey) {
-          var _formRef$current5, _formRef$current5$set;
-          formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : (_formRef$current5$set = _formRef$current5.setFieldsValue) === null || _formRef$current5$set === void 0 ? void 0 : _formRef$current5$set.call(_formRef$current5, _defineProperty({}, rowKey, _objectSpread(_objectSpread({}, row), {}, _defineProperty({}, textNameProp, val))));
-        } else {
-          var _formRef$current6, _formRef$current6$set;
-          formRef === null || formRef === void 0 ? void 0 : (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : (_formRef$current6$set = _formRef$current6.setFieldsValue) === null || _formRef$current6$set === void 0 ? void 0 : _formRef$current6$set.call(_formRef$current6, _defineProperty({}, textNameProp, val));
-        }
-      }
-      (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 ? void 0 : _rest$onChange.call(rest, text || val);
-    }, 0);
+    var _formValue$textNamePr, _formValue$name;
+    var formValue = getFormValue();
+    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);
+      //}
+    }
   }, [rowKey]);
+  // 跨页显示有问题
+  var initName = function initName(val) {
+    var _columns$find;
+    if (!val) return;
+    var fieldName = ((_columns$find = columns.find(function (o) {
+      return o.dataIndex === valueField;
+    })) === null || _columns$find === void 0 ? void 0 : _columns$find.searchField) || valueField;
+    var param = {
+      current: 1,
+      pageSize: 10
+    };
+    if (Array.isArray(val)) val = val.join(',');
+    if (val.toString().includes(',')) {
+      fieldName += '_in';
+    }
+    param[fieldName] = val;
+    loadData(param).then(function (result) {
+      var rows = result.data || [];
+      var txt = rows.map(function (o) {
+        return o[textField];
+      }).join(',') || val;
+      var formValue = getFormValue(); //重新取一次
+      formValue[textNameProp] = txt;
+      setText(txt);
+      setFormValue(formValue);
+    });
+  };
   // 处理返回数据
   var handleValue = function handleValue(row) {
-    var _formRef$current7, _formRef$current7$get, _rest$onChange2;
     var close = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : (_formRef$current7$get = _formRef$current7.getFieldsValue) === null || _formRef$current7$get === void 0 ? void 0 : _formRef$current7$get.call(_formRef$current7)) || {};
-    if (rowKey) {
-      formValue = formValue[rowKey] || {};
-    }
+    var formValue = getFormValue();
     if (!formValue) return;
     var txt;
     //支持多选
@@ -284,23 +304,22 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     }
     formValue[textNameProp] = txt;
     setText(txt);
-    (_rest$onChange2 = rest.onChange) === null || _rest$onChange2 === void 0 ? void 0 : _rest$onChange2.call(rest, txt);
+    setFormValue(formValue);
+    onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(row, formRef);
     if (close) {
       setVisible(false);
     }
-    if (rowKey) {
-      var _formRef$current8, _formRef$current8$set;
-      formRef === null || formRef === void 0 ? void 0 : (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : (_formRef$current8$set = _formRef$current8.setFieldsValue) === null || _formRef$current8$set === void 0 ? void 0 : _formRef$current8$set.call(_formRef$current8, _defineProperty({}, rowKey, formValue));
-    } else {
-      var _formRef$current9, _formRef$current9$set;
-      formRef === null || formRef === void 0 ? void 0 : (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : (_formRef$current9$set = _formRef$current9.setFieldsValue) === null || _formRef$current9$set === void 0 ? void 0 : _formRef$current9$set.call(_formRef$current9, _objectSpread({}, formValue));
-    }
-    onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(row, formRef);
   };
   var handleClear = function handleClear() {
     var _tableRef$current2, _tableRef$current2$cl;
     selectRowRef.current = [];
+    setSelectedKeys([]);
     (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
+    setText('');
+    var formValue = getFormValue();
+    formValue[name] = undefined;
+    formValue[textNameProp] = undefined;
+    setFormValue(formValue);
   };
   // 可输入时,回车或失去焦点调接口查询数据
   var onQuery = function onQuery(e) {
@@ -329,47 +348,21 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   };
   //直接输入不回车,value 和 text 为同一个值
   var onInput = function onInput(e) {
-    var _formRef$current10, _formRef$current10$ge, _rest$onChange3;
-    var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : (_formRef$current10$ge = _formRef$current10.getFieldsValue) === null || _formRef$current10$ge === void 0 ? void 0 : _formRef$current10$ge.call(_formRef$current10)) || {};
-    if (rowKey) {
-      formValue = formValue[rowKey] || {};
-    }
+    var formValue = getFormValue();
     var val = e.target.value;
     formValue[name] = val;
     formValue[textNameProp] = val;
     setText(val);
-    (_rest$onChange3 = rest.onChange) === null || _rest$onChange3 === void 0 ? void 0 : _rest$onChange3.call(rest, val);
-    if (rowKey) {
-      var _formRef$current11, _formRef$current11$se;
-      formRef === null || formRef === void 0 ? void 0 : (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : (_formRef$current11$se = _formRef$current11.setFieldsValue) === null || _formRef$current11$se === void 0 ? void 0 : _formRef$current11$se.call(_formRef$current11, _defineProperty({}, rowKey, formValue));
-    } else {
-      var _formRef$current12, _formRef$current12$se;
-      formRef === null || formRef === void 0 ? void 0 : (_formRef$current12 = formRef.current) === null || _formRef$current12 === void 0 ? void 0 : (_formRef$current12$se = _formRef$current12.setFieldsValue) === null || _formRef$current12$se === void 0 ? void 0 : _formRef$current12$se.call(_formRef$current12, _objectSpread({}, formValue));
-    }
+    setFormValue(formValue);
   };
   // 当表单重置或点clear时,处理值
   var clearValue = function clearValue(e) {
     if (!e.target.value) {
-      var _rest$onChange4, _formRef$current13, _formRef$current13$ge;
-      setText('');
-      (_rest$onChange4 = rest.onChange) === null || _rest$onChange4 === void 0 ? void 0 : _rest$onChange4.call(rest, '');
-      var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current13 = formRef.current) === null || _formRef$current13 === void 0 ? void 0 : (_formRef$current13$ge = _formRef$current13.getFieldsValue) === null || _formRef$current13$ge === void 0 ? void 0 : _formRef$current13$ge.call(_formRef$current13)) || {};
-      if (rowKey) {
-        formValue = formValue[rowKey] || {};
-      }
-      formValue[name] = '';
-      formValue[textNameProp] = '';
-      if (rowKey) {
-        var _formRef$current14, _formRef$current14$se;
-        formRef === null || formRef === void 0 ? void 0 : (_formRef$current14 = formRef.current) === null || _formRef$current14 === void 0 ? void 0 : (_formRef$current14$se = _formRef$current14.setFieldsValue) === null || _formRef$current14$se === void 0 ? void 0 : _formRef$current14$se.call(_formRef$current14, _defineProperty({}, rowKey, formValue));
-      } else {
-        var _formRef$current15, _formRef$current15$se;
-        formRef === null || formRef === void 0 ? void 0 : (_formRef$current15 = formRef.current) === null || _formRef$current15 === void 0 ? void 0 : (_formRef$current15$se = _formRef$current15.setFieldsValue) === null || _formRef$current15$se === void 0 ? void 0 : _formRef$current15$se.call(_formRef$current15, _objectSpread({}, formValue));
-      }
+      handleClear();
       if (onSelectChange) {
         try {
           onSelectChange(null, formRef);
-        } catch (e) {}
+        } catch (error) {}
       }
     }
   };
@@ -407,11 +400,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     },
     height: 'full',
     rowKey: tableKey,
-    onRow: function onRow(record) {
+    onRow: function onRow(rowData) {
       return {
         onDoubleClick: function onDoubleClick() {
           if (!multiple) {
-            handleValue(record);
+            handleValue(rowData);
           }
         }
       };
@@ -447,28 +440,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     showClear: true,
     selectedTagField: textField || valueField
   }));
-  // 处理有值时，可清空
-  useEffect(function () {
-    if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
-    try {
-      var el = inputRef.current.input.parentNode;
-      if (!el) return;
-      if (text) {
-        el.classList.add('ant-input-has-value');
-      } else {
-        el.classList.remove('ant-input-has-value');
-      }
-    } catch (e) {}
-  }, [text, rest, fieldProps]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'none'
-    }
-  }, /*#__PURE__*/React.createElement(ProFormText, {
-    name: name
-  })), rest.label ? /*#__PURE__*/React.createElement(ProFormText, _extends({
-    name: textNameProp
-  }, rest), /*#__PURE__*/React.createElement(_Input, _extends({
+  var InputDom = /*#__PURE__*/React.createElement(_Input, _extends({
     suffix: /*#__PURE__*/React.createElement(_Popover, {
       content: /*#__PURE__*/React.createElement("div", {
         style: {
@@ -485,13 +457,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       overlayStyle: {
         width: 'max-content'
       },
-      visible: rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) ? false : visible,
-      onVisibleChange: setVisible,
+      open: rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) ? false : visible,
+      onOpenChange: setVisible,
       getPopupContainer: getPopupContainer,
       placement: placement,
       arrowPointAtCenter: arrowPointAtCenter
     }, /*#__PURE__*/React.createElement(MoreOutlined, {
-      onClick: function onClick(e) {
+      onClick: function onClick() {
         if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
         setVisible(true);
       }
@@ -516,54 +488,32 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     readOnly: readonly,
     allowClear: allowClear,
     ref: inputRef
-  }, fieldProps))) : /*#__PURE__*/React.createElement(_Input, _extends({
-    suffix: /*#__PURE__*/React.createElement(_Popover, {
-      content: /*#__PURE__*/React.createElement("div", {
-        style: {
-          width: tableWidth + 'px',
-          height: tableHeight + 'px',
-          maxHeight: '95vh',
-          overflow: 'auto'
-        }
-      }, tableDom),
-      trigger: "click",
-      overlayInnerStyle: {
-        width: 'max-content'
-      },
-      overlayStyle: {
-        width: 'max-content'
-      },
-      visible: rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) ? false : visible,
-      onVisibleChange: setVisible,
-      getPopupContainer: getPopupContainer,
-      placement: placement,
-      arrowPointAtCenter: arrowPointAtCenter
-    }, /*#__PURE__*/React.createElement(MoreOutlined, {
-      onClick: function onClick(e) {
-        if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
-        setVisible(true);
-      }
-    })),
-    onClick: function onClick() {
-      if (!readonly) return;
-      setVisible(true);
-    },
-    onInput: onInput,
-    onPressEnter: function onPressEnter(e) {
-      if (triggerCheck === 'entry') {
-        onQuery(e);
-      }
-    },
-    onBlur: function onBlur(e) {
-      if (triggerCheck === 'blur') {
-        onQuery(e);
+  }, rest.label ? {} : {
+    value: text
+  }, fieldProps));
+  // 处理有值时，可清空
+  useEffect(function () {
+    if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
+    try {
+      var el = inputRef.current.input.parentNode;
+      if (!el) return;
+      if (text) {
+        el.classList.add('ant-input-has-value');
+      } else {
+        el.classList.remove('ant-input-has-value');
       }
-    },
-    onChange: clearValue,
-    readOnly: readonly,
-    value: text,
-    allowClear: allowClear,
-    ref: inputRef
-  }, fieldProps)));
+    } catch (e) {}
+  }, [text, rest, fieldProps]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'none'
+    }
+  }, /*#__PURE__*/React.createElement(ProFormText, {
+    name: name
+  })), /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: textNameProp
+  }, rest, {
+    noStyle: !rest.label
+  }), InputDom));
 });
 export default InputTable;

package/lib/http/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
@@ -15,6 +16,7 @@ var httpStatus = {
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
+  var _options$params;
   var token = getCookie('token');
   options.headers = options.headers || {};
   // 处理 token
@@ -47,12 +49,14 @@ request.interceptors.request.use(function (url, options) {
   }
 
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
+  var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
-    resCode: getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()
   };
-  if (!param.resCode) {
-    delete param.resCode;
+  // 当没有明文参数resCode的时候，添加resCode参数为资源Id
+  //@ts-ignore
+  if (resCode && !((_options$params = options.params) === null || _options$params === void 0 ? void 0 : _options$params.resCode)) {
+    param.resCode = resCode;
   }
   url = setUrlQuery(url, param);
   return {
@@ -204,7 +208,9 @@ function ajax(url) {
       timeout: timeout,
       requestType: isJson ? 'json' : 'form'
     }).finally(function () {
-      return exitLoading();
+      if (loadText) {
+        exitLoading();
+      }
     });
   }
 }
@@ -322,12 +328,11 @@ function _fetchOptions() {
           _yield$httpGet$rows = _yield$httpGet.rows;
           rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
           data = (rows || []).map(function (o) {
-            return {
+            return _objectSpread(_objectSpread({}, o), {}, {
               value: o[valueField],
               text: o[labelField],
-              label: (showValue ? o[valueField] + '→' : '') + o[labelField],
-              status: o.status
-            };
+              label: (showValue ? o[valueField] + '→' : '') + o[labelField]
+            });
           });
           return _context2.abrupt("return", data);
         case 10:

package/package.json

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