@pisell/materials 6.0.14 → 6.0.16

package/es/components/dataSourceComponents/dataSourceTable/index.js

@@ -1,8 +1,9 @@
-import React from 'react';
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+import React, { forwardRef } from 'react';
 import BaseTable from "./BaseTable";
 import DataSourceProvider from "../provider/dataSource/DataSourceProvider";
 import "./index.less";
-var DataSourceTable = function DataSourceTable(props) {
+var DataSourceTable = function DataSourceTable(props, ref) {
   var dataSource = props.dataSource,
     __designMode = props.__designMode,
     extraParams = props.extraParams;
@@ -10,6 +11,8 @@ var DataSourceTable = function DataSourceTable(props) {
     dataSource: dataSource,
     __designMode: __designMode,
     extraParams: extraParams
-  }, /*#__PURE__*/React.createElement(BaseTable, props));
+  }, /*#__PURE__*/React.createElement(BaseTable, _extends({}, props, {
+    ref: ref
+  })));
 };
-export default DataSourceTable;
+export default /*#__PURE__*/forwardRef(DataSourceTable);

package/es/components/dataSourceComponents/fields/DatePicker/index.js

@@ -1,10 +1,23 @@
 import { withFormItem } from "../../dataSourceForm/utils";
 import DatePickerWithMode from "./WithMode";
+import dayjs from 'dayjs';
 var DatePicker = withFormItem(DatePickerWithMode, {
   innerProps: {
     style: {
       width: '100%'
     }
+  },
+  otherFormItemProps: function otherFormItemProps(props) {
+    return {
+      normalize: function normalize(value) {
+        return value && dayjs(value).format(props.submitFormat || "YYYY-MM-DD");
+      },
+      getValueProps: function getValueProps(value) {
+        return {
+          value: value && dayjs(value)
+        };
+      }
+    };
   }
 });
 export default DatePicker;

package/es/components/dataSourceComponents/fields/IconSelect/ReadPretty.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { IconSelectProps } from './type';
+import './ReadPretty.less';
+declare const IconSelectReadPretty: (props: IconSelectProps) => React.JSX.Element | null;
+export default IconSelectReadPretty;

package/es/components/dataSourceComponents/fields/IconSelect/ReadPretty.js

@@ -0,0 +1,18 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+import React from 'react';
+import { Button } from 'antd';
+import Icon from "../../../icon";
+import "./ReadPretty.less";
+var IconSelectReadPretty = function IconSelectReadPretty(props) {
+  if (!props.value) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(Button, {
+    size: "large",
+    icon: /*#__PURE__*/React.createElement(Icon, _extends({
+      type: props.value
+    }, props)),
+    className: "pisell-icon-select-read-pretty"
+  });
+};
+export default IconSelectReadPretty;

package/es/components/dataSourceComponents/fields/IconSelect/ReadPretty.less

@@ -0,0 +1,6 @@
+.pisell-icon-select-read-pretty {
+  font-size: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

package/es/components/dataSourceComponents/fields/IconSelect/WithMode.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import { IconSelectProps } from './type';
+declare const IconSelectWithMode: import("react").FC<IconSelectProps & import("../../dataSourceForm/utils").WithModeProps>;
+export default IconSelectWithMode;

package/es/components/dataSourceComponents/fields/IconSelect/WithMode.js

@@ -0,0 +1,5 @@
+import IconSelect from "../../../iconSelect";
+import ReadPretty from "./ReadPretty";
+import { withMode } from "../../dataSourceForm/utils";
+var IconSelectWithMode = withMode(IconSelect, ReadPretty);
+export default IconSelectWithMode;

package/es/components/dataSourceComponents/fields/IconSelect/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const IconSelect: React.FC<import("./type").IconSelectProps & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
+export default IconSelect;

package/es/components/dataSourceComponents/fields/IconSelect/index.js

@@ -0,0 +1,4 @@
+import { withFormItem } from "../../dataSourceForm/utils";
+import IconSelectWithMode from "./WithMode";
+var IconSelect = withFormItem(IconSelectWithMode);
+export default IconSelect;

package/es/components/dataSourceComponents/fields/IconSelect/type.d.ts

@@ -0,0 +1,8 @@
+import { ModeType } from "../../dataSourceForm/type";
+export interface IconSelectProps {
+    renderMode: ModeType;
+    value?: string;
+    defaultValue?: string;
+    disabled?: boolean;
+    onChange?: (value: string) => void;
+}

package/es/components/dataSourceComponents/fields/IconSelect/type.js

@@ -0,0 +1 @@
+export {};

package/es/components/dataSourceComponents/fields/Input/WithMode.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
-import { InputProps } from 'antd';
-declare const InputWithMode: import("react").FC<InputProps & import("../../dataSourceForm/utils").WithModeProps>;
+import React from 'react';
+import { InputProps } from './type';
+declare const InputWithMode: React.FC<InputProps & import("../../dataSourceForm/utils").WithModeProps>;
 export default InputWithMode;

package/es/components/dataSourceComponents/fields/Input/WithMode.js

@@ -1,5 +1,12 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import { Input as AntInput } from 'antd';
+import React from 'react';
 import ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
-var InputWithMode = withMode(AntInput, ReadPretty);
+var Input = function Input(props) {
+  return /*#__PURE__*/React.createElement(AntInput, _extends({}, props, {
+    ref: props.innerRef || undefined
+  }));
+};
+var InputWithMode = withMode(Input, ReadPretty);
 export default InputWithMode;

package/es/components/dataSourceComponents/fields/Input/type.d.ts

@@ -1,5 +1,7 @@
+import { Ref } from 'react';
 import { InputProps as AntInputProps } from 'antd';
 import { ModeType } from "../../dataSourceForm/type";
 export interface InputProps extends AntInputProps {
     renderMode: ModeType;
+    innerRef: Ref<any>;
 }

package/es/components/dataSourceComponents/fields/Select/index.d.ts

@@ -4,6 +4,7 @@ declare const SelectWithDataSource: (props: import("antd").SelectProps<any, impo
     optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
+    extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
 }) => React.JSX.Element;

package/es/components/dataSourceComponents/fields/Select/index.js

@@ -6,7 +6,8 @@ var SelectWithFormItem = withFormItem(SelectWithMode, {
   innerProps: {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return triggerNode.parentElement;
-    }
+    },
+    virtual: false
   }
 });
 

package/es/components/dataSourceComponents/fields/Upload/BaseUpload.js

@@ -34,7 +34,7 @@ import PisellUpload from "../../../pisellUpload";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { getText } from "../../../../locales";
 import { DEFAULT_MAX_COUNT, SUPPORTED_LANGUAGES } from "./constants";
-import { getPointSuffix, checkFileCount, getFileType, getMediaMetadata, getFileMetadataParams, getDefaultFileList, createMultilingualData, createMultilingualFileList, isValueEqual } from "./utils";
+import { getPointSuffix, getFileType, getMediaMetadata, getFileMetadataParams, getDefaultFileList, createMultilingualData, createMultilingualFileList, isValueEqual } from "./utils";
 
 // @ts-ignore
 import fallback from "./fallback.png";
@@ -381,7 +381,7 @@ var BaseUpload = function BaseUpload(props) {
   }, []);
   var beforeUpload = useCallback( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file, newFileList) {
-      var currentFileCount, fileType, typeMaxSize, _maxSize, pointSuffix, _checkFileCount, success, message, metadata, cover, restMetadata;
+      var currentFileCount, fileType, typeMaxSize, _maxSize, pointSuffix, metadata, cover, restMetadata;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -409,42 +409,29 @@ var BaseUpload = function BaseUpload(props) {
             typeError.run(getText('pisell-upload-setting-type-error')(pointSuffix));
             return _context2.abrupt("return", Upload.LIST_IGNORE);
           case 12:
-            _checkFileCount = checkFileCount({
-              minCount: minCount || 0,
-              maxCount: maxCount || DEFAULT_MAX_COUNT,
-              valueLength: fileList.length + currentFileCount,
-              multiple: !!multiple
-            }), success = _checkFileCount.success, message = _checkFileCount.message;
-            if (success) {
-              _context2.next = 16;
-              break;
-            }
-            countError.run(message);
-            return _context2.abrupt("return", Upload.LIST_IGNORE);
-          case 16:
-            _context2.prev = 16;
-            _context2.next = 19;
+            _context2.prev = 12;
+            _context2.next = 15;
             return getMediaMetadata(file);
-          case 19:
+          case 15:
             metadata = _context2.sent;
             if (metadata) {
               cover = metadata.cover, restMetadata = _objectWithoutProperties(metadata, _excluded2);
               file.metadata = restMetadata;
               file.cover = cover;
             }
-            _context2.next = 26;
+            _context2.next = 22;
             break;
-          case 23:
-            _context2.prev = 23;
-            _context2.t0 = _context2["catch"](16);
+          case 19:
+            _context2.prev = 19;
+            _context2.t0 = _context2["catch"](12);
             console.error('获取媒体元数据失败:', _context2.t0);
-          case 26:
+          case 22:
             return _context2.abrupt("return", file);
-          case 27:
+          case 23:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[16, 23]]);
+      }, _callee2, null, [[12, 19]]);
     }));
     return function (_x3, _x4) {
       return _ref4.apply(this, arguments);
@@ -532,36 +519,7 @@ var BaseUpload = function BaseUpload(props) {
     headers: (propsGetHeaders === null || propsGetHeaders === void 0 ? void 0 : propsGetHeaders()) || (getHeaders === null || getHeaders === void 0 ? void 0 : getHeaders()),
     beforeUpload: beforeUpload,
     className: 'pisell-data-source-upload'
-    // itemRender: (originNode: React.ReactElement, file: UploadFile) => {
-    //   const [itemUrl, setItemUrl] = useState<string>('');
-
-    //   useEffect(() => {
-    //     getItemUrl(file).then(setItemUrl);
-    //   }, [file]);
-
-    //   const newNode = React.cloneElement(originNode, {
-    //     children: React.Children.map(originNode.props.children, child => {
-    //       if (child?.type === 'a') {
-    //         return React.cloneElement(child, {
-    //           children: React.Children.map(child.props.children, grandChild => {
-    //             if (grandChild?.type === 'img') {
-    //               return React.cloneElement(grandChild, {
-    //                 src: itemUrl,
-    //                 onError: () => handleImageError(file)
-    //               });
-    //             }
-    //             return grandChild;
-    //           })
-    //         });
-    //       }
-    //       return child;
-    //     })
-    //   });
-
-    //   return newNode;
-    // }
   });
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellUpload, _extends({}, uploadProps, {
     fileList: fileList
   }), fileList.length >= calcMaxCount ? null : renderUploadButton(!!enableMultilingual)), /*#__PURE__*/React.createElement(PisellModal, {

package/es/components/dataSourceComponents/fields/Upload/ReadPretty.js

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { Image } from 'antd';
+import { Image, Space } from 'antd';
 import { isArr, isString } from '@pisell/utils';
 import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
 
@@ -29,7 +29,7 @@ var UploadReadPretty = function UploadReadPretty(props) {
   if (!normalizedValue.length) {
     return null;
   }
-  return /*#__PURE__*/React.createElement("div", null, normalizedValue.map(function (item, index) {
+  return /*#__PURE__*/React.createElement(Space, null, normalizedValue.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Image, {
       key: "".concat(String(item), "-").concat(index),
       className: "pisell-upload-read-pretty",

package/es/components/dataSourceComponents/fields/Upload/ReadPretty.less

@@ -5,6 +5,7 @@
   padding: 10px;
   border-radius: 10px;
   border: 1px solid var(--Gray-300, #d0d5dd);
+  object-fit: contain;
 }
 .pisell-upload-read-pretty-mask {
   border-radius: 10px;

package/es/components/dataSourceComponents/fields/Upload/index.js

@@ -1,4 +1,38 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { withFormItem } from "../../dataSourceForm/utils";
 import UploadWithMode from "./WithMode";
-var Upload = withFormItem(UploadWithMode);
+import { checkFileCount } from "./utils";
+import { DEFAULT_MAX_COUNT } from "./constants";
+var Upload = withFormItem(UploadWithMode, {
+  otherFormItemProps: function otherFormItemProps(props, others) {
+    var rule = {};
+    if (props.multiple) {
+      rule = {
+        validator: function validator(_, value) {
+          var _checkFileCount = checkFileCount({
+              minCount: props.minCount || 0,
+              maxCount: props.maxCount || DEFAULT_MAX_COUNT,
+              valueLength: (value === null || value === void 0 ? void 0 : value.length) || 0,
+              multiple: !!props.multiple
+            }),
+            success = _checkFileCount.success,
+            message = _checkFileCount.message;
+          if (!success) {
+            return Promise.reject(new Error(message));
+          } else {
+            return Promise.resolve();
+          }
+        }
+      };
+    }
+    return {
+      rules: [].concat(_toConsumableArray((others === null || others === void 0 ? void 0 : others.rules) || []), [rule])
+    };
+  }
+});
 export default Upload;

package/es/components/dataSourceComponents/fields/Upload/type.d.ts

@@ -10,6 +10,7 @@ export interface UploadFile extends AntdUploadFile {
 }
 export interface UploadProps {
     renderMode?: string;
+    fieldKey: string;
     maxSize?: number;
     minCount?: number;
     maxCount?: number;

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -38,6 +38,7 @@ declare const formFieldMap: {
         optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
+        extraParams?: Record<string, any> | undefined;
     } & {
         dataSource?: any;
     }) => import("react").JSX.Element;
@@ -57,8 +58,9 @@ declare const formFieldMap: {
     FormItemDateRangePicker: import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemUpload: import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<any> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -93,7 +95,8 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
+    extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
-}) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+}) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 export { getFieldComponent, formFieldMap };

package/es/components/dataSourceComponents/fields/index.js

@@ -9,6 +9,7 @@ import TimePicker from "./TimePicker";
 import DateRangePicker from "./DateRangePicker";
 import Upload from "./Upload";
 import Translation from "./Translation";
+import IconSelect from "./IconSelect";
 
 // 表单字段组件映射 增加时需要同步更新 utils 中的 formFieldFilterFuncMap
 var formFieldMap = {
@@ -31,7 +32,8 @@ var formFieldMap = {
   'FormItemCheckbox.Group': Checkbox.Group,
   FormItemDateRangePicker: DateRangePicker,
   FormItemUpload: Upload,
-  FormItemTranslation: Translation
+  FormItemTranslation: Translation,
+  FormItemIconSelect: IconSelect
 };
 var getFieldComponent = function getFieldComponent(fieldComponent) {
   return formFieldMap[fieldComponent];

package/es/components/dataSourceComponents/hooks/useActions.js

@@ -218,7 +218,7 @@ var useActions = function useActions() {
           return _context3.abrupt("return", {});
         case 5:
           getApi = genCustomApi(actions === null || actions === void 0 ? void 0 : actions.get);
-          return _context3.abrupt("return", getApi({}));
+          return _context3.abrupt("return", getApi(extraParams === null || extraParams === void 0 ? void 0 : extraParams.get));
         case 7:
           _context3.next = 9;
           return getNocobaseData({

package/es/components/dataSourceComponents/hooks/useValueMap.js

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { isString } from '@pisell/utils';
+import { isNumber, isString } from '@pisell/utils';
 
 /**
  * 将 options 转换为 valueMap
@@ -12,7 +12,7 @@ var useValueMap = function useValueMap(options) {
     return (options === null || options === void 0 ? void 0 : options.reduce(function (acc, item) {
       var itemValue = item.value;
       var itemLabel = item.label;
-      if (isString(itemValue) && isString(itemLabel)) {
+      if ((isString(itemValue) || isNumber(itemValue)) && isString(itemLabel)) {
         acc[itemValue] = itemLabel;
       }
       return acc;

package/es/components/dataSourceComponents/provider/dataSource/DataSourceContext.d.ts

@@ -80,6 +80,13 @@ export declare type DataSourceContextProps = {
         create?: () => Promise<any>;
         destroy?: () => Promise<any>;
     };
+    requestOptions?: {
+        list?: any;
+        get?: any;
+        update?: any;
+        create?: any;
+        destroy?: any;
+    };
     overrideData?: {
         list?: any;
         get?: any;
@@ -106,6 +113,7 @@ export interface DataSourceContextType {
     update: Result<any, any>;
     create: Result<any, any>;
     __designMode?: string;
+    getCurrentRecord: () => any;
 }
 export declare const DataSourceContext: import("react").Context<DataSourceContextType>;
 export default DataSourceContext;

package/es/components/dataSourceComponents/provider/dataSource/DataSourceContext.js

@@ -5,7 +5,8 @@ var initialContext = {
   destroy: {},
   get: {},
   update: {},
-  create: {}
+  create: {},
+  getCurrentRecord: function getCurrentRecord() {}
 };
 export var DataSourceContext = /*#__PURE__*/createContext(initialContext);
 export default DataSourceContext;

package/es/components/dataSourceComponents/provider/dataSource/DataSourceProvider.js

@@ -5,12 +5,13 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React, { useMemo } from 'react';
-import { useRequest } from 'ahooks';
+import { useMemoizedFn, useRequest } from 'ahooks';
 import { isString, isBoolean } from '@pisell/utils';
 import DataSourceContext from "./DataSourceContext";
 import useActions from "../../hooks/useActions";
 import useVariables from "../../hooks/useVariables";
 import useSetRequest from "../../../../hooks/useSetRequest";
+import useDataSource from "../../hooks/useDataSource";
 
 /**
  * @title: DataSource Provider
@@ -24,10 +25,16 @@ var DataSourceProvider = function DataSourceProvider(props) {
     externalActions = props.actions,
     overrideData = props.overrideData,
     autoRun = props.autoRun,
+    requestOptions = props.requestOptions,
     __designMode = props.__designMode;
+  var _useDataSource = useDataSource(),
+    ctxGetCurrentRecord = _useDataSource.getCurrentRecord;
   useSetRequest();
   var _useVariables = useVariables(),
     parseVariable = _useVariables.parseVariable;
+  var getCurrentRecord = useMemoizedFn(function () {
+    return (parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(currentValue, {})) || ctxGetCurrentRecord();
+  });
   var dataSource = isString(propsDataSource) ? parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(propsDataSource) : propsDataSource;
 
   // 处理标准数据源
@@ -44,9 +51,9 @@ var DataSourceProvider = function DataSourceProvider(props) {
   var update = (externalActions === null || externalActions === void 0 ? void 0 : externalActions.update) || standardActions.update;
   var create = (externalActions === null || externalActions === void 0 ? void 0 : externalActions.create) || standardActions.create;
   var destroy = (externalActions === null || externalActions === void 0 ? void 0 : externalActions.destroy) || standardActions.destroy;
-  var listResult = useRequest(list, {
+  var listResult = useRequest(list, _objectSpread({
     manual: isBoolean(autoRun === null || autoRun === void 0 ? void 0 : autoRun.list) ? !(autoRun !== null && autoRun !== void 0 && autoRun.list) : true
-  });
+  }, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.list));
   var getResult = useRequest(get, {
     manual: isBoolean(autoRun === null || autoRun === void 0 ? void 0 : autoRun.get) ? !(autoRun !== null && autoRun !== void 0 && autoRun.get) : true
   });
@@ -63,6 +70,7 @@ var DataSourceProvider = function DataSourceProvider(props) {
     return {
       __designMode: __designMode,
       dataSource: dataSource,
+      getCurrentRecord: getCurrentRecord,
       list: _objectSpread(_objectSpread({}, listResult), {}, {
         data: (overrideData === null || overrideData === void 0 ? void 0 : overrideData.list) || listResult.data
       }),

package/es/components/dataSourceComponents/provider/variables/VariablesProvider.js

@@ -40,6 +40,9 @@ var VariablesProvider = function VariablesProvider(props) {
   // 初始变量中包含 URL 参数
   var variablesRef = useRef(mergeWith(variables, {
     global: {
+      value: {
+        query: initialQuery
+      },
       query: initialQuery
     }
   }, defaultCustomizer));

package/es/components/iconSelect/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import './index.less';
+export interface IconSelectProps {
+    value?: string;
+    onChange?: (value: string) => void;
+    disabled?: boolean;
+    defaultValue?: string;
+}
+declare const IconSelect: React.FC<IconSelectProps>;
+export default IconSelect;