@zhubangyun/lowcode-core 5.8.290 → 5.10.81

package/lib/utils/api/form-api.js

@@ -3,12 +3,48 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.RestFormApi = void 0;
+exports.getFormApi = getFormApi;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _restApi = require("./rest-api");
 var _index = require("./index");
 var _formApi = require("./form-api.utils");
+var _cache = require("../cache");
+function getFormApi(_x, _x2, _x3) {
+  return _getFormApi.apply(this, arguments);
+}
+function _getFormApi() {
+  _getFormApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(formId, fieldId, mock) {
+    var key;
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+            return !!key;
+          }).join("_");
+          _context9.next = 4;
+          return _cache.formApi.getInstance(key, {
+            mock: mock,
+            fieldId: fieldId,
+            formId: formId
+          });
+        case 4:
+          return _context9.abrupt("return", _context9.sent);
+        case 5:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  }));
+  return _getFormApi.apply(this, arguments);
+}
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
@@ -93,7 +129,9 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return this.initialize();
           case 2:
             config.params = config.params || {};
-            config.params.description = "" + this.title;
+            if (__mock) {
+              config.params.description = "" + this.title;
+            }
             config.params.formId = this.formId;
             if (this.fieldId) {
               config.params.fieldId = this.fieldId;
@@ -107,7 +145,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee2, this);
     }));
-    function handleRequestConfig(_x) {
+    function handleRequestConfig(_x4) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;
@@ -115,49 +153,52 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.search = /*#__PURE__*/function () {
     var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(searchParams) {
       var _searchParams, _searchParams2;
-      var config, res, start;
+      var params, config, res;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             searchParams = searchParams || {};
+            params = {
+              formId: this.formId,
+              fieldId: this.fieldId
+            };
+            if (__mock) {
+              params.description = "" + this.title;
+            }
             config = {
-              params: {
-                description: this.title + "\u67E5\u8BE2",
-                formId: this.formId,
-                fieldId: this.fieldId
-              }
+              params: params
             };
-            _context3.next = 4;
+            _context3.next = 6;
             return this.handleRequestConfig(config);
-          case 4:
+          case 6:
             searchParams.filterRules = (0, _formApi.handleFilterRules)(((_searchParams = searchParams) === null || _searchParams === void 0 ? void 0 : _searchParams.filterRules) || [], {
               filterNullValue: false
             });
             searchParams.searchFields = (0, _formApi.handleFilterRules)(((_searchParams2 = searchParams) === null || _searchParams2 === void 0 ? void 0 : _searchParams2.searchFields) || [], {
               filterNullValue: true
             });
-            _context3.next = 8;
-            return this.request.post("search", searchParams, config);
-          case 8:
+            config.params = (0, _extends2["default"])({}, params, searchParams);
+            _context3.next = 11;
+            return this.request.get("search", config);
+          case 11:
             res = _context3.sent;
-            start = Date.now();
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
-            console.debug("form.search:" + (Date.now() - start), res);
+            console.debug("form.search:", res);
             return _context3.abrupt("return", res);
-          case 13:
+          case 15:
           case "end":
             return _context3.stop();
         }
       }, _callee3, this);
     }));
-    function search(_x2) {
+    function search(_x5) {
       return _search.apply(this, arguments);
     }
     return search;
   }();
   _proto.getById = /*#__PURE__*/function () {
     var _getById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id, options) {
-      var res, start;
+      var res;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -165,17 +206,16 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
-            start = Date.now();
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
-            console.debug("formApi.getById" + (Date.now() - start), res);
+            console.debug("form.getById:", res);
             return _context4.abrupt("return", res);
-          case 7:
+          case 6:
           case "end":
             return _context4.stop();
         }
       }, _callee4, this);
     }));
-    function getById(_x3, _x4) {
+    function getById(_x6, _x7) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -192,7 +232,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee5, this);
     }));
-    function save(_x5, _x6) {
+    function save(_x8, _x9) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -209,7 +249,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee6, this);
     }));
-    function create(_x7, _x8) {
+    function create(_x10, _x11) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -226,7 +266,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee7, this);
     }));
-    function update(_x9, _x10, _x11) {
+    function update(_x12, _x13, _x14) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -243,7 +283,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee8, this);
     }));
-    function serviceUpdate(_x12, _x13) {
+    function serviceUpdate(_x15, _x16) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

package/lib/utils/api/form-api.utils.d.ts

@@ -1,5 +1,7 @@
 import { BaseType, FilterRule, Refs } from "./rest-api";
 export declare function convertSaveData(data: any): any;
+export declare function handleEntityLabel(data: BaseType | BaseType[]): void;
+export declare function dataToLabel(value: any): any;
 export declare function assembleAssociationFieldV2(data: BaseType | BaseType[], refs?: Refs): void;
 export declare function assembleAssociationFieldDataV2(data: BaseType | BaseType[], dataMap: Map<string, BaseType>): void;
 export declare function assembleAssociationField(data: BaseType | BaseType[], refs?: Refs): void;

package/lib/utils/api/form-api.utils.js

@@ -6,6 +6,8 @@ exports.assembleAssociationField = assembleAssociationField;
 exports.assembleAssociationFieldDataV2 = assembleAssociationFieldDataV2;
 exports.assembleAssociationFieldV2 = assembleAssociationFieldV2;
 exports.convertSaveData = convertSaveData;
+exports.dataToLabel = dataToLabel;
+exports.handleEntityLabel = handleEntityLabel;
 exports.handleFilterRules = handleFilterRules;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _data = require("../data");
@@ -16,40 +18,85 @@ function convertSaveData(data) {
   if (!data) return data;
   return JSON.parse(JSON.stringify(data, function (key, value) {
     if (key == "parent") {
-      return value === null || value === void 0 ? void 0 : value.id;
+      var id = value === null || value === void 0 ? void 0 : value.id;
+      return id ? {
+        id: id
+      } : undefined;
     }
     return value;
   }));
 }
 function getDataKey(data) {
-  var key = data.form.id;
-  if (data.form.fieldId) {
+  var _data$form, _data$form2;
+  if (!data) {
+    return "undefined";
+  }
+  var key = (_data$form = data.form) === null || _data$form === void 0 ? void 0 : _data$form.id;
+  if ((_data$form2 = data.form) !== null && _data$form2 !== void 0 && _data$form2.fieldId) {
     key += "." + data.form.fieldId;
   }
   return key + "." + data.id;
 }
+function handleEntityLabel(data) {
+  if (!Array.isArray(data)) {
+    data = [data];
+  }
+  for (var _iterator = _createForOfIteratorHelperLoose(data), _step; !(_step = _iterator()).done;) {
+    var _item$form;
+    var item = _step.value;
+    var labelField = (_item$form = item.form) === null || _item$form === void 0 ? void 0 : _item$form.labelField;
+    if (labelField) {
+      // @ts-ignore
+      var value = item[labelField];
+      item.label = dataToLabel(value);
+    }
+  }
+}
+function dataToLabel(value) {
+  if (value == null) {
+    return "";
+  }
+  if (Array.isArray(value)) {
+    return value.map(dataToLabel).filter(function (value) {
+      return !!value;
+    });
+  }
+  if (typeof value == "object") {
+    return (value === null || value === void 0 ? void 0 : value.label) || (value === null || value === void 0 ? void 0 : value.id) || value.label || "";
+  }
+  if (typeof value == "string") {
+    return value;
+  }
+  if (typeof value == "number") {
+    return value;
+  }
+  return (value === null || value === void 0 ? void 0 : value.id) || value.value || value;
+}
 function assembleAssociationFieldV2(data, refs) {
   if (!data || !refs) return;
   var dataMap = new Map();
-  for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
-    var ref = _step.value;
-    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.data), _step3; !(_step3 = _iterator3()).done;) {
-      var datum = _step3.value;
-      var key = getDataKey(datum);
-      dataMap.set(key, datum);
+  for (var _iterator2 = _createForOfIteratorHelperLoose(refs), _step2; !(_step2 = _iterator2()).done;) {
+    var ref = _step2.value;
+    for (var _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
+      var datum = _step4.value;
+      if (datum) {
+        var key = getDataKey(datum);
+        dataMap.set(key, datum);
+      }
     }
   }
 
   //组装refs的关联属性
-  for (var _iterator2 = _createForOfIteratorHelperLoose(dataMap.values()), _step2; !(_step2 = _iterator2()).done;) {
-    var item = _step2.value;
-    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
-      var _key = _Object$keys[_i2];
+  for (var _iterator3 = _createForOfIteratorHelperLoose(dataMap.values()), _step3; !(_step3 = _iterator3()).done;) {
+    var item = _step3.value;
+    for (var _i2 = 0, _Object$keys2 = Object.keys(item); _i2 < _Object$keys2.length; _i2++) {
+      var _key = _Object$keys2[_i2];
       // @ts-ignore
       var value = item[_key];
       assembleAssociationFieldDataV2(value, dataMap);
     }
   }
+  handleEntityLabel([].concat(dataMap.values()));
   function loopAssembleAssociation(value) {
     if (Array.isArray(value)) {
       value.forEach(function (item) {
@@ -57,125 +104,49 @@ function assembleAssociationFieldV2(data, refs) {
       });
     } else if (value !== null && value !== void 0 && value.id) {
       assembleAssociationFieldDataV2(value, dataMap);
-      //处理子表
-      for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
-        var subValues = _Object$values[_i];
+      for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
+        var key = _Object$keys[_i];
+        // @ts-ignore
+        var subValues = value[key];
         if (typeof subValues == "object") {
+          if (key == "parent") {
+            continue;
+          }
           loopAssembleAssociation(subValues);
         }
       }
     }
   }
   loopAssembleAssociation(data);
+  handleEntityLabel(data);
 }
 function assembleAssociationFieldDataV2(data, dataMap) {
   if (data == null) {
     return;
   }
-  if (Array.isArray(data)) {
-    data.forEach(function (item) {
-      return assembleAssociationFieldDataV2(item, dataMap);
-    });
-  } else {
-    var _data$form;
-    if (data !== null && data !== void 0 && (_data$form = data.form) !== null && _data$form !== void 0 && _data$form.id && data !== null && data !== void 0 && data.id) {
-      delete data._load;
-      var key = getDataKey(data);
-      var value = dataMap.get(key);
-      if (value) {
-        Object.assign(data, value);
+  try {
+    if (Array.isArray(data)) {
+      data.forEach(function (item) {
+        return assembleAssociationFieldDataV2(item, dataMap);
+      });
+    } else {
+      var _data$form3;
+      if (data !== null && data !== void 0 && (_data$form3 = data.form) !== null && _data$form3 !== void 0 && _data$form3.id && data !== null && data !== void 0 && data.id) {
         delete data._load;
+        var key = getDataKey(data);
+        var value = dataMap.get(key);
+        if (value) {
+          Object.assign(data, value);
+          delete data._load;
+        }
       }
     }
+  } catch (e) {
+    console.log("装配对象失败", data, dataMap);
   }
 }
 function assembleAssociationField(data, refs) {
   assembleAssociationFieldV2(data, refs);
-  return;
-  if (!data || !refs) return;
-  var fieldIdDataMap = new Map();
-  for (var _iterator4 = _createForOfIteratorHelperLoose(refs), _step4; !(_step4 = _iterator4()).done;) {
-    var ref = _step4.value;
-    var dataMap = new Map();
-    for (var _iterator7 = _createForOfIteratorHelperLoose(ref.data), _step7; !(_step7 = _iterator7()).done;) {
-      var datum = _step7.value;
-      dataMap.set(datum.id, datum);
-    }
-    for (var _iterator8 = _createForOfIteratorHelperLoose(ref.fieldIds), _step8; !(_step8 = _iterator8()).done;) {
-      var fieldId = _step8.value;
-      fieldIdDataMap.set(fieldId + "Id", dataMap);
-    }
-  }
-  //组装refs的关联属性
-  for (var _iterator5 = _createForOfIteratorHelperLoose(refs), _step5; !(_step5 = _iterator5()).done;) {
-    var _ref = _step5.value;
-    var key = _ref.form.id;
-    if (_ref.form.fieldId) {
-      key += "." + _ref.form.fieldId;
-    }
-    assembleAssociationFieldValue(_ref.data, fieldIdDataMap, key);
-  }
-  function loopAssembleAssociation(values) {
-    if (!Array.isArray(values)) {
-      if (values !== null && values !== void 0 && values.id) {
-        loopAssembleAssociation([values]);
-      }
-    }
-    if (Array.isArray(values)) {
-      var _values$;
-      if ((_values$ = values[0]) !== null && _values$ !== void 0 && _values$.id) {
-        assembleAssociationFieldValue(values, fieldIdDataMap);
-        //处理子表
-        for (var _iterator6 = _createForOfIteratorHelperLoose(values), _step6; !(_step6 = _iterator6()).done;) {
-          var value = _step6.value;
-          for (var _i3 = 0, _Object$values2 = Object.values(value); _i3 < _Object$values2.length; _i3++) {
-            var subValues = _Object$values2[_i3];
-            if (Array.isArray(subValues)) {
-              loopAssembleAssociation(subValues);
-            }
-          }
-        }
-      }
-    }
-  }
-  loopAssembleAssociation(data);
-}
-function assembleAssociationFieldValue(data, fieldIdDataMap, prefixKey) {
-  var arrayData = [];
-  if (Array.isArray(data)) {
-    arrayData = data;
-  } else if (typeof data == "object") {
-    arrayData = [data];
-  }
-  for (var _iterator9 = _createForOfIteratorHelperLoose(arrayData), _step9; !(_step9 = _iterator9()).done;) {
-    var item = _step9.value;
-    var _loop = function _loop() {
-      var fieldIdName = _Object$keys2[_i4];
-      var fieldIdKey = fieldIdName;
-      if (prefixKey) {
-        fieldIdKey = prefixKey + "." + fieldIdName;
-      }
-      var dataMap = fieldIdDataMap.get(fieldIdKey);
-      if (dataMap) {
-        var fieldIdValue = item[fieldIdName];
-        var fieldValue = null;
-        if (Array.isArray(fieldIdValue)) {
-          // @ts-ignore
-          fieldValue = fieldIdValue.map(function (id) {
-            return dataMap.get(id);
-          }).filter(function (v) {
-            return !!v;
-          });
-        } else if (typeof fieldIdValue == "string") {
-          fieldValue = dataMap.get(fieldIdValue);
-        }
-        item[fieldIdName.slice(0, -2)] = fieldValue;
-      }
-    };
-    for (var _i4 = 0, _Object$keys2 = Object.keys(item); _i4 < _Object$keys2.length; _i4++) {
-      _loop();
-    }
-  }
 }
 function handleFilterRules(filters, options) {
   var filterNullValue = options.filterNullValue;

package/lib/utils/api/index.d.ts

@@ -1,10 +1,10 @@
-import { OneResult } from "./rest-api";
 export { RestApi } from "./rest-api";
-import { RestFormApi } from "./form-api";
+export { getFormApi, RestFormApi } from "./form-api";
+export { getSchema } from "./schema-api";
 export { loadUserInfo } from "./user-info";
-export { RestFormApi } from "./form-api";
+export * as files from "./file-api";
+export * as scrips from "./script-api";
 export declare const apiRequest: import("axios").AxiosInstance;
-export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
-export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
+export declare const request: <T = any, R = import("axios").AxiosResponse<T, any>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
 export declare function onFulfilled(res: any): any;
 export declare function onRejected(error: any): any;

package/lib/utils/api/index.js

@@ -2,22 +2,26 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
-exports.getFormApi = getFormApi;
-exports.getSchema = getSchema;
-exports.loadUserInfo = void 0;
+exports.loadUserInfo = exports.getSchema = exports.getFormApi = exports.files = exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
 exports.onFulfilled = onFulfilled;
 exports.onRejected = onRejected;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+exports.scrips = exports.request = void 0;
 var _axios = _interopRequireDefault(require("axios"));
-var _cache = require("../cache");
 var _restApi = require("./rest-api");
 exports.RestApi = _restApi.RestApi;
-var _userInfo = require("./user-info");
-exports.loadUserInfo = _userInfo.loadUserInfo;
 var _formApi = require("./form-api");
+exports.getFormApi = _formApi.getFormApi;
 exports.RestFormApi = _formApi.RestFormApi;
+var _schemaApi = require("./schema-api");
+exports.getSchema = _schemaApi.getSchema;
+var _userInfo = require("./user-info");
+exports.loadUserInfo = _userInfo.loadUserInfo;
+var _files = _interopRequireWildcard(require("./file-api"));
+exports.files = _files;
+var _scrips = _interopRequireWildcard(require("./script-api"));
+exports.scrips = _scrips;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var apiRequest = exports.apiRequest = _axios["default"].create({
   baseURL: "/api",
   // 基础URL
@@ -28,69 +32,7 @@ var apiRequest = exports.apiRequest = _axios["default"].create({
   }
 });
 apiRequest.interceptors.response.use(onFulfilled, onRejected);
-function getSchema(_x, _x2) {
-  return _getSchema.apply(this, arguments);
-}
-function _getSchema() {
-  _getSchema = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(pageId, mock) {
-    var key;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (typeof mock != "boolean") {
-            if (typeof window.__mock == "boolean") {
-              mock = window.__mock;
-            }
-          }
-          key = mock ? pageId + "_mock" : pageId;
-          _context.next = 4;
-          return _cache.schema.getInstance(key, {
-            mock: mock,
-            pageId: pageId
-          });
-        case 4:
-          return _context.abrupt("return", _context.sent);
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _getSchema.apply(this, arguments);
-}
-function getFormApi(_x3, _x4, _x5) {
-  return _getFormApi.apply(this, arguments);
-}
-function _getFormApi() {
-  _getFormApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(formId, fieldId, mock) {
-    var key;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          if (typeof mock != "boolean") {
-            if (typeof window.__mock == "boolean") {
-              mock = window.__mock;
-            }
-          }
-          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
-            return !!key;
-          }).join("_");
-          _context2.next = 4;
-          return _cache.formApi.getInstance(key, {
-            mock: mock,
-            fieldId: fieldId,
-            formId: formId
-          });
-        case 4:
-          return _context2.abrupt("return", _context2.sent);
-        case 5:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return _getFormApi.apply(this, arguments);
-}
+var request = exports.request = apiRequest.request;
 function onFulfilled(res) {
   return res.data;
 }

package/lib/utils/api/rest-api.d.ts

@@ -1,4 +1,5 @@
 import { AxiosInstance, AxiosRequestConfig } from "axios";
+export declare type ValueType = "value" | "field" | "express";
 export interface RestApiOptions {
     /**
      * 超时时间
@@ -12,9 +13,10 @@ export interface RestApiOptions {
 }
 export interface FilterRule {
     connector?: "and" | "or";
-    key: string;
+    key?: string;
     operator?: OperatorType;
-    value: any;
+    valueType?: ValueType;
+    value?: any;
     rules?: FilterRule[];
 }
 export declare type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
@@ -87,6 +89,7 @@ export interface BaseType {
         id: string;
         fieldId?: string;
         label: string;
+        labelField: string;
     };
     _load?: boolean;
 }
@@ -95,6 +98,7 @@ export interface BaseType {
  */
 export interface BaseResult<DataType> {
     success: boolean;
+    requestId?: string;
     message?: string;
     refs?: Refs;
 }