@pisell/materials 1.0.492 → 1.0.493

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

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

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

@@ -42,13 +42,15 @@ var import_useDataSource = __toESM(require("./useDataSource"));
 var import_locales = require("../../../locales");
 var useActions = ({
   dataSource: propsDataSource,
-  currentValue: propsCurrentValue
+  currentValue: propsCurrentValue,
+  __designMode
 } = {}) => {
-  const { dataSource: ctxDataSource } = (0, import_useDataSource.default)();
+  const { dataSource: ctxDataSource, __designMode: ctxDesignMode } = (0, import_useDataSource.default)();
   const { parseVariable } = (0, import_useVariables.default)();
   const { parseActions } = (0, import_useParseActionsVariable.default)();
   const currentDataSource = propsDataSource || ctxDataSource;
   const currentValue = propsCurrentValue || "server";
+  const designMode = __designMode || ctxDesignMode;
   const {
     isCustomApi,
     actions: originalActions,
@@ -92,7 +94,16 @@ var useActions = ({
   const getHeaders = (0, import_ahooks.useMemoizedFn)(() => {
     return headerDataSource ? { "x-data-source": headerDataSource } : {};
   });
+  const designModeToast = (0, import_ahooks.useMemoizedFn)(() => {
+    return (0, import_pisellToast.default)({
+      content: (0, import_locales.getText)("pisell-design-mode-action-disabled")
+    });
+  });
   const create = (0, import_ahooks.useMemoizedFn)(async (values) => {
+    if (designMode === "design") {
+      designModeToast();
+      return Promise.reject();
+    }
     if (isCustomApi) {
       const actions = getParsedActions();
       const createApi = genCustomApi(actions == null ? void 0 : actions.create);
@@ -124,6 +135,10 @@ var useActions = ({
     return {};
   });
   const update = (0, import_ahooks.useMemoizedFn)(async (values) => {
+    if (designMode === "design") {
+      designModeToast();
+      return Promise.reject();
+    }
     if (isCustomApi) {
       const actions = getParsedActions();
       if (!actions.update) {
@@ -170,6 +185,10 @@ var useActions = ({
     }
   );
   const destroy = (0, import_ahooks.useMemoizedFn)(async (id) => {
+    if (designMode === "design") {
+      designModeToast();
+      return Promise.reject();
+    }
     if (isCustomApi) {
       const actions = getParsedActions();
       if (!actions.destroy) {
@@ -179,7 +198,7 @@ var useActions = ({
       return deleteApi({});
     }
     if (!name)
-      return;
+      return Promise.reject();
     return (0, import_serve.deleteNocobaseData)(name, id, getHeaders());
   });
   return {

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

@@ -89,6 +89,7 @@ export declare type DataSourceContextProps = {
         get?: boolean;
     };
     __id?: string;
+    __designMode?: string;
 };
 export interface DataSourceContextType {
     dataSource?: DataSourceType;
@@ -97,6 +98,7 @@ export interface DataSourceContextType {
     get: Result<any, any>;
     update: Result<any, any>;
     create: Result<any, any>;
+    __designMode?: string;
 }
 export declare const DataSourceContext: import("react").Context<DataSourceContextType>;
 export default DataSourceContext;

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

@@ -46,14 +46,16 @@ var DataSourceProvider = (props) => {
     currentValue,
     actions: externalActions,
     overrideData,
-    autoRun
+    autoRun,
+    __designMode
   } = props;
   (0, import_useSetRequest.default)();
   const { parseVariable } = (0, import_useVariables.default)();
   const dataSource = (0, import_utils.isString)(propsDataSource) ? parseVariable == null ? void 0 : parseVariable(propsDataSource) : propsDataSource;
   const standardActions = (0, import_useActions.default)({
     dataSource,
-    currentValue
+    currentValue,
+    __designMode
   });
   const list = (externalActions == null ? void 0 : externalActions.list) || standardActions.list;
   const get = (externalActions == null ? void 0 : externalActions.get) || standardActions.get;
@@ -77,6 +79,7 @@ var DataSourceProvider = (props) => {
   });
   const value = (0, import_react.useMemo)(() => {
     return {
+      __designMode,
       dataSource,
       list: {
         ...listResult,
@@ -97,7 +100,8 @@ var DataSourceProvider = (props) => {
     getResult,
     updateResult,
     createResult,
-    overrideData
+    overrideData,
+    __designMode
   ]);
   return /* @__PURE__ */ import_react.default.createElement(import_DataSourceContext.default.Provider, { value }, children);
 };

package/lib/components/pisellWalletPassCard/index.d.ts

@@ -21,7 +21,7 @@ export interface PisellWalletPassCardProps {
     /** 禁用原因 */
     disabledReason?: string;
     /** 是否展示禁用原因 */
-    showDisabledReason?: string;
+    showDisabledReason?: boolean;
     /** 封面图 */
     cover?: string;
     /** 余额标题文案 */

package/lib/components/select/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(select_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_ahooks = require("ahooks");
+var import_classnames = __toESM(require("classnames"));
 var import_iconfont = __toESM(require("../iconfont"));
 var import_locales = require("../../locales");
 var import_hoc = require("../../utils/hoc");
@@ -50,7 +51,8 @@ var SelectBase = (0, import_react.forwardRef)((props, ref) => {
     dropdownRender: propsDropdownRender,
     showSearch,
     styleType,
-    optionFilterProp = "value"
+    optionFilterProp = "value",
+    popupClassName
   } = props;
   const [state, setState] = (0, import_ahooks.useControllableValue)(props);
   const [searchValue, setSearchValue] = (0, import_react.useState)("");
@@ -136,7 +138,8 @@ var SelectBase = (0, import_react.forwardRef)((props, ref) => {
       value: state,
       onChange: (value, option) => setState(value, option),
       dropdownRender,
-      options: filteredOptions
+      options: filteredOptions,
+      popupClassName: (0, import_classnames.default)("pisell-base-select-dropdown", popupClassName)
     }
   );
 });

package/lib/components/select/index.less

@@ -9,3 +9,14 @@
     padding: 0 5px 5px;
   }
 }
+
+// 添加选项间距
+.pisell-base-select-dropdown {
+  .pisell-lowcode-select-item {
+    margin-bottom: 4px;
+    
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}

package/lib/components/table/Tabs/index.js

@@ -42,6 +42,7 @@ var Tabs = ({
 }) => {
   const tabItems = (0, import_react.useMemo)(() => {
     return items.map((item, index) => ({
+      ...item,
       key: String(index),
       label: item.name
     }));

package/lib/locales/en-US.d.ts

@@ -161,5 +161,6 @@ declare const _default: {
     'walletCard-discount': string;
     'pisellQrcode-done': string;
     'pisellQrcode-qrcode': string;
+    'pisell-design-mode-action-disabled': string;
 };
 export default _default;

package/lib/locales/en-US.js

@@ -201,5 +201,6 @@ var en_US_default = {
   "walletCard-discount": "Discount",
   //PisellQrcode组件
   "pisellQrcode-done": "Done",
-  "pisellQrcode-qrcode": "QR code"
+  "pisellQrcode-qrcode": "QR code",
+  "pisell-design-mode-action-disabled": "This action cannot be performed in edit mode"
 };

package/lib/locales/zh-CN.d.ts

@@ -161,5 +161,6 @@ declare const _default: {
     'walletCard-discount': string;
     'pisellQrcode-done': string;
     'pisellQrcode-qrcode': string;
+    'pisell-design-mode-action-disabled': string;
 };
 export default _default;

package/lib/locales/zh-CN.js

@@ -200,5 +200,6 @@ var zh_CN_default = {
   "walletCard-discount": "折扣卡",
   //PisellQrcode组件
   "pisellQrcode-done": "完成",
-  "pisellQrcode-qrcode": "二维码"
+  "pisellQrcode-qrcode": "二维码",
+  "pisell-design-mode-action-disabled": "编辑模式下不可执行此操作"
 };

package/lib/locales/zh-TW.d.ts

@@ -161,5 +161,6 @@ declare const _default: {
     'walletCard-discount': string;
     'pisellQrcode-done': string;
     'pisellQrcode-qrcode': string;
+    'pisell-design-mode-action-disabled': string;
 };
 export default _default;

package/lib/locales/zh-TW.js

@@ -201,5 +201,6 @@ var zh_TW_default = {
   "walletCard-discount": "折扣卡",
   //PisellQrcode组件
   "pisellQrcode-done": "完成",
-  "pisellQrcode-qrcode": "二維碼"
+  "pisellQrcode-qrcode": "二維碼",
+  "pisell-design-mode-action-disabled": "編輯模式下不可執行此操作"
 };

package/lowcode/button/meta.ts

@@ -40,7 +40,7 @@ const ButtonMeta = {
               tip: "children",
             },
             propType: 'string',
-            setter: 'StringSetter',
+            setter: 'PisellI18nSetter',
           },
           {
             name: "htmlType",

package/lowcode/data-source-form/utils.ts

@@ -42,13 +42,23 @@ export const createSubmitButton = (props: any = {}) => {
       type: 'primary',
       size: 'large',
       status: 'normal',
-      children: 'Submit',
+      childrenString: {
+        type: 'i18n',
+        en: 'Submit',
+        'zh-CN': '提交',
+        'zh-HK': '提交',
+      },
       confirmConfig: {
         enable: false,
       },
       toastConfig: {
         enable: true,
-        title: 'Submitted successfully',
+        title: {
+          type: 'i18n',
+          en: 'Submitted successfully',
+          'zh-CN': '提交成功',
+          'zh-HK': '提交成功',
+        },
       },
       refreshData: true,
       afterSubmitType: 'none',
@@ -202,6 +212,13 @@ export const createFormItemSchema = (
   ) {
     if (['Radio.Group', 'Checkbox.Group'].includes(xComponent)) {
       props.direction = 'horizontal';
+    } else {
+      props.styleType = 'antd';
+      if (props.mode === "multiple") {
+        props.selectAll = true;
+        props.isShowDropdown = true;
+        props.showSearch = true;
+      }
     }
     props.optionSourceType = 'default';
     props.options = uiSchema.enum;
@@ -209,12 +226,14 @@ export const createFormItemSchema = (
 
   if (xComponent === 'TimePicker') {
     props.format = 'HH:mm';
+    props.placeholder = '';
     props.defaultValue = props.defaultValue || null;
   }
 
   if (xComponent === 'DatePicker') {
     props.format = props.dateFormat || 'YYYY-MM-DD';
     props.showTime = false;
+    props.placeholder = '';
     props.defaultValue = null;
   }
 

package/lowcode/data-source-table/meta.ts

@@ -367,7 +367,6 @@ const dataSourceTable = {
                         },
                         propType: 'bool',
                         setter: 'BoolSetter',
-                        isRequired: true,
                       },
                     ],
                   },
@@ -996,6 +995,24 @@ const dataSourceTable = {
                           propType: 'string',
                           setter: 'StringSetter',
                         },
+                        {
+                          name: 'disabled',
+                          title: {
+                            label: {
+                              type: 'i18n',
+                              'en-US': 'Disabled',
+                              'zh-CN': '是否禁用',
+                            },
+                            tip: {
+                              type: 'i18n',
+                              'en-US': 'disabled | Whether the tab is disabled',
+                              'zh-CN': 'disabled | 是否禁用标签页',
+                            },
+                          },
+                          propType: 'bool',
+                          defaultValue: false,
+                          setter: 'BoolSetter'
+                        }
                       ],
                     },
                   },

package/lowcode/data-source-table/utils.tsx

@@ -2,7 +2,7 @@ import {
   nocobaseCpt2PisellCptMap,
   systemFields,
 } from '../data-source-form/constants';
-import { clearVariables, createFormItemSchema } from '../data-source-form/utils';
+import { clearVariables, createFormItemSchema, createFormGroup } from '../data-source-form/utils';
 import {
   getVariable,
   getAllVariables,
@@ -241,7 +241,7 @@ export const getFormContent = (target: any, mode: 'add' | 'edit' | 'view') => {
               ? genDataSourceValueKey(target, 'currentRecord')
               : undefined,
         },
-        children: childrenSchemas,
+        children: createFormGroup(childrenSchemas),
       },
     ],
   };

package/lowcode/form-item-select/meta.ts

@@ -70,16 +70,22 @@ export default {
           'en-US': 'Style',
           'zh-CN': '样式使用',
         },
+        condition(target: any) {
+          const mode = target.getProps().getPropValue('mode');
+          if (!mode) return false;
+          return ['multiple', 'tags'].includes(mode);
+        },
         setter: {
           componentName: 'SelectSetter',
           props: {
             options: [
               { title: '系统样式', value: 'system' },
-              { title: 'Antd样式', value: 'antd' }
-            ]
-          }
-        }
-      }
+              { title: 'Antd样式', value: 'antd' },
+            ],
+          },
+        },
+        defaultValue: 'antd',
+      },
     ]),
   ],
   props: [
@@ -458,7 +464,7 @@ export default {
       propType: 'bool',
     },
     {
-      name: 'FormItemSelectAll',
+      name: 'selectAll',
       title: { label: '全选', tip: 'FormItemSelectAll ｜全选' },
       propType: 'bool',
       condition: {

package/lowcode/form-item-select/snippets.ts

@@ -9,9 +9,7 @@ export default [
         allowClear: true,
         optionSourceType: 'default',
         optionFilterProp: 'label',
-        style: {
-          width: 200,
-        },
+        styleType: "antd",
         options: [
           {
             label: 'A',
@@ -40,9 +38,7 @@ export default [
         mode: 'multiple',
         optionSourceType: 'default',
         optionFilterProp: 'label',
-        style: {
-          width: 200,
-        },
+        styleType: "antd",
         options: [
           {
             label: 'A',

package/lowcode/form-item-upload/meta.ts

@@ -202,10 +202,10 @@ export default {
             return target.getProps().getPropValue('enableCustomType');
           },
           setter: {
-            componentName: 'SelectSetter',
+            componentName: 'PisellSelectSetter',
             props: {
               options: [],
-              mode: 'tag',
+              mode: 'tags',
             },
           },
         },

package/lowcode/form-item-upload/snippets.ts

@@ -1,6 +1,7 @@
 export default [
   {
     title: '多媒体文件上传',
+    screenshot: require('./__screenshots__/upload.png'),
     schema: {
       componentName: 'FormItemUpload',
       title: '多媒体文件上传',

package/lowcode/select/snippets.ts

@@ -8,6 +8,7 @@ export default [
         style: {
           width: 200,
         },
+        styleType: 'antd',
         options: [
           {
             label: 'A',

package/lowcode/submit-button/meta.ts

@@ -28,20 +28,21 @@ const SubmitButtonMeta: ComponentMetadata = {
       display: 'accordion',
       items: [
         {
-          name: 'children',
+          name: 'childrenString',
           title: {
             label: {
               type: 'i18n',
               'en-US': 'Text',
               'zh-CN': '文字',
             },
-            tip: 'children',
           },
-          propType: {
-            type: 'oneOfType',
-            value: ['node', 'string'],
+          setter: ['PisellI18nSetter'],
+          defaultValue: {
+            type: 'i18n',
+            en: 'Submit',
+            'zh-CN': '提交',
+            'zh-HK': '提交',
           },
-          setter: ['SlotSetter', 'PisellI18nSetter', 'VariableSetter'],
         },
         {
           name: 'status',
@@ -214,7 +215,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                       'zh-CN': '标题',
                     },
                     setter: ['PisellI18nSetter', 'VariableSetter'],
-                    defaultValue: 'Confirm',
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Confirm submission',
+                      'zh-CN': '确认提交',
+                      'zh-HK': '確認提交',
+                    },
                   },
                   {
                     name: 'content',
@@ -224,7 +230,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                       'zh-CN': '辅助文字',
                     },
                     setter: ['PisellI18nSetter', 'VariableSetter'],
-                    defaultValue: 'Are you sure you want to submit the form?',
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Are you sure you want to submit this form?',
+                      'zh-CN': '确定要提交此表单吗？',
+                      'zh-HK': '確定要提交此表單嗎？',
+                    },
                   },
                   {
                     name: 'cancelText',
@@ -234,7 +245,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                       'zh-CN': '取消按钮文字',
                     },
                     setter: ['PisellI18nSetter', 'VariableSetter'],
-                    defaultValue: 'Cancel',
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Cancel',
+                      'zh-CN': '取消',
+                      'zh-HK': '取消',
+                    },
                   },
                   {
                     name: 'okText',
@@ -244,7 +260,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                       'zh-CN': '确定按钮文字',
                     },
                     setter: ['PisellI18nSetter', 'VariableSetter'],
-                    defaultValue: 'Confirm',
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Submit',
+                      'zh-CN': '提交',
+                      'zh-HK': '提交',
+                    },
                   },
                 ],
               },
@@ -323,7 +344,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                       'zh-CN': '文字',
                     },
                     setter: ['PisellI18nSetter', 'VariableSetter'],
-                    defaultValue: 'Submitted successfully',
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Submitted successfully',
+                      'zh-CN': '提交成功',
+                      'zh-HK': '提交成功',
+                    },
                   },
                 ],
               },
@@ -398,7 +424,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                 'zh-CN': '标题',
               },
               setter: 'PisellI18nSetter',
-              defaultValue: 'Submitted successfully',
+              defaultValue: {
+                type: 'i18n',
+                en: 'Submitted successfully',
+                'zh-CN': '提交成功',
+                'zh-HK': '提交成功',
+              },
             },
             {
               name: 'afterSubmitModalConfig.content',
@@ -408,7 +439,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                 'zh-CN': '内容',
               },
               setter: 'PisellI18nSetter',
-              defaultValue: 'Your submission has been successfully completed.',
+              defaultValue: {
+                type: 'i18n',
+                en: 'Your form has been successfully submitted',
+                'zh-CN': '您的表单已成功提交',
+                'zh-HK': '您的表單已成功提交',
+              },
             },
             {
               name: 'afterSubmitModalConfig.okText',
@@ -418,7 +454,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                 'zh-CN': '按钮文字',
               },
               setter: 'PisellI18nSetter',
-              defaultValue: 'OK',
+              defaultValue: {
+                type: 'i18n',
+                en: 'OK',
+                'zh-CN': '确定',
+                'zh-HK': '確定',
+              },
             },
           ],
         },
@@ -471,7 +512,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                 'zh-CN': '文字',
               },
               setter: 'PisellI18nSetter',
-              defaultValue: 'Submitted successfully',
+              defaultValue: {
+                type: 'i18n',
+                en: 'Submitted successfully',
+                'zh-CN': '提交成功',
+                'zh-HK': '提交成功',
+              },
             },
             {
               name: 'afterSubmitNotificationConfig.content',
@@ -481,7 +527,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                 'zh-CN': '消息',
               },
               setter: 'PisellI18nSetter',
-              defaultValue: 'Your submission has been successfully completed.',
+              defaultValue: {
+                type: 'i18n',
+                en: 'Your form has been successfully submitted',
+                'zh-CN': '您的表单已成功提交',
+                'zh-HK': '您的表單已成功提交',
+              },
             },
             {
               name: 'afterSubmitNotificationConfig.placement',

package/lowcode/submit-button/snippets.ts

@@ -6,7 +6,12 @@ export default [
       componentName: 'SubmitButton',
       props: {
         type: 'primary',
-        children: 'Submit',
+        childrenString: {
+          type: 'i18n',
+          en: 'Submit',
+          'zh-CN': '提交',
+          'zh-HK': '提交',
+        },
         status: 'normal',
         afterSubmitType: 'none',
         refreshData: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.492",
+  "version": "1.0.493",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",