@pisell/materials 6.0.6 → 6.0.7

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

@@ -74,6 +74,11 @@ export var formItemNameReverse = function formItemNameReverse(name) {
   return name.replace(new RegExp(FORM_ITEM_SPLIT_CHAR, 'g'), '.');
 };
 
+// 验证域名
+export var isValidDomain = function isValidDomain(value) {
+  return /^(?=.{1,253}$)(?!-)[A-Za-z0-9-]{1,63}(?<!-)(\.[A-Za-z]{2,})+$/.test(value);
+};
+
 /**
  * @title: 追加formItem层
  * @description:
@@ -157,6 +162,13 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           message: typeobj.message || getText('pisell-data-source-form-email-message')
         }));
       }
+      if (typeobj.type === 'domain' && typeobj.enabled) {
+        rules.push({
+          validator: function validator(_, value) {
+            return isValidDomain(value) ? Promise.resolve() : Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-domain-message')));
+          }
+        });
+      }
       if (typeobj.type === 'url' && typeobj.enabled) {
         rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
           message: typeobj.message || getText('pisell-data-source-form-url-message')
@@ -166,10 +178,15 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
         rules.push({
           validator: function validator(_, value) {
             var _parsePhoneNumberFrom;
-            return isValidPhoneNumber(value) && (_parsePhoneNumberFrom = parsePhoneNumberFromString(value)) !== null && _parsePhoneNumberFrom !== void 0 && _parsePhoneNumberFrom.isValid() ? Promise.resolve() : Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-phone-message')));
+            return !otherProps.disabled || isValidPhoneNumber(value) && (_parsePhoneNumberFrom = parsePhoneNumberFromString(value)) !== null && _parsePhoneNumberFrom !== void 0 && _parsePhoneNumberFrom.isValid() ? Promise.resolve() : Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-phone-message')));
           }
         });
       }
+      if (typeobj.type === 'pattern' && typeobj.enabled) {
+        rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
+          message: typeobj.message
+        }));
+      }
     }
     if (maxLengthobj && maxLengthobj.enabled) {
       rules.push({
@@ -211,13 +228,13 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
     }
     if (maxobj && maxobj.enabled) {
       rules.push(_objectSpread(_objectSpread({}, maxobj), {}, {
-        type: "number",
+        type: 'number',
         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(_objectSpread(_objectSpread({}, minobj), {}, {
-        type: "number",
+        type: 'number',
         message: minobj.message || getText('pisell-data-source-form-min-value-message')(minobj === null || minobj === void 0 ? void 0 : minobj.min)
       }));
     }
@@ -290,18 +307,18 @@ export var withOptions = function withOptions(WrappedComponent) {
       }
     }, []);
     var options = useMemo(function () {
-      var _list$data, _list$data$data;
+      var _list$data, _list$data$data, _list$data$data$filte;
       if (optionSourceType !== 'api') {
         return propsOptions;
       }
-      return (((_list$data = list.data) === null || _list$data === void 0 ? void 0 : (_list$data$data = _list$data.data) === null || _list$data$data === void 0 ? void 0 : _list$data$data.map(function (item) {
+      return (((_list$data = list.data) === null || _list$data === void 0 ? void 0 : (_list$data$data = _list$data.data) === null || _list$data$data === void 0 ? void 0 : (_list$data$data$filte = _list$data$data.filter) === null || _list$data$data$filte === void 0 ? void 0 : _list$data$data$filte.call(_list$data$data, function (item) {
+        return !['draft', 'inactive', 'disabled'].includes(item === null || item === void 0 ? void 0 : item.status);
+      })) || []).map(function (item) {
         return {
           label: translationOriginal(item[labelField]),
           value: item[valueField]
         };
-      })) || []).sort(function (a, b) {
-        return a.label.localeCompare(b.label);
-      });
+      }) || [];
     }, [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(WrappedComponent, _extends({}, props, {
       options: options
@@ -343,7 +360,7 @@ export var renderValueWithMap = function renderValueWithMap(value, valueMap, ren
         key: item,
         className: "pisell-form-read-pretty-value",
         style: textStyle
-      }, valueMap === null || valueMap === void 0 ? void 0 : valueMap[item]), index < value.length - 1 && ',');
+      }, valueMap === null || valueMap === void 0 ? void 0 : valueMap[item]), index < value.length - 1 && ', ');
     }));
   } else if (isString(value)) {
     return /*#__PURE__*/React.createElement("span", {
@@ -357,4 +374,15 @@ export var renderValueWithMap = function renderValueWithMap(value, valueMap, ren
 };
 export function toArr(str) {
   return Array.isArray(str) ? str : [str];
-}
+}
+var systemFields = ['createdAt', 'updatedAt', 'createdBy', 'created_at', 'updated_at', 'deleted_at'];
+
+// 提交时过滤系统字段
+export var filterSystemFields = function filterSystemFields(params) {
+  return Object.keys(params).reduce(function (acc, key) {
+    if (!systemFields.includes(key)) {
+      acc[key] = params[key];
+    }
+    return acc;
+  }, {});
+};

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

@@ -158,7 +158,7 @@ var Filter = function Filter(props) {
     layout: "inline",
     className: "filter-form-wrapper",
     onValuesChange: onValuesChange
-  }, searchDom, filterDom, show && /*#__PURE__*/React.createElement(FilterButton, {
+  }, searchDom, filterDom, show && sortButtonShow && /*#__PURE__*/React.createElement(FilterButton, {
     value: list,
     quickFilterMaxLength: quickFilterMaxLength,
     formFiltersPrefix: '',

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

@@ -46,7 +46,10 @@ var useColumns = function useColumns(_ref) {
       var fieldProps = genFieldProps(field, (_other = column.other) === null || _other === void 0 ? void 0 : _other.fieldProps);
       return _objectSpread(_objectSpread({}, column), {}, {
         title: title,
-        render: function render(text) {
+        render: function render(text, record, index) {
+          if (column !== null && column !== void 0 && column.render) {
+            return column.render(text, record, index);
+          }
           return /*#__PURE__*/React.createElement(FieldComponent, _extends({}, fieldProps, {
             value: text
           }));

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

@@ -81,5 +81,12 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         }[];
     } | undefined;
     onValuesChange?: ((changedValues: any, values: any) => void) | undefined;
+    extraParams?: {
+        list?: Record<string, any> | undefined;
+        get?: Record<string, any> | undefined;
+        update?: Record<string, any> | undefined;
+        create?: Record<string, any> | undefined;
+        destroy?: Record<string, any> | undefined;
+    } | undefined;
 };
 export default useTableProps;

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

@@ -10,7 +10,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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';
 import { Button, Space } from 'antd';
-import { isString } from '@pisell/utils';
+import { isBoolean, isFunction, isString } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
 import Filter from "../filter";
 import usePagination from "./usePagination";
@@ -94,6 +94,11 @@ var useTableProps = function useTableProps(props) {
 
   // 打开抽屉
   var handleOpenDrawer = useMemoizedFn(function (record, item) {
+    var _item$onClick;
+    item === null || item === void 0 ? void 0 : (_item$onClick = item.onClick) === null || _item$onClick === void 0 ? void 0 : _item$onClick.call(item, record);
+    if (item.openMode === 'custom') {
+      return;
+    }
     registerValueVariable === null || registerValueVariable === void 0 ? void 0 : registerValueVariable(componentId, {
       currentRecord: record
     });
@@ -159,7 +164,8 @@ var useTableProps = function useTableProps(props) {
       render: function render(_, record) {
         return /*#__PURE__*/React.createElement(Space, null, items === null || items === void 0 ? void 0 : items.map(function (item) {
           var label = item.label,
-            actionType = item.actionType;
+            actionType = item.actionType,
+            show = item.show;
           var handleClick = function handleClick() {
             if (actionType === 'delete') {
               PisellModal.confirm({
@@ -176,6 +182,16 @@ var useTableProps = function useTableProps(props) {
               handleOpenDrawer(record, item);
             }
           };
+          if (isBoolean(show)) {
+            if (!show) {
+              return null;
+            }
+          } else if (isFunction(show)) {
+            var result = show(record);
+            if (!result) {
+              return null;
+            }
+          }
           return /*#__PURE__*/React.createElement(Button, {
             onClick: handleClick,
             type: type === 'link' ? 'link' : 'default',
@@ -200,11 +216,18 @@ var useTableProps = function useTableProps(props) {
     }
     return titleButtons === null || titleButtons === void 0 ? void 0 : (_titleButtons$items = titleButtons.items) === null || _titleButtons$items === void 0 ? void 0 : _titleButtons$items.map(function (button) {
       var actionType = button.actionType,
-        buttonProps = button.buttonProps;
+        buttonProps = button.buttonProps,
+        beforeOpen = button.beforeOpen;
       return _objectSpread(_objectSpread(_objectSpread({}, button), buttonProps), {}, {
         onClick: function onClick() {
           if (actionType === 'add') {
-            handleOpenDrawer(null, button);
+            var result = true;
+            if (beforeOpen) {
+              result = beforeOpen();
+            }
+            if (result) {
+              handleOpenDrawer(null, button);
+            }
           }
         }
       });
@@ -219,7 +242,7 @@ var useTableProps = function useTableProps(props) {
       var actionType = button.actionType,
         buttonProps = button.buttonProps;
       return _objectSpread(_objectSpread(_objectSpread({}, button), buttonProps), {}, {
-        size: "large",
+        size: 'large',
         title: button.label,
         onClick: function onClick() {
           if (actionType === 'add') {

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

@@ -4,10 +4,12 @@ import DataSourceProvider from "../provider/dataSource/DataSourceProvider";
 import "./index.less";
 var DataSourceTable = function DataSourceTable(props) {
   var dataSource = props.dataSource,
-    __designMode = props.__designMode;
+    __designMode = props.__designMode,
+    extraParams = props.extraParams;
   return /*#__PURE__*/React.createElement(DataSourceProvider, {
     dataSource: dataSource,
-    __designMode: __designMode
+    __designMode: __designMode,
+    extraParams: extraParams
   }, /*#__PURE__*/React.createElement(BaseTable, props));
 };
 export default DataSourceTable;

package/es/components/dataSourceComponents/dataSourceTable/type.d.ts

@@ -3,12 +3,13 @@ import { ColumnType } from 'antd/es/table';
 import { DataSourceType } from '../provider/dataSource/DataSourceContext';
 export declare type OperationItem = {
     label?: string;
-    openMode: 'modal' | 'drawer';
+    openMode: 'modal' | 'drawer' | 'custom';
     openContentSize: 'small' | 'middle' | 'large';
     openTitle: string;
     actionType: 'detail' | 'edit' | 'delete' | 'custom';
     key: string;
     buttonProps?: any;
+    onClick?: (record: any) => void;
 };
 export interface DataSourceTableProps {
     title?: string | React.ReactNode | (() => React.ReactNode);
@@ -67,4 +68,11 @@ export interface DataSourceTableProps {
         }[];
     };
     onValuesChange?: (changedValues: any, values: any) => void;
+    extraParams?: {
+        list?: Record<string, any>;
+        get?: Record<string, any>;
+        update?: Record<string, any>;
+        create?: Record<string, any>;
+        destroy?: Record<string, any>;
+    };
 }

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

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "isVerification"];
+var _excluded = ["value", "onChange", "isVerification", "disabled"];
 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 _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."); }
@@ -22,6 +22,7 @@ var PhoneInput = function PhoneInput(_ref) {
   var propsValue = _ref.value,
     onChange = _ref.onChange,
     isVerification = _ref.isVerification,
+    disabled = _ref.disabled,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useCountries = useCountries(),
     _useCountries$data = _useCountries.data,
@@ -86,6 +87,9 @@ var PhoneInput = function PhoneInput(_ref) {
     var selectedCountry = countries.find(function (c) {
       return c.code === countryCode;
     });
+    if (phoneNumber.length === 0) {
+      return "";
+    }
     var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || "";
     return "".concat(prefix).concat(phoneNumber);
   }, [countryCode, phoneNumber, countries]);
@@ -102,6 +106,7 @@ var PhoneInput = function PhoneInput(_ref) {
   return /*#__PURE__*/React.createElement(Space.Compact, {
     block: true
   }, /*#__PURE__*/React.createElement(Select, {
+    disabled: disabled,
     value: countryCode,
     onChange: handleCountryChange,
     style: {
@@ -120,6 +125,7 @@ var PhoneInput = function PhoneInput(_ref) {
       };
     })
   }), /*#__PURE__*/React.createElement(Input, _extends({}, props, {
+    disabled: disabled,
     status: status,
     type: "tel",
     value: phoneNumber,

package/es/components/dataSourceComponents/fields/Input.Url/ReadPretty.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { UrlProps } from './type';
 import './ReadPretty.less';
+export declare const formatUrl: (url: string) => string;
 declare const UrlReadPretty: (props: UrlProps) => React.JSX.Element;
 export default UrlReadPretty;

package/es/components/dataSourceComponents/fields/Input.Url/ReadPretty.js

@@ -3,14 +3,29 @@ import { Typography } from 'antd';
 import classNames from 'classnames';
 import "./ReadPretty.less";
 var Link = Typography.Link;
+
+// 格式化 url 确保包含协议前缀
+export var formatUrl = function formatUrl(url) {
+  if (!url) return '';
+
+  // 如果已经包含协议前缀，直接返回
+  if (url.startsWith('http://') || url.startsWith('https://')) {
+    return url;
+  }
+
+  // 默认添加 https:// 前缀
+  return "https://".concat(url);
+};
 var UrlReadPretty = function UrlReadPretty(props) {
   var value = props.value,
     renderMode = props.renderMode;
+  var formattedUrl = formatUrl(value);
   return /*#__PURE__*/React.createElement(Link, {
     className: classNames('pisell-url-read-pretty', {
       'pisell-url-read-pretty-table-view': renderMode === 'tableView'
     }),
-    href: value
+    href: formattedUrl,
+    target: "_blank"
   }, value);
 };
 export default UrlReadPretty;

package/es/components/dataSourceComponents/fields/Input.Url/ReadPretty.less

@@ -1,5 +1,5 @@
 .pisell-url-read-pretty {
-  color: var(--Gray-900, #101828);
+  //color: var(--Gray-900, #101828);
   font-size: 16px;
   font-weight: 600;
   line-height: 24px; /* 150% */

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

@@ -2,7 +2,13 @@ import { withFormItem, withDataSource, withOptions } from "../../dataSourceForm/
 import SelectWithMode from "./WithMode";
 
 // 包装formItem层
-var SelectWithFormItem = withFormItem(SelectWithMode);
+var SelectWithFormItem = withFormItem(SelectWithMode, {
+  innerProps: {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    }
+  }
+});
 
 // 包装Options层
 var SelectWithOptions = withOptions(SelectWithFormItem);

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

@@ -8,7 +8,10 @@ export interface MediaType {
     maxsize: number;
 }
 export declare const useMediaConfig: () => {
-    data: any;
+    data: {
+        upload_onetime_limit: any;
+        upload_maxsize: any;
+    };
 };
 export declare const useMediaTypes: () => {
     data: MediaType[];

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

@@ -11,6 +11,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useRequest } from 'ahooks';
 import { getPointSuffix } from "./utils";
 import { request } from "../../../table/utils";
+import useEngineContext from "../../../../hooks/useEngineContext";
 
 /**
  * 获取nocobase媒体数据列表
@@ -43,47 +44,25 @@ export var getMediaTypeList = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var getMediaConfig = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var data;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return request.getRequest().get("/core/module/media/config", {});
-        case 2:
-          data = _context2.sent;
-          return _context2.abrupt("return", data);
-        case 4:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getMediaConfig() {
-    return _ref2.apply(this, arguments);
-  };
-}();
 export var useMediaConfig = function useMediaConfig() {
-  var _useRequest = useRequest(getMediaConfig, {
-      cacheKey: 'media-config',
-      staleTime: 1000 * 60 * 5,
-      // 5分钟后数据过期
-      cacheTime: 1000 * 60 * 60 // 1小时后清除缓存
-    }),
-    data = _useRequest.data;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _context$appHelper$ut6, _context$appHelper$ut7, _context$appHelper$ut8;
+  var context = useEngineContext();
+  var data = (_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.data) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.store) === null || _context$appHelper$ut5 === void 0 ? void 0 : (_context$appHelper$ut6 = _context$appHelper$ut5.getStore) === null || _context$appHelper$ut6 === void 0 ? void 0 : (_context$appHelper$ut7 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut7 === void 0 ? void 0 : (_context$appHelper$ut8 = _context$appHelper$ut7.getDataByModel) === null || _context$appHelper$ut8 === void 0 ? void 0 : _context$appHelper$ut8.call(_context$appHelper$ut7, 'core', 'core');
   return {
-    data: data
+    data: {
+      upload_onetime_limit: data === null || data === void 0 ? void 0 : data.media_upload_onetime_limit,
+      upload_maxsize: data === null || data === void 0 ? void 0 : data.media_upload_maxsize
+    }
   };
 };
 export var useMediaTypes = function useMediaTypes() {
-  var _useRequest2 = useRequest(getMediaTypeList, {
+  var _useRequest = useRequest(getMediaTypeList, {
       cacheKey: 'media-type',
       staleTime: 1000 * 60 * 5,
       // 5分钟后数据过期
       cacheTime: 1000 * 60 * 60 // 1小时后清除缓存
     }),
-    data = _useRequest2.data;
+    data = _useRequest.data;
   var getExtensionsByIds = function getExtensionsByIds(ids) {
     var extensions = [];
     (data || []).forEach(function (item) {

package/es/components/dataSourceComponents/hooks/useActions.d.ts

@@ -3,8 +3,9 @@ export interface UseActionsParams {
     dataSource?: DataSourceType;
     currentValue?: 'server' | 'local';
     __designMode?: string;
+    extraParams?: Record<string, any>;
 }
-declare const useActions: ({ dataSource: propsDataSource, currentValue: propsCurrentValue, __designMode, }?: UseActionsParams) => {
+declare const useActions: ({ dataSource: propsDataSource, currentValue: propsCurrentValue, __designMode, extraParams: propsExtraParams, }?: UseActionsParams) => {
     create: (values: Record<string, any>) => Promise<any>;
     get: () => Promise<any>;
     update: (values: Record<string, any>) => Promise<any>;