@pisell/materials 1.0.472 → 1.0.474

package/es/components/cardMetricItem/index.less

@@ -3,6 +3,7 @@
   padding: 24px;
   border: 1px solid var(--Gray-200, #eaecf0);
   border-radius: 12px;
+  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
 
   &.pc {
     width: fit-content;

package/es/components/dataSourceComponents/dataSourceForm/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode-data-source-form {
-  padding: 20px;
+  
 }
 
 .pisell-lowcode-data-source-form-header {

package/es/components/dataSourceComponents/dataSourceForm/serve.d.ts

@@ -128,6 +128,7 @@ export declare const updateNocobaseData: (params: {
     key: string;
     id: string;
     data: any;
+    headers?: any;
 }) => Promise<any>;
 /**
  * 获取nocobase数据列表

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

@@ -184,13 +184,14 @@ export var customApi = /*#__PURE__*/function () {
  */
 export var updateNocobaseData = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-    var key, id, data;
+    var key, id, data, headers;
     return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          key = params.key, id = params.id, data = params.data;
+          key = params.key, id = params.id, data = params.data, headers = params.headers;
           return _context7.abrupt("return", request.getRequest().post("/".concat(key, ":update?filterByTk=").concat(id), data, {
-            isNocobase: true
+            isNocobase: true,
+            headers: headers
           }));
         case 2:
         case "end":

package/es/components/dataSourceComponents/dataSourceForm/utils.d.ts

@@ -31,13 +31,13 @@ export declare const formItemNameReverse: (name: string) => string;
  * @Author: shengjie.zuo
  * @Date: 2024-11-23 17:14:25
  */
-export declare const withFormItem: <P extends object>(WrappedComponent: React.ComponentType<P>) => React.FC<P & WithFormItemProps>;
+export declare const withFormItem: <P extends object>(WrappedComponent: React.ComponentType<P>, otherFormItemProps?: Record<string, any>) => React.FC<P & WithFormItemProps>;
 export declare const withDataSource: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     dataSource?: any;
 }) => React.JSX.Element;
 export declare const withOptions: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     options?: any;
-    optionSourceType?: string | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
 }) => React.JSX.Element;

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

@@ -1,6 +1,6 @@
 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); }
 var _excluded = ["renderMode", "value", "onChange"],
-  _excluded2 = ["name", "label", "mode", "tooltip", "noStyle", "extra", "required", "requiredobj", "minLengthobj", "maxLengthobj", "typeobj", "maxobj", "minobj", "normalize", "getValueProps", "validator", "style", "__designMode"];
+  _excluded2 = ["name", "label", "mode", "tooltip", "noStyle", "extra", "required", "requiredobj", "minLengthobj", "maxLengthobj", "typeobj", "maxobj", "minobj", "normalize", "getValueProps", "validator", "style", "validateTrigger", "__designMode", "labelCol", "innerStyle"];
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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."); }
@@ -19,6 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useMemo } from 'react';
 import { isArr, isString } from '@pisell/utils';
 import { Tag } from 'antd';
+import { getText } from "../../../locales";
 import Form from "../../form";
 import useDataSource from "../hooks/useDataSource";
 import useFormSetting from "./provider/hooks/useFormSetting";
@@ -77,7 +78,7 @@ export var formItemNameReverse = function formItemNameReverse(name) {
  * @Author: shengjie.zuo
  * @Date: 2024-11-23 17:14:25
  */
-export var withFormItem = function withFormItem(WrappedComponent) {
+export var withFormItem = function withFormItem(WrappedComponent, otherFormItemProps) {
   return function (_ref2) {
     var _field$uiSchema;
     var propsName = _ref2.name,
@@ -97,7 +98,10 @@ export var withFormItem = function withFormItem(WrappedComponent) {
       getValueProps = _ref2.getValueProps,
       validator = _ref2.validator,
       style = _ref2.style,
+      validateTrigger = _ref2.validateTrigger,
       __designMode = _ref2.__designMode,
+      labelCol = _ref2.labelCol,
+      innerStyle = _ref2.innerStyle,
       otherProps = _objectWithoutProperties(_ref2, _excluded2);
     var _useJsonPrefixPath = useJsonPrefixPath(),
       _useJsonPrefixPath$pa = _useJsonPrefixPath.path,
@@ -120,9 +124,11 @@ export var withFormItem = function withFormItem(WrappedComponent) {
     var renderComponent = useMemo(function () {
       // 使用renderMode属性，避免和组件mode冲突
       return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, otherProps, {
-        renderMode: effectiveMode
+        mode: propsMode,
+        renderMode: effectiveMode,
+        style: _objectSpread(_objectSpread({}, (otherFormItemProps === null || otherFormItemProps === void 0 ? void 0 : otherFormItemProps.innerStyle) || {}), innerStyle)
       }));
-    }, [effectiveMode, otherProps]);
+    }, [effectiveMode, otherProps, propsMode, innerStyle, otherFormItemProps === null || otherFormItemProps === void 0 ? void 0 : otherFormItemProps.innerStyle]);
     var isDesignMode = __designMode === 'design';
     var isHidden = effectiveMode === 'hidden';
 
@@ -131,24 +137,42 @@ export var withFormItem = function withFormItem(WrappedComponent) {
     var concatName = name !== undefined ? [].concat(_toConsumableArray(prefixPath), _toConsumableArray(toArr(name))) : undefined;
     var rules = [];
     if (requiredobj && requiredobj.required) {
-      rules.push(requiredobj);
+      rules.push(_objectSpread(_objectSpread({}, requiredobj), {}, {
+        message: requiredobj.message || getText('pisell-data-source-form-required-message')
+      }));
     }
     if (typeobj && typeobj.enabled) {
-      rules.push(typeobj);
+      if (typeobj.type === 'email') {
+        rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
+          message: typeobj.message || getText('pisell-data-source-form-email-message')
+        }));
+      } else {
+        rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
+          message: typeobj.message || getText('pisell-data-source-form-type-message')(typeobj === null || typeobj === void 0 ? void 0 : typeobj.type)
+        }));
+      }
     }
     if (maxLengthobj && maxLengthobj.enabled) {
-      rules.push(maxLengthobj);
+      rules.push(_objectSpread(_objectSpread({}, maxLengthobj), {}, {
+        message: maxLengthobj.message || getText('pisell-data-source-form-max-length-message')(maxLengthobj === null || maxLengthobj === void 0 ? void 0 : maxLengthobj.max)
+      }));
     }
     if (minLengthobj && minLengthobj.enabled) {
-      rules.push(minLengthobj);
+      rules.push(_objectSpread(_objectSpread({}, minLengthobj), {}, {
+        message: minLengthobj.message || getText('pisell-data-source-form-min-length-message')(minLengthobj === null || minLengthobj === void 0 ? void 0 : minLengthobj.min)
+      }));
     }
     if (maxobj && maxobj.enabled) {
-      rules.push(maxobj);
+      rules.push(_objectSpread(_objectSpread({}, maxobj), {}, {
+        message: maxobj.message || getText('pisell-data-source-form-max-value-message')(maxobj === null || maxobj === void 0 ? void 0 : maxobj.max)
+      }));
     }
     if (minobj && minobj.enabled) {
-      rules.push(minobj);
+      rules.push(_objectSpread(_objectSpread({}, minobj), {}, {
+        message: minobj.message || getText('pisell-data-source-form-min-value-message')(minobj === null || minobj === void 0 ? void 0 : minobj.min)
+      }));
     }
-    return /*#__PURE__*/React.createElement(Form.Item, {
+    return /*#__PURE__*/React.createElement(Form.Item, _extends({
       required: required,
       style: _objectSpread(_objectSpread({
         width: '100%'
@@ -164,8 +188,10 @@ export var withFormItem = function withFormItem(WrappedComponent) {
       rules: rules,
       normalize: normalize,
       getValueProps: getValueProps,
-      validator: validator
-    }, renderComponent);
+      validator: validator,
+      validateTrigger: validateTrigger,
+      labelCol: labelCol
+    }, otherFormItemProps), renderComponent);
   };
 };
 export var withDataSource = function withDataSource(WrappedComponent) {
@@ -205,11 +231,9 @@ export var withOptions = function withOptions(WrappedComponent) {
         };
       })) || [];
     }, [propsOptions, optionSourceType, list === null || list === void 0 ? void 0 : (_list$data2 = list.data) === null || _list$data2 === void 0 ? void 0 : _list$data2.data]);
-    return /*#__PURE__*/React.createElement(DataSourceProvider, {
-      dataSource: options
-    }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, {
+    return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, {
       options: options
-    })));
+    }));
   };
 };
 

package/es/components/dataSourceComponents/dataSourceShow/dataSourceImage/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const DataSourceImage: (props: import("../utils").ParsedProps) => React.JSX.Element;
+export default DataSourceImage;

package/es/components/dataSourceComponents/dataSourceShow/dataSourceImage/index.js

@@ -0,0 +1,4 @@
+import { Image } from 'antd';
+import withParseVariables from "../utils";
+var DataSourceImage = withParseVariables(Image, ['src']);
+export default DataSourceImage;

package/es/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const DataSourceQRCode: (props: any) => import("react").JSX.Element;
+export default DataSourceQRCode;

package/es/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.js

@@ -0,0 +1,4 @@
+import QRCode from "../../../qrcode";
+import withParseVariables from "../utils";
+var DataSourceQRCode = withParseVariables(QRCode, ['value']);
+export default DataSourceQRCode;

package/es/components/dataSourceComponents/dataSourceShow/dataSourceTypography/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+interface DataSourceTypographyProps {
+    dataSourceKey: string;
+    children: React.ReactNode;
+}
+declare const DataSourceTypography: {
+    (props: DataSourceTypographyProps): React.JSX.Element;
+    Text: (props: import("../utils").ParsedProps) => React.JSX.Element;
+};
+export default DataSourceTypography;

package/es/components/dataSourceComponents/dataSourceShow/dataSourceTypography/index.js

@@ -0,0 +1,15 @@
+var _excluded = ["children", "dataSourceKey"];
+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 React from 'react';
+import Typography from "../../../typography";
+import withParseVariables from "../utils";
+var DataSourceTypography = function DataSourceTypography(props) {
+  var children = props.children,
+    dataSourceKey = props.dataSourceKey,
+    rest = _objectWithoutProperties(props, _excluded);
+  return /*#__PURE__*/React.createElement(Typography, rest, children);
+};
+var Text = withParseVariables(Typography.Text, ['children']);
+DataSourceTypography.Text = Text;
+export default DataSourceTypography;

package/es/components/dataSourceComponents/dataSourceShow/utils.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export interface ParsedProps {
+    [key: string]: unknown;
+}
+declare const withParseVariables: <P extends ParsedProps>(Component: React.ComponentType<P>, keys: string[]) => (props: P) => React.JSX.Element;
+export default withParseVariables;

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

@@ -0,0 +1,82 @@
+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 _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 React, { useMemo, useEffect, useState, useRef } from 'react';
+import { isArr, isString } from '@pisell/utils';
+import { useMemoizedFn } from 'ahooks';
+import { getVariableKey } from "../provider/variables/utils";
+import useVariables from "../hooks/useVariables";
+// 提取变量解析逻辑
+var parseValueToVariableKey = function parseValueToVariableKey(value) {
+  if (isArr(value) && value.length === 1 && isString(value[0])) {
+    var _key = getVariableKey(value[0]);
+    return _key ? _key.split('.')[0] : null;
+  }
+  if (isString(value)) {
+    var _key2 = getVariableKey(value);
+    return _key2 ? _key2.split('.')[0] : null;
+  }
+  return null;
+};
+
+// 包装变量解析组件
+var withParseVariables = function withParseVariables(Component, keys) {
+  return function (props) {
+    var _useState = useState({}),
+      _useState2 = _slicedToArray(_useState, 2),
+      variables = _useState2[0],
+      setVariables = _useState2[1];
+    var _useVariables = useVariables(),
+      parseVariable = _useVariables.parseVariable,
+      subscribeVariables = _useVariables.subscribeVariables;
+    var valuesRef = useRef(new Set());
+    var handleVariableChange = useMemoizedFn(function (allVariables, updateVariables) {
+      var changedKey = Object.keys(updateVariables)[0];
+      if (valuesRef.current.has(changedKey)) {
+        setVariables(function (prev) {
+          return _objectSpread(_objectSpread({}, prev), allVariables);
+        });
+      }
+    });
+    useEffect(function () {
+      // 收集当前组件需要监听的变量值
+      var values = new Set();
+      keys.forEach(function (key) {
+        var variableKey = parseValueToVariableKey(props[key]);
+        if (variableKey) {
+          values.add(variableKey);
+        }
+      });
+      valuesRef.current = values;
+    }, [props, keys]);
+    useEffect(function () {
+      var unsubscribe = subscribeVariables === null || subscribeVariables === void 0 ? void 0 : subscribeVariables(handleVariableChange);
+      return function () {
+        unsubscribe === null || unsubscribe === void 0 ? void 0 : unsubscribe();
+      };
+    }, []);
+    var parsedProps = useMemo(function () {
+      var result = _objectSpread({}, props);
+      keys.forEach(function (key) {
+        var value = props[key];
+        if (isArr(value) && value.length === 1 && isString(value[0])) {
+          result[key] = parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(value[0], variables);
+        } else if (isString(value)) {
+          result[key] = parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(value, variables);
+        }
+      });
+      return result;
+    }, [props, variables, keys]);
+    return /*#__PURE__*/React.createElement(Component, parsedProps);
+  };
+};
+export default withParseVariables;

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

@@ -1,62 +1,47 @@
-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); }
-var _excluded = ["columns", "dataSource", "detailContent", "editContent", "showDetailButton", "showEditButton", "showDeleteButton", "showAddButton", "addContent", "__designMode", "componentId"];
+var _excluded = ["columns", "dataSource", "operationContent"];
 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 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 _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 React, { useEffect, useMemo } from 'react';
-import { Drawer, Button, Space, message } from 'antd';
+import React, { useEffect } from 'react';
+import { useUpdateEffect } from 'ahooks';
 import Table from "../../table";
 import useVariables from "../hooks/useVariables";
-import useColumns from "./hooks/useColumns";
-import usePagination from "./hooks/usePagination";
 import ActionsProvider from "../provider/actions/ActionsProvider";
 import useDrawerState from "./hooks/useDrawerState";
 import useDesignMode from "./hooks/useDesignMode";
+import useComponentId from "../hooks/useComponentId";
 import useTableQuery from "./hooks/useTableQuery";
-import { getText } from "../../../locales";
 import useDataSource from "../hooks/useDataSource";
 import TableSettingProvider from "./provider/tableSetting/TableSettingProvider";
 import useDataSourceKey from "./hooks/useDataSourceKey";
-var DRAWER_TITLES = {
-  detail: getText('pisell-data-source-table-detail'),
-  edit: getText('pisell-data-source-table-edit'),
-  add: getText('pisell-data-source-table-add')
-};
+import useTableProps from "./hooks/useTableProps";
 var BaseTable = function BaseTable(props) {
   var propsColumns = props.columns,
     dataSource = props.dataSource,
-    detailContent = props.detailContent,
-    editContent = props.editContent,
-    showDetailButton = props.showDetailButton,
-    showEditButton = props.showEditButton,
-    showDeleteButton = props.showDeleteButton,
-    showAddButton = props.showAddButton,
-    addContent = props.addContent,
-    __designMode = props.__designMode,
-    componentId = props.componentId,
+    operationContent = props.operationContent,
     others = _objectWithoutProperties(props, _excluded);
+  var componentId = useComponentId(props);
   var _useVariables = useVariables(),
     registerValueVariable = _useVariables.registerValueVariable;
   var _useDataSource = useDataSource(),
-    list = _useDataSource.list,
-    destroy = _useDataSource.destroy;
+    list = _useDataSource.list;
   var data = list.data;
   var _useDataSourceKey = useDataSourceKey(),
     dataSourceKey = _useDataSourceKey.dataSourceKey,
     dataSourceKeyRef = _useDataSourceKey.dataSourceKeyRef;
-  var _useDrawerState = useDrawerState(),
+  var _useDrawerState = useDrawerState(operationContent),
     drawerVisible = _useDrawerState.drawerVisible,
     setDrawerVisible = _useDrawerState.setDrawerVisible,
-    drawerType = _useDrawerState.drawerType,
     openDrawer = _useDrawerState.openDrawer,
-    closeDrawer = _useDrawerState.closeDrawer;
-  var _useTableQuery = useTableQuery(),
+    closeDrawer = _useDrawerState.closeDrawer,
+    containerProps = _useDrawerState.containerProps,
+    Container = _useDrawerState.Container,
+    drawerContent = _useDrawerState.drawerContent;
+  var _useTableQuery = useTableQuery(props),
     queryPageConfig = _useTableQuery.queryPageConfig,
     handleValuesChange = _useTableQuery.handleValuesChange,
-    refreshData = _useTableQuery.refreshData;
+    refreshData = _useTableQuery.refreshData,
+    handleFilterChange = _useTableQuery.handleFilterChange;
 
   // 设计模式下对抽屉的显隐处理
   useDesignMode(props, {
@@ -65,7 +50,7 @@ var BaseTable = function BaseTable(props) {
     closeDrawer: closeDrawer,
     data: data === null || data === void 0 ? void 0 : data.data
   });
-  useEffect(function () {
+  useUpdateEffect(function () {
     refreshData();
   }, [dataSourceKey]);
   useEffect(function () {
@@ -75,14 +60,11 @@ var BaseTable = function BaseTable(props) {
       list === null || list === void 0 ? void 0 : list.mutate([]);
     }
   }, [queryPageConfig]);
-
-  // 打开抽屉
-  var handleOpenDrawer = function handleOpenDrawer(record, type) {
+  useEffect(function () {
     registerValueVariable === null || registerValueVariable === void 0 ? void 0 : registerValueVariable(componentId, {
-      currentRecord: record
+      currentDataSource: dataSource
     });
-    openDrawer(type);
-  };
+  }, [dataSource]);
 
   // 关闭抽屉
   var handleCloseDrawer = function handleCloseDrawer() {
@@ -91,116 +73,28 @@ var BaseTable = function BaseTable(props) {
       currentRecord: null
     });
   };
-
-  // 删除记录
-  var handleDelete = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record) {
-      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
-              });
-              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) switch (_context.prev = _context.next) {
-                    case 0:
-                      _context.next = 2;
-                      return destroy === null || destroy === void 0 ? void 0 : destroy.run(record.id);
-                    case 2:
-                      refreshData();
-                    case 3:
-                    case "end":
-                      return _context.stop();
-                  }
-                }, _callee);
-              })));
-            } catch (error) {
-              console.error(error);
-              message.error('删除失败,请重试');
-            }
-          case 1:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function handleDelete(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  // 操作列
-  var actionsColumns = useMemo(function () {
-    return [{
-      title: '操作',
-      key: 'actions',
-      showDetailButton: showDetailButton,
-      showEditButton: showEditButton,
-      showDeleteButton: showDeleteButton,
-      render: function render(_, record) {
-        return /*#__PURE__*/React.createElement(Space, null, showDetailButton && /*#__PURE__*/React.createElement(Button, {
-          onClick: function onClick() {
-            return handleOpenDrawer(record, 'detail');
-          },
-          type: "link"
-        }, getText('pisell-data-source-table-detail')), showEditButton && /*#__PURE__*/React.createElement(Button, {
-          onClick: function onClick() {
-            return handleOpenDrawer(record, 'edit');
-          },
-          type: "link"
-        }, getText('pisell-data-source-table-edit')), showDeleteButton && /*#__PURE__*/React.createElement(Button, {
-          onClick: function onClick() {
-            return handleDelete(record);
-          },
-          type: "link",
-          danger: true
-        }, getText('pisell-data-source-table-delete')));
-      }
-    }];
-  }, [showDetailButton, showEditButton, showDeleteButton]);
-  var columns = useColumns({
-    columns: propsColumns,
-    fields: dataSource === null || dataSource === void 0 ? void 0 : dataSource.fields,
-    // 操作列
-    actionsColumns: actionsColumns
-  });
-  var pagination = usePagination({
-    data: data
+  var transformProps = useTableProps({
+    data: data,
+    originProps: props,
+    openDrawer: openDrawer,
+    closeDrawer: closeDrawer,
+    refreshData: refreshData,
+    handleFilterChange: handleFilterChange
   });
-  var drawerContent = useMemo(function () {
-    var contentMap = {
-      detail: detailContent,
-      edit: editContent,
-      add: addContent
-    };
-    return contentMap[drawerType];
-  }, [drawerType, detailContent, editContent, addContent]);
-  return /*#__PURE__*/React.createElement(TableSettingProvider, null, showAddButton && /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: 16
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    onClick: function onClick() {
-      return handleOpenDrawer(null, 'add');
-    }
-  }, getText('pisell-data-source-table-add'))), /*#__PURE__*/React.createElement(Table, _extends({}, others, {
-    columns: columns,
+  return /*#__PURE__*/React.createElement(TableSettingProvider, null, /*#__PURE__*/React.createElement(Table, _extends({}, others, transformProps, {
     dataSource: (data === null || data === void 0 ? void 0 : data.data) || [],
     loading: list === null || list === void 0 ? void 0 : list.loading,
-    onValuesChange: handleValuesChange,
-    pagination: pagination
+    onValuesChange: handleValuesChange
   })), /*#__PURE__*/React.createElement(ActionsProvider, {
     visible: drawerVisible,
     setVisible: setDrawerVisible,
     refreshTableData: refreshData
-  }, /*#__PURE__*/React.createElement(Drawer, {
-    title: DRAWER_TITLES[drawerType],
+  }, /*#__PURE__*/React.createElement(Container, _extends({}, containerProps, {
+    // title={DRAWER_TITLES[drawerType]}
     open: drawerVisible,
     onClose: handleCloseDrawer,
+    onCancel: handleCloseDrawer,
     destroyOnClose: true
-  }, drawerContent)));
+  }), drawerContent)));
 };
 export default BaseTable;

package/es/components/dataSourceComponents/dataSourceTable/filter/index.d.ts

@@ -0,0 +1,25 @@
+import React from 'react';
+interface BaseFilterItem {
+    name?: string;
+    value: string;
+    label?: string;
+    type?: string;
+    isHidden: boolean;
+    isCustom?: boolean;
+}
+interface FilterProps {
+    componentId: string;
+    filterBy: Record<string, any>;
+    quickFilterMaxLength?: number;
+    sortButtonShow?: boolean;
+    mode?: 'simple' | 'complex';
+    items: BaseFilterItem[];
+    handleValuesChange: (changedFields: any, allFields: any) => void;
+    search: {
+        show: boolean;
+        placeholder: string;
+        key: string;
+    };
+}
+declare const Filter: (props: FilterProps) => React.JSX.Element;
+export default Filter;