@pisell/materials 6.0.11 → 6.0.12

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/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-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

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

@@ -79,6 +79,10 @@ const createRenderSchema = (field: any) => {
   };
 };
 
+export const getFieldComponent = (field: any) => {
+  return createFormItemSchema(field, 'edit').componentName === 'JsonWrapper' ? 'FormItemInput.JSON' : createFormItemSchema(field, 'edit').componentName
+}
+
 export const fields2Columns = (fields: any[]) => {
   if (!fields || !fields.length) return [];
 
@@ -96,7 +100,7 @@ export const fields2Columns = (fields: any[]) => {
       //   value: [createRenderSchema(field)],
       //   id: 'node_ocm49b0bm71',
       // },
-      fieldComponent: createFormItemSchema(field, 'edit').componentName === 'JsonWrapper' ? 'FormItemInput.JSON' : createFormItemSchema(field, 'edit').componentName,
+      fieldComponent: getFieldComponent(field)
       // fieldProps
     }));
 };
@@ -272,6 +276,34 @@ export const getFormContent = (target: any, mode: 'add' | 'edit' | 'view') => {
             mode !== 'add'
               ? genDataSourceValueKey(target, 'currentRecord')
               : undefined,
+          leaveConfirmConfig: mode !== 'view' ? {
+            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': '返回',
+              },
+            }
+          : undefined,
         },
         children: childrenSchemas,
       },

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

@@ -72,7 +72,7 @@ const dataSourceWrapper: MetaType = {
                 target.getProps().setPropValue('title', '');
                 target.node.children.importSchema([]);
               }
-              
+
               const dataSource = value.isVariable ? value.value : value.item;
 
               setBatchVariables(target, [
@@ -102,6 +102,10 @@ const dataSourceWrapper: MetaType = {
             componentName: 'PisellDataSourceSetter',
             props: (target: any) => {
               return {
+                filters: {
+                  tables: 'all',
+                  variables: {}
+                },
                 variables: getDataSourceVariables(target),
               };
             },
@@ -163,7 +167,7 @@ const dataSourceWrapper: MetaType = {
           name: 'autoRun.get',
           title: {
             type: 'i18n',
-            'en-US': 'Get Auto Run', 
+            'en-US': 'Get Auto Run',
             'zh-CN': '详情自动运行',
           },
           setter: 'BoolSetter',

package/lowcode/form-group/meta.ts

@@ -84,6 +84,10 @@ export default {
             componentName: 'PisellDataSourceSetter',
             props: {
               disabled: true,
+              filters: {
+                tables: 'all',
+                variables: {}
+              },
             },
           },
         },
@@ -134,7 +138,7 @@ export default {
                     appendContainer = lastGroup || appendContainer;
                     // 全部字段
                     const allFields = getVariable(target.node.parent, 'currentFields');
-                    
+
                     const nocobaseField = allFields.find(
                       (item: any) => item.name === field
                     );