@pisell/materials 1.0.634 → 1.0.636

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -27,6 +27,7 @@ import useFormSetting from "./provider/hooks/useFormSetting";
 import useJsonPrefixPath from "./provider/hooks/useJsonPrefixPath";
 import DataSourceProvider from "../provider/dataSource/DataSourceProvider";
 import useTranslationOriginal from "../../../hooks/useTranslationOriginal";
+import useVariables from "../hooks/useVariables";
 import "./style.less";
 /**
  * @title: 增加renderMode属性
@@ -375,14 +376,28 @@ export var withOptions = function withOptions(WrappedComponent) {
       labelField = props.labelField,
       valueField = props.valueField,
       extraParams = props.extraParams;
+    var _useVariables = useVariables(),
+      parseVariable = _useVariables.parseVariable;
     var _useDataSource2 = useDataSource(),
-      list = _useDataSource2.list;
+      list = _useDataSource2.list,
+      getCurrentRecord = _useDataSource2.getCurrentRecord;
+    var parseParams = useMemo(function () {
+      var params = {};
+      if (extraParams) {
+        Object.keys(extraParams).forEach(function (key) {
+          params[key] = parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(extraParams[key], {
+            currentRecord: getCurrentRecord()
+          });
+        });
+      }
+      return params;
+    }, [extraParams]);
     useEffect(function () {
       if (optionSourceType === 'api') {
         list.run(_objectSpread({
           page: 1,
           pageSize: 500
-        }, extraParams));
+        }, parseParams));
       }
     }, []);
     var options = useMemo(function () {

package/es/components/dataSourceComponents/dataSourceMenu/Basic.js

@@ -1,19 +1,22 @@
 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 useEngineContext from "../../../hooks/useEngineContext";
 import BaseMenu from "../../pisellMenu";
 /**
  * @title: 数据源表单组件
  * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
  */
 var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _window$app$menuManag = window.app.menuManager.useMenu(),
-    menuItems = _window$app$menuManag.menuItems,
-    selectedKeys = _window$app$menuManag.selectedKeys,
-    openKeys = _window$app$menuManag.openKeys,
-    setOpenKeys = _window$app$menuManag.setOpenKeys,
-    getShowChildren = _window$app$menuManag.getShowChildren,
-    handleClick = _window$app$menuManag.handleClick;
-
+  var _appHelper$utils, _appHelper$utils$getA2, _appHelper$utils$getA3, _appHelper$utils$getA4;
+  var _useEngineContext = useEngineContext(),
+    appHelper = _useEngineContext.appHelper;
+  var _appHelper$utils$getA = appHelper === null || appHelper === void 0 ? void 0 : (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : (_appHelper$utils$getA2 = _appHelper$utils.getApp) === null || _appHelper$utils$getA2 === void 0 ? void 0 : (_appHelper$utils$getA3 = _appHelper$utils$getA2.call(_appHelper$utils)) === null || _appHelper$utils$getA3 === void 0 ? void 0 : (_appHelper$utils$getA4 = _appHelper$utils$getA3.menuManager) === null || _appHelper$utils$getA4 === void 0 ? void 0 : _appHelper$utils$getA4.useMenu(),
+    menuItems = _appHelper$utils$getA.menuItems,
+    selectedKeys = _appHelper$utils$getA.selectedKeys,
+    openKeys = _appHelper$utils$getA.openKeys,
+    setOpenKeys = _appHelper$utils$getA.setOpenKeys,
+    getShowChildren = _appHelper$utils$getA.getShowChildren,
+    handleClick = _appHelper$utils$getA.handleClick;
   // 递归渲染菜单项
   var renderMenuItems = function renderMenuItems(items) {
     return items.map(function (item) {
@@ -51,7 +54,7 @@ var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, props, {
     other: {
-      dataSource: undefined
+      items: undefined
     }
   }), renderMenuItems(menuItems));
 });

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

@@ -1,5 +1,5 @@
-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, useMemo } from 'react';
+import React, { useMemo } from 'react';
+import useEngineContext from "../../../hooks/useEngineContext";
 import PisellMenu from "../../pisellMenu";
 import useVariables from "../hooks/useVariables";
 import BaseMenu from "./Basic";
@@ -7,21 +7,35 @@ import BaseMenu from "./Basic";
  * @title: 数据源表单组件
  * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
  */
-var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
+var DataSourceMenu = function DataSourceMenu(props, ref) {
+  var _appHelper$utils, _appHelper$utils$getA, _appHelper$utils$getA2, _appHelper$utils$getA3;
   var dataSource = props.dataSource;
   var _useVariables = useVariables(),
     parseVariable = _useVariables.parseVariable;
+  var _useEngineContext = useEngineContext(),
+    appHelper = _useEngineContext.appHelper;
   var _dataSource = useMemo(function () {
+    return [{
+      label: '菜单项1',
+      key: 'item-1',
+      path: '/item-1'
+    }, {
+      label: '菜单项2',
+      key: 'item-2',
+      path: '/item-2'
+    }];
     if (Array.isArray(dataSource)) {
       return dataSource;
     }
     if (props.__designMode === 'design') {
       return [{
         label: '菜单项1',
-        key: 'item-1'
+        key: 'item-1',
+        path: '/item-1'
       }, {
         label: '菜单项2',
-        key: 'item-2'
+        key: 'item-2',
+        path: '/item-2'
       }];
     }
     if (typeof dataSource === 'string') {
@@ -32,15 +46,12 @@ var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
 
   // 设计模式下使用PisellMenu, 否则缺少app注入导致报错
   if (props.__designMode === 'design') {
-    return /*#__PURE__*/React.createElement(PisellMenu, _extends({
-      ref: ref
-    }, props));
+    return /*#__PURE__*/React.createElement(PisellMenu, props);
   }
-  var MenuProvider = window.app.menuManager.MenuProvider;
+  var MenuProvider = appHelper === null || appHelper === void 0 ? void 0 : (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : (_appHelper$utils$getA = _appHelper$utils.getApp) === null || _appHelper$utils$getA === void 0 ? void 0 : (_appHelper$utils$getA2 = _appHelper$utils$getA.call(_appHelper$utils)) === null || _appHelper$utils$getA2 === void 0 ? void 0 : (_appHelper$utils$getA3 = _appHelper$utils$getA2.menuManager) === null || _appHelper$utils$getA3 === void 0 ? void 0 : _appHelper$utils$getA3.MenuProvider;
+  console.log('MenuProvider', MenuProvider);
   return /*#__PURE__*/React.createElement(MenuProvider, {
     menus: _dataSource
-  }, /*#__PURE__*/React.createElement(BaseMenu, _extends({
-    ref: ref
-  }, props)));
-});
+  }, /*#__PURE__*/React.createElement(BaseMenu, props));
+};
 export default DataSourceMenu;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useFormat.js

@@ -12,14 +12,20 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { useMemoizedFn } from 'ahooks';
 import { formFieldFilterFuncMap } from "../../fields/utils";
-import { isArr, isString } from '@pisell/utils';
+import { isArr, isJson, isString } from '@pisell/utils';
 import dayjs from 'dayjs';
+// 过滤条件操作符 https://docs-cn.nocobase.com/api/database/operators
+var filterOperatorArr = ['$eq', '$ne', '$is', '$not', '$col', '$in', '$notIn', '$empty', '$notEmpty', '$and', '$or', '$isFalsy', '$isTruly', '$gt', '$gte', '$lt', '$lte', '$between', '$notBetween', '$includes', '$notIncludes', '$startsWith', '$notStatsWith', '$endsWith', '$notEndsWith', '$like', '$notLike', '$iLike', '$notILike', '$regexp', '$notRegexp', '$iRegexp', '$notIRegexp', '$dateOn', '$dateNotOn', '$dateBefore', '$dateNotBefore', '$dateAfter', '$dateNotAfter', '$match', '$notMatch', '$anyOf', '$noneOf', '$arrayEmpty', '$arrayNotEmpty', '$exists', '$notExists'];
+
 // 转换过滤条件
 var formatFilter = function formatFilter(filterValue, fields) {
   var conditions = [];
   if (!filterValue || !(fields !== null && fields !== void 0 && fields.length)) {
     return JSON.stringify({});
   }
+  if (isString(filterValue)) {
+    return filterValue;
+  }
 
   // 处理关键字搜索
   if (filterValue._keywords) {
@@ -53,6 +59,16 @@ var formatFilter = function formatFilter(filterValue, fields) {
     if (key === '_keywords' || value === undefined || value === null || value === '' || isArr(value) && value.length === 0) {
       return;
     }
+
+    // 判断value是否包含filterOperatorArr中的元素
+    if (isString(value) && filterOperatorArr.some(function (item) {
+      return value.includes(item);
+    })) {
+      if (isJson(value)) {
+        conditions.push(_defineProperty({}, key, JSON.parse(value)));
+      }
+      return;
+    }
     var field = fieldsMap[key];
     if (!(field !== null && field !== void 0 && (_field$uiSchema = field.uiSchema) !== null && _field$uiSchema !== void 0 && _field$uiSchema['x-component'])) {
       return;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -43,7 +43,12 @@ declare const useTableProps: (props: UseTablePropsProps) => {
     } | undefined;
     operation?: {
         show: boolean;
-        title: string;
+        title: string; /**
+         * 处理table的props
+         * 转换title
+         * @param props
+         * @returns
+         */
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -1,11 +1,11 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 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); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import React, { useMemo, useEffect } from 'react';
@@ -21,6 +21,7 @@ import useDataSource from "../../hooks/useDataSource";
 import PisellToast from "../../../pisellToast";
 import { getText } from "../../../../locales";
 import PisellModal from "../../../pisellModal";
+import dayjs from 'dayjs';
 /**
  * 处理table的props
  * 转换title
@@ -56,7 +57,8 @@ var useTableProps = function useTableProps(props) {
   var componentId = useComponentId(originProps);
   var _useDataSource = useDataSource(),
     list = _useDataSource.list,
-    destroy = _useDataSource.destroy;
+    destroy = _useDataSource.destroy,
+    update = _useDataSource.update;
   var data = list.data;
   var pagination = usePagination({
     data: data
@@ -107,25 +109,40 @@ var useTableProps = function useTableProps(props) {
 
   // 删除记录
   var handleDelete = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, softDelete) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             try {
               registerValueVariable === null || registerValueVariable === void 0 ? void 0 : registerValueVariable(componentId, {
-                currentRecord: record
+                currentRecord: _objectSpread({}, record)
               });
               setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                var deleteTime;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      destroy === null || destroy === void 0 ? void 0 : destroy.runAsync(record.id).then(function () {
-                        refreshData();
-                        PisellToast({
-                          content: getText('pisell-action-delete-success')
-                        });
+                      if (!softDelete) {
+                        _context.next = 6;
+                        break;
+                      }
+                      deleteTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+                      _context.next = 4;
+                      return update === null || update === void 0 ? void 0 : update.runAsync(_objectSpread(_objectSpread({}, record), {}, {
+                        deleted_at: deleteTime
+                      }));
+                    case 4:
+                      _context.next = 8;
+                      break;
+                    case 6:
+                      _context.next = 8;
+                      return destroy === null || destroy === void 0 ? void 0 : destroy.runAsync(record.id);
+                    case 8:
+                      refreshData();
+                      PisellToast({
+                        content: getText('pisell-action-delete-success')
                       });
-                    case 1:
+                    case 10:
                     case "end":
                       return _context.stop();
                   }
@@ -143,7 +160,7 @@ var useTableProps = function useTableProps(props) {
         }
       }, _callee2);
     }));
-    return function (_x) {
+    return function (_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }());
@@ -175,7 +192,7 @@ var useTableProps = function useTableProps(props) {
                 okText: getText('pisell-delete-confirm-ok'),
                 cancelText: getText('pisell-delete-confirm-cancel'),
                 onOk: function onOk() {
-                  handleDelete(record);
+                  handleDelete(record, item === null || item === void 0 ? void 0 : item.softDelete);
                 }
               });
               return;

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

@@ -11,7 +11,7 @@ import ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
 var DatePickerWithMode = withMode(DatePickerCpt, ReadPretty, function (props) {
   return _objectSpread(_objectSpread({}, props), {}, {
-    value: isString(props.value) ? dayjs(props.value) : props.value
+    value: isString(props.value) && props.value ? dayjs(props.value) : props.value
   });
 });
 export default DatePickerWithMode;

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

@@ -113,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
@@ -26,9 +27,14 @@ var DataSourceProvider = function DataSourceProvider(props) {
     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;
 
   // 处理标准数据源
@@ -64,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/date-picker/datePickerCpt.js

@@ -84,7 +84,8 @@ var DatePickerCpt = function DatePickerCpt(props) {
     setValue(value);
   }, [value]);
   useEffect(function () {
-    setValueStr((_value === null || _value === void 0 ? void 0 : _value.format(format || 'YYYY-MM-DD')) || '');
+    var _value$format;
+    setValueStr((_value === null || _value === void 0 ? void 0 : (_value$format = _value.format) === null || _value$format === void 0 ? void 0 : _value$format.call(_value, format || 'YYYY-MM-DD')) || '');
   }, [_value]);
   var customPresetItems = useMemo(function () {
     var preset = [{
@@ -218,6 +219,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
     });
   };
   var timeInputProps = useMemo(function () {
+    var _value$format2;
     var step = 1;
     var _format = '';
     if ((showTime === null || showTime === void 0 ? void 0 : showTime.format) === 'HH:mm') {
@@ -233,7 +235,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
         var val = e.target.value;
         handleTimeChange(window.dayjs(val, _format));
       },
-      value: _value === null || _value === void 0 ? void 0 : _value.format(_format)
+      value: _value === null || _value === void 0 ? void 0 : (_value$format2 = _value.format) === null || _value$format2 === void 0 ? void 0 : _value$format2.call(_value, _format)
     };
   }, [showTime, _value]);
   if (!picker || picker === 'date') {

package/es/components/pisellLayout/content.js

@@ -20,7 +20,6 @@ var PisellContent = function PisellContent(props) {
     scroll = props.scroll,
     rest = _objectWithoutProperties(props, _excluded);
   var lowCodeProps = useEngineContext();
-
   /**
    * @title: 内容
    * @description: 该组件的children默认注入页面内容
@@ -29,11 +28,12 @@ var PisellContent = function PisellContent(props) {
    * @Author: zhiwei.Wang
    */
   var pageContent = useMemo(function () {
+    var _lowCodeProps$engine, _lowCodeProps$engine$;
     // 引擎模式下没有页面内容, 只展示提示
     if (props.__designMode === 'design') {
       return 'Page content';
     }
-    return lowCodeProps.children;
+    return lowCodeProps === null || lowCodeProps === void 0 ? void 0 : (_lowCodeProps$engine = lowCodeProps.engine) === null || _lowCodeProps$engine === void 0 ? void 0 : (_lowCodeProps$engine$ = _lowCodeProps$engine.props) === null || _lowCodeProps$engine$ === void 0 ? void 0 : _lowCodeProps$engine$.children;
   }, [props.__designMode]);
   var contentStyle = useMemo(function () {
     return _objectSpread({

package/es/components/pisellMenu/PisellMenu.d.ts

@@ -1,5 +1,9 @@
 import React from 'react';
 import './PisellMenu.less';
 import type { PisellMenuProps } from './types';
-declare const _default: React.ForwardRefExoticComponent<PisellMenuProps & React.RefAttributes<unknown>>;
-export default _default;
+declare const PisellMenu: {
+    ({ className, style, mode, theme, defaultOpenKeys, defaultSelectedKeys, inlineCollapsed, openKeys, selectedKeys, onOpenChange, onSelect, dataSource, __designMode, children, other, ...restProps }: PisellMenuProps): React.JSX.Element;
+    Item: Omit<React.FunctionComponent<import("antd").MenuItemProps>, ""> & (<T extends import("antd").MenuItemProps>(props: T extends infer U extends import("antd").MenuItemProps ? unknown extends U ? import("antd").MenuItemProps : U : import("antd").MenuItemProps, context?: any) => React.ReactElement<any, any> | null);
+    SubMenu: React.FC<import("antd").SubMenuProps>;
+};
+export default PisellMenu;

package/es/components/pisellMenu/PisellMenu.js

@@ -3,9 +3,9 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Menu as AntdMenu } from 'antd';
-import React, { forwardRef, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import "./PisellMenu.less";
-var PisellMenu = function PisellMenu(_ref, ref) {
+var PisellMenu = function PisellMenu(_ref) {
   var className = _ref.className,
     style = _ref.style,
     _ref$mode = _ref.mode,
@@ -31,10 +31,12 @@ var PisellMenu = function PisellMenu(_ref, ref) {
     if (__designMode === 'design') {
       return [{
         label: '菜单项1',
-        key: 'item-1'
+        key: 'item-1',
+        path: '/item-1'
       }, {
         label: '菜单项2',
-        key: 'item-2'
+        key: 'item-2',
+        path: '/item-2'
       }];
     }
     return [];
@@ -52,10 +54,8 @@ var PisellMenu = function PisellMenu(_ref, ref) {
     selectedKeys: selectedKeys,
     onOpenChange: onOpenChange,
     onSelect: onSelect
-  }, restProps, other, {
-    ref: ref
-  }), children);
+  }, restProps, other), children);
 };
 PisellMenu.Item = AntdMenu.Item;
 PisellMenu.SubMenu = AntdMenu.SubMenu;
-export default /*#__PURE__*/forwardRef(PisellMenu);
+export default PisellMenu;

package/lib/components/dataSourceComponents/dataSourceForm/utils.js

@@ -54,6 +54,7 @@ var import_useFormSetting = __toESM(require("./provider/hooks/useFormSetting"));
 var import_useJsonPrefixPath = __toESM(require("./provider/hooks/useJsonPrefixPath"));
 var import_DataSourceProvider = __toESM(require("../provider/dataSource/DataSourceProvider"));
 var import_useTranslationOriginal = __toESM(require("../../../hooks/useTranslationOriginal"));
+var import_useVariables = __toESM(require("../hooks/useVariables"));
 var import_style = require("./style.less");
 var withMode = (FieldComponent, ReadPrettyComponent, transformProps) => {
   return ({ renderMode = "edit", value, onChange, ...props }) => {
@@ -421,13 +422,25 @@ var withOptions = (WrappedComponent) => {
       valueField,
       extraParams
     } = props;
-    const { list } = (0, import_useDataSource.default)();
+    const { parseVariable } = (0, import_useVariables.default)();
+    const { list, getCurrentRecord } = (0, import_useDataSource.default)();
+    const parseParams = (0, import_react.useMemo)(() => {
+      const params = {};
+      if (extraParams) {
+        Object.keys(extraParams).forEach((key) => {
+          params[key] = parseVariable == null ? void 0 : parseVariable(extraParams[key], {
+            currentRecord: getCurrentRecord()
+          });
+        });
+      }
+      return params;
+    }, [extraParams]);
     (0, import_react.useEffect)(() => {
       if (optionSourceType === "api") {
         list.run({
           page: 1,
           pageSize: 500,
-          ...extraParams
+          ...parseParams
         });
       }
     }, []);

package/lib/components/dataSourceComponents/dataSourceMenu/Basic.js

@@ -33,9 +33,12 @@ __export(Basic_exports, {
 });
 module.exports = __toCommonJS(Basic_exports);
 var import_react = __toESM(require("react"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_pisellMenu = __toESM(require("../../pisellMenu"));
 var DataSourceMenu = (0, import_react.forwardRef)(
   (props, ref) => {
+    var _a, _b, _c, _d;
+    const { appHelper } = (0, import_useEngineContext.default)();
     const {
       menuItems,
       selectedKeys,
@@ -43,7 +46,7 @@ var DataSourceMenu = (0, import_react.forwardRef)(
       setOpenKeys,
       getShowChildren,
       handleClick
-    } = window.app.menuManager.useMenu();
+    } = (_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.menuManager) == null ? void 0 : _d.useMenu();
     const renderMenuItems = (items) => {
       return items.map((item) => {
         if (item.hide) {
@@ -74,12 +77,12 @@ var DataSourceMenu = (0, import_react.forwardRef)(
         openKeys,
         onOpenChange: setOpenKeys,
         onClick: ({ item }) => {
-          var _a;
-          handleClick((_a = item.props) == null ? void 0 : _a.router);
+          var _a2;
+          handleClick((_a2 = item.props) == null ? void 0 : _a2.router);
         },
         ...props,
         other: {
-          dataSource: void 0
+          items: void 0
         }
       },
       renderMenuItems(menuItems)