@pisell/materials 6.0.10 → 6.0.12

package/lib/locales/zh-TW.js

@@ -169,11 +169,12 @@ var zh_TW_default = {
   "pisell-data-source-form-email-message": "請輸入有效的電子郵件地址",
   "pisell-data-source-form-domain-message": "請輸入有效的域名",
   "pisell-data-source-form-url-message": "請輸入正確的網址",
-  "pisell-data-source-form-phone-message": "請輸入有效的電話號碼",
+  "pisell-data-source-form-phone-message": "請輸入正確的電話號碼",
   "pisell-data-source-form-min-length-message": (minLength) => `長度必須至少為${minLength}个字符`,
   "pisell-data-source-form-max-length-message": (maxLength) => `長度必須最多為${maxLength}个字符`,
   "pisell-data-source-form-min-value-message": (minValue) => `值必須大於或等於${minValue}`,
   "pisell-data-source-form-max-value-message": (maxValue) => `值必須小於或等於${maxValue}`,
+  "pisell-data-source-form-mobile-message": "請輸入正確的手機號碼",
   // 數字格式化
   "pisell-number-format-thousand": "千",
   "pisell-number-format-million": "百萬",
@@ -200,5 +201,25 @@ var zh_TW_default = {
   "pisell-delete-confirm-ok": "刪除",
   "pisell-delete-confirm-cancel": "取消",
   "pisell-design-mode-action-disabled": "編輯模式下不可執行此操作",
-  "pisell-translation-original": "原始語言"
+  "pisell-translation-original": "原始語言",
+  "pisell-version-modal-title": "創建新版本",
+  "pisell-version-modal-current-version": "當前版本",
+  "pisell-version-modal-version": "版本號",
+  "pisell-version-modal-update-notes": "更新說明",
+  "pisell-version-modal-patch": "補丁版本",
+  "pisell-version-modal-minor": "次版本",
+  "pisell-version-modal-major": "主版本",
+  "pisell-version-modal-custom": "自定義版本",
+  "pisell-version-modal-cancel": "取消",
+  "pisell-version-modal-confirm": "确定",
+  "pisell-version-modal-describe-update-notes": "描述此版本的主要更改...",
+  "pisell-version-modal-version-error": "版本號必須大於當前版本",
+  "pisell-version-modal-version-required": "版本號為必填項",
+  // 子域名校验错误
+  "subdomain-error-too-short": "子域名長度不能小於2個字符",
+  "subdomain-error-too-long": "子域名長度不能超過60個字符",
+  "subdomain-error-pattern": "子域名只能包含小寫字母、數字和連字符",
+  "subdomain-error-numbers-only": "子域名不能全為數字",
+  "subdomain-error-hyphen-ends": "子域名不能以連字符開頭或結尾",
+  "subdomain-error-consecutive-hyphens": "子域名不能包含連續的連字符"
 };

package/lowcode/_utils/defaultSchema.ts

@@ -363,7 +363,7 @@ export const generalItemMap = {
   },
   maxLengthobj: {
     name: 'maxLengthobj',
-      title: {
+    title: {
       label: {
         type: 'i18n',
         'en-US': 'Maximum length',
@@ -462,6 +462,9 @@ export const generalItemMap = {
                     { title: '网址', value: 'url' },
                     { title: '域名', value: 'domain' },
                     { title: '正则', value: 'pattern' },
+                    { title: '手机号', value: 'mobile' },
+                    { title: '电话号码', value: 'phone' },
+                    { title: '子域名', value: 'subdomain' },
                   ],
                 },
               },
@@ -477,6 +480,7 @@ export const generalItemMap = {
               condition: (target: any) => {
                 return target.parent.getPropValue('type') === 'pattern';
               },
+              isRequired: true,
             },
             {
               name: 'message',
@@ -487,6 +491,9 @@ export const generalItemMap = {
               },
               propType: 'string',
               setter: 'PisellI18nSetter',
+              condition: (target: any) => {
+                return !(['subdomain'].includes(target.parent.getPropValue('type')));
+              },
             },
           ],
         },
@@ -648,6 +655,10 @@ export const formItemGeneralDataGroup = {
         componentName: 'PisellDataSourceSetter',
         props: {
           disabled: true,
+          filters: {
+            tables: 'all',
+            variables: {}
+          },
         },
       },
     },
@@ -715,6 +726,10 @@ export const formItemGeneralOptionTypeGroup = {
         componentName: 'PisellDataSourceSetter',
         props: {
           mode: 'list',
+          filters: {
+            tables: 'all',
+            variables: {}
+          },
         },
       },
     },
@@ -1319,6 +1334,9 @@ export const formItemGeneralProps = [
                         { title: '网址', value: 'url' },
                         { title: '域名', value: 'domain' },
                         { title: '正则', value: 'pattern' },
+                        { title: '手机号', value: 'mobile' },
+                        { title: '电话号码', value: 'phone' },
+                        { title: '子域名', value: 'subdomain' },
                       ],
                     },
                   },
@@ -1334,6 +1352,7 @@ export const formItemGeneralProps = [
                   condition: (target: any) => {
                     return target.parent.getPropValue('type') === 'pattern';
                   },
+                  isRequired: true,
                 },
                 {
                   name: 'message',
@@ -1499,7 +1518,9 @@ export const genGeneralVariablesSetting = ({
       componentName: 'PisellDataSourceSetter',
       props: (target: any) => {
         return {
-          isShowOriginalDataSource: false,
+          filters: {
+            variables: {}
+          },
           variables: getCptValuesVariables(target),
         };
       },

package/lowcode/button/meta.ts

@@ -137,35 +137,19 @@ const ButtonMeta = {
                 props: {
                   options: [
                     {
-                      title: {
-                        type: "i18n",
-                        "en-US": "Jump to this window",
-                        "zh-CN": "本窗口跳转",
-                      },
+                      title: "本窗口跳转",
                       value: "_self",
                     },
                     {
-                      title: {
-                        type: "i18n",
-                        "en-US": "open a new tab",
-                        "zh-CN": "打开新标签页",
-                      },
+                      title: "打开新标签页",
                       value: "_blank",
                     },
                     {
-                      title: {
-                        type: "i18n",
-                        "en-US": "parent window jump",
-                        "zh-CN": "父窗口跳转",
-                      },
+                      title: "父窗口跳转",
                       value: "_parent",
                     },
                     {
-                      title: {
-                        type: "i18n",
-                        "en-US": "Top-level window jump",
-                        "zh-CN": "顶层窗口跳转",
-                      },
+                      title: "顶层窗口跳转",
                       value: "_top",
                     },
                   ],

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

@@ -8,6 +8,7 @@ import formItemInputEmailMeta from '../form-item-input.email/meta';
 import formItemInputJsonMeta from '../form-item-input.json/meta';
 import formItemInputPasswordMeta from '../form-item-input.password/meta';
 import formItemInputPhoneMeta from '../form-item-input.phone/meta';
+import formItemInputMobileMeta from '../form-item-input.mobile/meta';
 import formItemInputTextAreaMeta from '../form-item-input.text-area/meta';
 import formItemInputUrlMeta from '../form-item-input.url/meta';
 import formItemRadioMeta from '../form-item-radio/meta';
@@ -27,6 +28,7 @@ export const metaAll = [
   formItemInputJsonMeta,
   formItemInputPasswordMeta,
   formItemInputPhoneMeta,
+  formItemInputMobileMeta,
   formItemInputTextAreaMeta,
   formItemInputUrlMeta,
   formItemRadioMeta,
@@ -57,6 +59,8 @@ export const nocobaseCpt2PisellCptMap: Record<string, any> = {
   'Input.TextArea': 'FormItemInput.TextArea',
   'Input.Email': 'FormItemInput.Email',
   'Input.Phone': 'FormItemInput.Phone',
+  'Input.Mobile': 'FormItemInput.Mobile',
+  'Input.Subdomain': 'FormItemInput.Subdomain',
   Password: 'FormItemInput.Password',
   Select: 'FormItemSelect',
   Radio: 'FormItemRadio',

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

@@ -154,6 +154,10 @@ const dataSourceForm: MetaType = {
             componentName: 'PisellDataSourceSetter',
             props: (target: any) => {
               return {
+                filters: {
+                  tables: 'all',
+                  variables: {}
+                },
                 mode: target.getProps().getPropValue('renderMode'),
                 variables: getDataSourceVariables(target),
               };
@@ -256,7 +260,9 @@ const dataSourceForm: MetaType = {
             componentName: 'PisellDataSourceSetter',
             props: (target) => {
               return {
-                isShowOriginalDataSource: false,
+                filters: {
+                  variables: {}
+                },
                 variables: getCurrentValueVariables(target),
               };
             },
@@ -472,6 +478,137 @@ const dataSourceForm: MetaType = {
         },
       ],
     },
+    {
+      type: 'group',
+      title: {
+        type: 'i18n',
+        'en-US': 'Interaction behavior',
+        'zh-CN': '交互行为',
+      },
+      display: 'accordion',
+      items: [
+        {
+          name: 'leaveConfirmConfig',
+          title: {
+            label: {
+              type: 'i18n',
+              'en-US': 'Unsaved warning',
+              'zh-CN': '未保存离开提示',
+            },
+          },
+          setter: {
+            componentName: 'ObjectSetter',
+            props: {
+              config: {
+                items: [
+                  {
+                    name: 'enable',
+                    title: {
+                      type: 'i18n',
+                      'en-US': 'Enable',
+                      'zh-CN': '启用',
+                    },
+                    setter: 'BoolSetter',
+                    isRequired: true,
+                  },
+                  {
+                    name: 'icon',
+                    title: {
+                      type: 'i18n',
+                      'en-US': 'Icon',
+                      'zh-CN': '图标',
+                    },
+                    setter: [
+                      {
+                        componentName: 'SlotSetter',
+                        initialValue: {
+                          type: 'JSSlot',
+                          value: [
+                            {
+                              componentName: 'Icon',
+                              props: {
+                                type: 'SmileOutlined',
+                                size: 20,
+                                rotate: 0,
+                                spin: false,
+                              },
+                            },
+                          ],
+                        },
+                        defaultValue: null,
+                      },
+                    ],
+                  },
+                  {
+                    name: 'title',
+                    title: {
+                      type: 'i18n',
+                      'en-US': 'Title',
+                      'zh-CN': '标题',
+                    },
+                    setter: ['PisellI18nSetter', 'VariableSetter'],
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Unsaved changes',
+                      'zh-CN': '未保存的更改',
+                      'zh-HK': '未保存的更改',
+                    },
+                  },
+                  {
+                    name: 'content',
+                    title: {
+                      type: 'i18n',
+                      'en-US': 'Helper text',
+                      'zh-CN': '辅助文字',
+                    },
+                    setter: ['PisellI18nSetter', 'VariableSetter'],
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'You have unsaved changes. Leave anyway?',
+                      'zh-CN': '您有未保存的更改，确定要离开？',
+                      'zh-HK': '您有未保存的更改，確定要離開？',
+                    },
+                  },
+                  {
+                    name: 'cancelText',
+                    title: {
+                      type: 'i18n',
+                      'en-US': 'Cancel button text',
+                      'zh-CN': '取消按钮文字',
+                    },
+                    setter: ['PisellI18nSetter', 'VariableSetter'],
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Cancel',
+                      'zh-CN': '取消',
+                      'zh-HK': '取消',
+                    },
+                  },
+                  {
+                    name: 'okText',
+                    title: {
+                      type: 'i18n',
+                      'en-US': 'OK button text',
+                      'zh-CN': '确定按钮文字',
+                    },
+                    setter: ['PisellI18nSetter', 'VariableSetter'],
+                    defaultValue: {
+                      type: 'i18n',
+                      en: 'Leave',
+                      'zh-CN': '离开',
+                      'zh-HK': '離開',
+                    },
+                  },
+                ],
+              },
+              columns: 1,
+              forceInline: 1,
+              mode: 'popup',
+            },
+          },
+        },
+      ]
+    },
   ],
   configure: {
     props: [

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

@@ -39,6 +39,33 @@ export default [
             "function onFinishFailed({ values, errorFields, outOfDate }) {\n  console.log('onFinishFailed', values, errorFields, outOfDate);\n}",
         },
         name: 'basic',
+        leaveConfirmConfig: {
+          enable: true,
+          title: {
+            type: 'i18n',
+            en: 'Unsaved changes',
+            'zh-CN': '未保存的更改',
+            'zh-HK': '未保存的更改',
+          },
+          content: {
+            type: 'i18n',
+            en: 'You have unsaved changes. Leave anyway?',
+            'zh-CN': '您有未保存的更改，确定要离开？',
+            'zh-HK': '您有未保存的更改，確定要離開？',
+          },
+          okText: {
+            type: 'i18n',
+            en: 'Leave',
+            'zh-CN': '离开',
+            'zh-HK': '離開',
+          },
+          cancelText: {
+            type: 'i18n',
+            en: 'Stay',
+            'zh-CN': '返回',
+            'zh-HK': '返回',
+          },
+        },
       },
       children: [],
     },
@@ -85,6 +112,33 @@ export default [
             "function onFinishFailed({ values, errorFields, outOfDate }) {\n  console.log('onFinishFailed', values, errorFields, outOfDate);\n}",
         },
         name: 'basic',
+        leaveConfirmConfig: {
+          enable: true,
+          title: {
+            type: 'i18n',
+            en: 'Unsaved changes',
+            'zh-CN': '未保存的更改',
+            'zh-HK': '未保存的更改',
+          },
+          content: {
+            type: 'i18n',
+            en: 'You have unsaved changes. Leave anyway?',
+            'zh-CN': '您有未保存的更改，确定要离开？',
+            'zh-HK': '您有未保存的更改，確定要離開？',
+          },
+          okText: {
+            type: 'i18n',
+            en: 'Leave',
+            'zh-CN': '离开',
+            'zh-HK': '離開',
+          },
+          cancelText: {
+            type: 'i18n',
+            en: 'Stay',
+            'zh-CN': '返回',
+            'zh-HK': '返回',
+          },
+        },
       },
       children: [],
     },

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

@@ -151,9 +151,13 @@ export const createFormItemSchema = (
   let childrenSchema: any[] = [];
 
   if (item?.interface === 'phone') {
-    cptTitle = '手机号码输入';
+    cptTitle = '电话号码输入';
     componentName = 'Input.Phone';
   }
+  if (item?.interface === 'mobile') {
+    cptTitle = '手机号码输入';
+    componentName = 'Input.Mobile';
+  }
 
   if (xComponent === 'Percent') {
     cptTitle = '百分比输入';

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

@@ -0,0 +1,122 @@
+import { IPublicTypeComponentMetadata, IPublicTypeSnippet } from '@alilc/lowcode-types';
+
+const DataSourceMenuMeta: IPublicTypeComponentMetadata = {
+  componentName: 'DataSourceMenu',
+  title: '菜单导航',
+  docUrl: '',
+  screenshot: '',
+  group: '无代码组件',
+  category: '无代码数据展示',
+  devMode: 'proCode',
+  npm: {
+    package: '@pisell/materials',
+    version: '1.0.3',
+    exportName: 'DataSourceMenu',
+    main: 'src/index.tsx',
+    destructuring: true,
+    subName: ''
+  },
+  props: [
+    {
+      name: 'dataSource',
+      title: {
+        type: 'i18n',
+        'en-US': 'Source',
+        'zh-CN': '数据源',
+      },
+      setter: {
+        componentName: 'PisellDataSourceSetter',
+        props: {
+          filters: {
+            variables: {
+              menu: 'all'
+            }
+          },
+        }
+      },
+      extraProps: {
+        setValue(target: any, value: any) {
+          return target.getProps().setPropValue('dataSource', value.value);
+        },
+      },
+    },
+    {
+      name: 'mode',
+      propType: {
+        type: 'oneOf',
+        value: ['vertical', 'horizontal', 'inline']
+      },
+      description: '菜单模式',
+      defaultValue: 'vertical',
+      setter: {
+        componentName: 'SelectSetter',
+        props: {
+          options: [
+            { label: '垂直', value: 'vertical' },
+            { label: '水平', value: 'horizontal' },
+            { label: '内嵌', value: 'inline' },
+          ]
+        }
+      }
+    },
+    {
+      name: 'theme',
+      propType: {
+        type: 'oneOf',
+        value: ['light', 'dark']
+      },
+      description: '主题',
+      defaultValue: 'light',
+      setter: {
+        componentName: 'RadioGroupSetter',
+        props: {
+          options: [
+            { label: '亮色', value: 'light' },
+            { label: '暗色', value: 'dark' },
+          ]
+        }
+      }
+    },
+    {
+      name: 'className',
+      propType: 'string',
+      description: '类名',
+      setter: 'StringSetter'
+    },
+    {
+      name: 'style',
+      propType: 'object',
+      description: '样式',
+      setter: 'StyleSetter'
+    }
+  ],
+  configure: {
+    component: {
+      isContainer: true
+    },
+    supports: {
+      style: true,
+      className: true
+    }
+  }
+};
+
+const snippets: IPublicTypeSnippet[] = [
+  {
+    title: '菜单导航',
+    screenshot: 'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/menu-1.jpg',
+    schema: {
+      componentName: 'DataSourceMenu',
+      props: {
+        mode: 'vertical',
+        theme: 'light',
+        dataSource: ''
+      }
+    }
+  }
+];
+
+export default {
+  ...DataSourceMenuMeta,
+  snippets
+};

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

@@ -11,7 +11,7 @@ import {
   fields2TableFilterOptions,
   filterTypes,
   setDefaultSearchFilter,
-  setDefaultSort,
+  setDefaultSort, getFieldComponent,
 } from './utils';
 import { getVariable, setBatchVariables } from '../data-source-form/utils';
 import { uuid } from '../_utils/utils';
@@ -21,12 +21,12 @@ import { getFormItemGeneralInfoGroup } from '../_utils/defaultSchema';
 const getI18n = (
   item:
     | {
-        type: string;
-        key: string;
-        en: string;
-        'zh-CN': string;
-        'zh-HK': string;
-      }
+      type: string;
+      key: string;
+      en: string;
+      'zh-CN': string;
+      'zh-HK': string;
+    }
     | string
 ) => {
   if (typeof item === 'string') {
@@ -141,6 +141,12 @@ const dataSourceTable = {
           },
           setter: {
             componentName: 'PisellDataSourceSetter',
+            props: {
+              filters: {
+                tables: 'all',
+                variables: {}
+              },
+            }
           },
         },
         {
@@ -335,9 +341,8 @@ const dataSourceTable = {
                             );
                             // 设置label
                             if (field) {
-                              target
-                                .getProps()
-                                .setPropValue('label', field.uiSchema.title);
+                              target.parent.setPropValue('title', field.uiSchema.title);
+                              target.parent.setPropValue('fieldComponent', getFieldComponent(field));
                               // target.node.children.importSchema([createFormItemChildren(field)])
                               // 插入schema后 有概率不生效，所以这里手动rerender
                               // setTimeout(() => {
@@ -1734,23 +1739,23 @@ const dataSourceTable = {
                           defaultValue: false,
                           isRequired: true,
                         },
-                      {
-                        name: 'other',
-                        title: {
-                          label: {
-                            type: 'i18n',
-                            'en-US': 'Other Properties',
-                            'zh-CN': '其他拓展属性'
+                        {
+                          name: 'other',
+                          title: {
+                            label: {
+                              type: 'i18n',
+                              'en-US': 'Other Properties',
+                              'zh-CN': '其他拓展属性'
+                            },
+                            tip: {
+                              type: 'i18n',
+                              'en-US': 'Other extended properties',
+                              'zh-CN': '其他拓展属性'
+                            }
                           },
-                          tip: {
-                            type: 'i18n',
-                            'en-US': 'Other extended properties',
-                            'zh-CN': '其他拓展属性'
-                          }
-                        },
-                        propType: 'object',
-                        setter: 'JsonSetter'
-                      }
+                          propType: 'object',
+                          setter: 'JsonSetter'
+                        }
                       ],
                     },
                   },
@@ -4802,7 +4807,7 @@ const dataSourceTable = {
                                   target.parent.parent.parent,
                                   this,
                                   'target.parent.parent.parent\n' +
-                                    '                                  .getPropValue("columns")'
+                                  '                                  .getPropValue("columns")'
                                 );
                                 const fieldsKey =
                                   target.parent.parent.parent