@pisell/materials 6.0.5 → 6.0.7

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

@@ -1,12 +1,23 @@
 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 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); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useMemo } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import PisellToast from "../../pisellToast";
 import useFormat from "../dataSourceTable/hooks/useFormat";
-import { createNocobaseData, customApi, updateNocobaseData, getNocobaseDataList, deleteNocobaseData } from "../dataSourceForm/serve";
+import { createNocobaseData, customApi, getNocobaseData, updateNocobaseData, getNocobaseDataList, deleteNocobaseData } from "../dataSourceForm/serve";
 import useParseActionsVariable from "./useParseActionsVariable";
 import useVariables from "./useVariables";
 import useDataSource from "./useDataSource";
@@ -15,7 +26,8 @@ var useActions = function useActions() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     propsDataSource = _ref.dataSource,
     propsCurrentValue = _ref.currentValue,
-    __designMode = _ref.__designMode;
+    __designMode = _ref.__designMode,
+    propsExtraParams = _ref.extraParams;
   // const { currentValue: ctxCurrentValue } = useFormSetting();
   var _useDataSource = useDataSource(),
     ctxDataSource = _useDataSource.dataSource,
@@ -47,6 +59,21 @@ var useActions = function useActions() {
   var currentRecord = useMemo(function () {
     return parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(currentValue, {});
   }, [currentValue, parseVariable]);
+  var extraParams = useMemo(function () {
+    return Object.entries(propsExtraParams || {}).reduce(function (acc, _ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+        key = _ref4[0],
+        value = _ref4[1];
+      acc[key] = Object.entries(value || {}).reduce(function (acc, _ref5) {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          k = _ref6[0],
+          v = _ref6[1];
+        acc[k] = parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(v, {});
+        return acc;
+      }, {});
+      return acc;
+    }, {});
+  }, [propsExtraParams, parseVariable]);
   var getParsedActions = useMemoizedFn(function () {
     // 目前接口使用变量还无法在界面配置 所以这里默认追加currentRecord
     return parseActions(originalActions, {
@@ -55,15 +82,15 @@ var useActions = function useActions() {
   });
 
   // 生成自定义 API 请求函数
-  var genCustomApi = useMemoizedFn(function (_ref3) {
-    var method = _ref3.method,
-      path = _ref3.path,
-      parsedPath = _ref3.parsedPath,
-      params = _ref3.params,
-      headers = _ref3.headers,
-      body = _ref3.body;
+  var genCustomApi = useMemoizedFn(function (_ref7) {
+    var method = _ref7.method,
+      path = _ref7.path,
+      parsedPath = _ref7.parsedPath,
+      params = _ref7.params,
+      headers = _ref7.headers,
+      body = _ref7.body;
     return /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+      var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
         var result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -78,7 +105,7 @@ var useActions = function useActions() {
               });
             case 2:
               result = _context.sent;
-              if (!(dataSourceKey === 'mypisell-api')) {
+              if (!['pisell2-api', 'mypisell-api'].includes(dataSourceKey)) {
                 _context.next = 5;
                 break;
               }
@@ -91,8 +118,8 @@ var useActions = function useActions() {
           }
         }, _callee);
       }));
-      return function (_x) {
-        return _ref4.apply(this, arguments);
+      return function (_x2) {
+        return _ref8.apply(this, arguments);
       };
     }();
   });
@@ -111,7 +138,7 @@ var useActions = function useActions() {
 
   // 创建数据
   var create = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
       var actions, createApi;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -148,19 +175,19 @@ var useActions = function useActions() {
         }
       }, _callee2);
     }));
-    return function (_x2) {
-      return _ref5.apply(this, arguments);
+    return function (_x3) {
+      return _ref9.apply(this, arguments);
     };
   }());
 
   // 获取数据
   var get = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var actions, getApi;
+    var actions, getApi, res;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (!(currentValue === 'server')) {
-            _context3.next = 10;
+            _context3.next = 13;
             break;
           }
           if (!isCustomApi) {
@@ -177,16 +204,24 @@ var useActions = function useActions() {
           getApi = genCustomApi(actions === null || actions === void 0 ? void 0 : actions.get);
           return _context3.abrupt("return", getApi({}));
         case 7:
-          return _context3.abrupt("return", {});
-        case 10:
+          _context3.next = 9;
+          return getNocobaseData({
+            key: name || '',
+            query: extraParams === null || extraParams === void 0 ? void 0 : extraParams.get,
+            headers: getHeaders()
+          });
+        case 9:
+          res = _context3.sent;
+          return _context3.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || {});
+        case 13:
           if (!currentValue) {
-            _context3.next = 12;
+            _context3.next = 15;
             break;
           }
           return _context3.abrupt("return", parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(currentValue, {}));
-        case 12:
+        case 15:
           return _context3.abrupt("return", {});
-        case 13:
+        case 16:
         case "end":
           return _context3.stop();
       }
@@ -195,7 +230,7 @@ var useActions = function useActions() {
 
   // 更新数据
   var update = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(values) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(values) {
       var actions, updateApi, id;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -221,7 +256,7 @@ var useActions = function useActions() {
             updateApi = genCustomApi(actions === null || actions === void 0 ? void 0 : actions.update);
             return _context4.abrupt("return", updateApi(formatCreateUpdateParams(values)));
           case 11:
-            id = values === null || values === void 0 ? void 0 : values.id;
+            id = (extraParams === null || extraParams === void 0 ? void 0 : extraParams.filterByTk) || (values === null || values === void 0 ? void 0 : values.id);
             if (!(!id || !name)) {
               _context4.next = 15;
               break;
@@ -233,9 +268,11 @@ var useActions = function useActions() {
           case 15:
             return _context4.abrupt("return", updateNocobaseData({
               key: name,
-              id: id,
               data: formatCreateUpdateParams(values),
-              headers: getHeaders()
+              headers: getHeaders(),
+              query: _objectSpread({
+                filterByTk: id
+              }, extraParams === null || extraParams === void 0 ? void 0 : extraParams.update)
             }));
           case 16:
           case "end":
@@ -243,14 +280,14 @@ var useActions = function useActions() {
         }
       }, _callee4);
     }));
-    return function (_x3) {
-      return _ref7.apply(this, arguments);
+    return function (_x4) {
+      return _ref11.apply(this, arguments);
     };
   }());
 
   // 获取数据列表
   var list = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
+    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
       var formatParams, actions, listApi;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -285,7 +322,7 @@ var useActions = function useActions() {
             _context5.next = 16;
             return getNocobaseDataList({
               key: name,
-              params: formatParams,
+              params: _objectSpread(_objectSpread({}, formatParams), (extraParams === null || extraParams === void 0 ? void 0 : extraParams.list) || {}),
               headers: getHeaders()
             });
           case 16:
@@ -297,12 +334,12 @@ var useActions = function useActions() {
         }
       }, _callee5);
     }));
-    return function (_x4) {
-      return _ref8.apply(this, arguments);
+    return function (_x5) {
+      return _ref12.apply(this, arguments);
     };
   }());
   var destroy = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
+    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
       var actions, deleteApi;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -341,8 +378,8 @@ var useActions = function useActions() {
         }
       }, _callee6);
     }));
-    return function (_x5) {
-      return _ref9.apply(this, arguments);
+    return function (_x6) {
+      return _ref13.apply(this, arguments);
     };
   }());
   return {

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

@@ -88,6 +88,13 @@ export declare type DataSourceContextProps = {
         list?: boolean;
         get?: boolean;
     };
+    extraParams?: {
+        list?: Record<string, any>;
+        get?: Record<string, any>;
+        update?: Record<string, any>;
+        create?: Record<string, any>;
+        destroy?: Record<string, any>;
+    };
     __id?: string;
     __designMode?: string;
 };

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

@@ -20,6 +20,7 @@ var DataSourceProvider = function DataSourceProvider(props) {
   var children = props.children,
     propsDataSource = props.dataSource,
     currentValue = props.currentValue,
+    extraParams = props.extraParams,
     externalActions = props.actions,
     overrideData = props.overrideData,
     autoRun = props.autoRun,
@@ -33,7 +34,8 @@ var DataSourceProvider = function DataSourceProvider(props) {
   var standardActions = useActions({
     dataSource: dataSource,
     currentValue: currentValue,
-    __designMode: __designMode
+    __designMode: __designMode,
+    extraParams: extraParams
   });
 
   // 使用外部Promise或标准actions

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

@@ -1,6 +1,7 @@
 import React, { useMemo, useRef, useEffect } from 'react';
 import { isArr, isString, isUndefined } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
+import useEngineContext from "../../../../hooks/useEngineContext";
 import VariablesContext from "./VariablesContext";
 import { getNestedValue } from "../../dataSourceForm/utils";
 import { mergeWith } from "../../../../utils";
@@ -14,18 +15,64 @@ var defaultCustomizer = function defaultCustomizer(objValue, srcValue) {
 };
 var VARIABLE_PATTERN = /{{([^}]+)}}/g;
 var VariablesProvider = function VariablesProvider(props) {
+  var _context$appHelper;
   var children = props.children,
     variables = props.variables;
+  var context = useEngineContext();
+  var _ref = (context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    getApp = _ref.getApp;
+
+  // 在组件创建时就初始化 URL 参数
+  var initialQuery = useMemo(function () {
+    var _getApp, _getApp$history, _getApp$history$insta;
+    var currentLocation = getApp === null || getApp === void 0 ? void 0 : (_getApp = getApp()) === null || _getApp === void 0 ? void 0 : (_getApp$history = _getApp.history) === null || _getApp$history === void 0 ? void 0 : (_getApp$history$insta = _getApp$history.instance) === null || _getApp$history$insta === void 0 ? void 0 : _getApp$history$insta.location;
+    if (currentLocation !== null && currentLocation !== void 0 && currentLocation.search) {
+      var searchParams = new URLSearchParams(currentLocation.search);
+      var query = {};
+      searchParams.forEach(function (value, key) {
+        query[key] = value;
+      });
+      return query;
+    }
+    return {};
+  }, []);
+
+  // 初始变量中包含 URL 参数
+  var variablesRef = useRef(mergeWith(variables, {
+    global: {
+      query: initialQuery
+    }
+  }, defaultCustomizer));
 
-  // 变量存储
-  var variablesRef = useRef({});
   // 添加变量变化监听器存储
   var listenersRef = useRef(new Set());
+
+  // 解析并设置 query 参数
+  var setQueryVariable = useMemoizedFn(function (search) {
+    var searchParams = new URLSearchParams(search);
+    var query = {};
+    searchParams.forEach(function (value, key) {
+      query[key] = value;
+    });
+    registerVariable({
+      global: query
+    });
+  });
   useEffect(function () {
-    if (variables) {
-      variablesRef.current = variables;
-    }
-  }, [variables]);
+    var _getApp2, _getApp2$history, _getApp2$history$inst;
+    var unlisten = getApp === null || getApp === void 0 ? void 0 : (_getApp2 = getApp()) === null || _getApp2 === void 0 ? void 0 : (_getApp2$history = _getApp2.history) === null || _getApp2$history === void 0 ? void 0 : (_getApp2$history$inst = _getApp2$history.instance) === null || _getApp2$history$inst === void 0 ? void 0 : _getApp2$history$inst.listen(function (location) {
+      setQueryVariable(location.search);
+    });
+    return function () {
+      unlisten === null || unlisten === void 0 ? void 0 : unlisten();
+    };
+  }, []);
+
+  // useEffect(() => {
+  //   if (variables) {
+  //     variablesRef.current = variables;
+  //   }
+  // }, [variables]);
 
   // 注册变量
   var registerVariable = useMemoizedFn(function (value) {

package/es/components/login-and-register/index.d.ts

@@ -0,0 +1,82 @@
+import React from 'react';
+import './index.less';
+/**
+ * loginAndRegister组件的属性接口
+ */
+export interface loginAndRegisterProps {
+    /** Logo相关配置 */
+    showLogo?: boolean;
+    logo?: string;
+    logoPosition?: 'left' | 'center' | 'right';
+    logoSize?: {
+        width?: number;
+        height?: number;
+    };
+    /** 标题相关配置 */
+    title?: string;
+    showTitle?: boolean;
+    titleAlign?: 'left' | 'center' | 'right';
+    /** 副标题相关配置 */
+    subtitle?: string;
+    showSubtitle?: boolean;
+    subtitleAlign?: 'left' | 'center' | 'right';
+    /** 登录方式配置 */
+    loginMethods?: ('email' | 'google' | 'facebook' | 'apple')[];
+    defaultLoginMethod?: 'email' | 'google' | 'facebook' | 'apple';
+    /** 表单配置 */
+    emailLabel?: string;
+    passwordLabel?: string;
+    emailPlaceholder?: string;
+    passwordPlaceholder?: string;
+    emailRules?: any[];
+    buttonText?: string;
+    rememberMeText?: string;
+    forgotPasswordText?: string;
+    showRememberMe?: boolean;
+    showForgotPassword?: boolean;
+    /** 社交登录配置 */
+    socialLoginTexts?: {
+        google?: string;
+        facebook?: string;
+        apple?: string;
+    };
+    /** 底部配置 */
+    showFooter?: boolean;
+    showSignUp?: boolean;
+    signUpText?: string;
+    signUpLink?: string;
+    signUpPosition?: 'left' | 'center' | 'right';
+    otherLinks?: Array<{
+        text: string;
+        url: string;
+    }>;
+    otherLinksPosition?: 'left' | 'center' | 'right';
+    /** 登录/注册切换配置 */
+    showTabs?: boolean;
+    loginTabText?: string;
+    registerTabText?: string;
+    /** 注册表单配置 */
+    registerEmailPlaceholder?: string;
+    registerPasswordPlaceholder?: string;
+    registerButtonText?: string;
+    /** 事件回调 */
+    onLogin?: (values: {
+        email: string;
+        loginMethod: string;
+    }) => void;
+    onSocialLogin?: (type: 'google' | 'facebook' | 'apple') => void;
+    onSignUp?: () => void;
+    onRegister?: (values: {
+        email: string;
+        password: string;
+    }) => void;
+    /** 新增背景图片属性 */
+    backgroundImage?: string;
+}
+/**
+ * Saas登录组件
+ * @param props - 组件属性
+ * @returns React组件
+ */
+declare const loginAndRegister: React.FC<loginAndRegisterProps>;
+export default loginAndRegister;