@pisell/materials 1.0.603 → 1.0.604

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

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "link" | "button";
+        type: "button" | "link";
         items: OperationItem[];
     } | undefined;
     operationContent?: {
@@ -65,7 +65,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;

package/es/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "xzero" | "saas";
+    rootDomain: "custom" | "saas" | "xzero";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/es/components/pisellModal/components/MobileModal/index.less

@@ -17,14 +17,18 @@
       overflow: hidden;
       max-height: 90%;
       min-height: 200px;
+      display: flex;
+      flex-direction: column;
     }
     .pisell-lowcode-modal-content {
+      flex: 1;
       padding: 0;
       border-radius: 0;
       height: 100%;
       display: flex;
       flex-direction: column;
       max-height: none;
+      min-height: 200px;
       .pisell-lowcode-modal-close {
         padding: 10px;
         top: 8px;

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

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "link" | "button";
+        type: "button" | "link";
         items: OperationItem[];
     } | undefined;
     operationContent?: {
@@ -65,7 +65,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;

package/lib/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "xzero" | "saas";
+    rootDomain: "custom" | "saas" | "xzero";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/lib/components/pisellModal/components/MobileModal/index.less

@@ -17,14 +17,18 @@
       overflow: hidden;
       max-height: 90%;
       min-height: 200px;
+      display: flex;
+      flex-direction: column;
     }
     .pisell-lowcode-modal-content {
+      flex: 1;
       padding: 0;
       border-radius: 0;
       height: 100%;
       display: flex;
       flex-direction: column;
       max-height: none;
+      min-height: 200px;
       .pisell-lowcode-modal-close {
         padding: 10px;
         top: 8px;

package/lowcode/_utils/defaultSchema.ts

@@ -363,7 +363,7 @@ export const generalItemMap = {
   },
   maxLengthobj: {
     name: 'maxLengthobj',
-      title: {
+    title: {
       label: {
         type: 'i18n',
         'en-US': 'Maximum length',
@@ -655,6 +655,10 @@ export const formItemGeneralDataGroup = {
         componentName: 'PisellDataSourceSetter',
         props: {
           disabled: true,
+          filters: {
+            tables: 'all',
+            variables: {}
+          },
         },
       },
     },
@@ -722,6 +726,10 @@ export const formItemGeneralOptionTypeGroup = {
         componentName: 'PisellDataSourceSetter',
         props: {
           mode: 'list',
+          filters: {
+            tables: 'all',
+            variables: {}
+          },
         },
       },
     },
@@ -1510,7 +1518,9 @@ export const genGeneralVariablesSetting = ({
       componentName: 'PisellDataSourceSetter',
       props: (target: any) => {
         return {
-          isShowOriginalDataSource: false,
+          filters: {
+            variables: {}
+          },
           variables: getCptValuesVariables(target),
         };
       },

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),
               };
             },

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

@@ -26,10 +26,17 @@ const DataSourceMenuMeta: IPublicTypeComponentMetadata = {
       },
       setter: {
         componentName: 'PisellDataSourceSetter',
+        props: {
+          filters: {
+            variables: {
+              menu: 'all'
+            }
+          },
+        }
       },
       extraProps: {
         setValue(target: any, value: any) {
-          return target.getProps().setPropValue('dataSource', value.item);
+          return target.getProps().setPropValue('dataSource', value.value);
         },
       },
     },
@@ -97,7 +104,7 @@ const DataSourceMenuMeta: IPublicTypeComponentMetadata = {
 const snippets: IPublicTypeSnippet[] = [
   {
     title: '菜单导航',
-    screenshot: '',
+    screenshot: 'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/menu-1.jpg',
     schema: {
       componentName: 'DataSourceMenu',
       props: {

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

@@ -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: {}
+              },
+            }
           },
         },
         {
@@ -1733,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'
+                        }
                       ],
                     },
                   },
@@ -4801,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-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
                     );

package/lowcode/pisell-menu/meta.ts

@@ -84,8 +84,8 @@ const PisellMenuMeta: IPublicTypeComponentMetadata = {
 
 const snippets: IPublicTypeSnippet[] = [
   {
-    title: 'PisellMenu',
-    screenshot: '',
+    title: '菜单导航',
+    screenshot: 'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/menu-1.jpg',
     schema: {
       componentName: 'PisellMenu',
       props: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.603",
+  "version": "1.0.604",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,9 +69,9 @@
     "libphonenumber-js": "^1.11.17",
     "swiper": "^8.4.7",
     "react-barcode": "^1.5.3",
+    "@pisell/date-picker": "1.0.115",
     "@pisell/icon": "0.0.10",
-    "@pisell/utils": "1.0.43",
-    "@pisell/date-picker": "1.0.115"
+    "@pisell/utils": "1.0.43"
   },
   "peerDependencies": {
     "react": "^18.0.0",