@pisell/materials 1.0.464 → 1.0.466

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

@@ -100,6 +100,10 @@ export default {
                     label: 'dataSourceTitle',
                     value: '',
                   },
+                  {
+                    label: 'dataSourceValue',
+                    value: '',
+                  },
                 ]);
                 target.node.children.importSchema([]);
                 return target.getProps().setPropValue('dataSource', '');
@@ -130,6 +134,8 @@ export default {
                 target.getProps().setPropValue('title', value.title);
               }
 
+              const dataSource = value.isVariable ? value.value : value.item;
+
               setBatchVariables(target, [
                 {
                   label: 'currentFields',
@@ -139,9 +145,12 @@ export default {
                   label: 'dataSourceTitle',
                   value: value.title,
                 },
+                {
+                  label: 'dataSourceValue',
+                  value: dataSource,
+                },
               ]);
 
-              const dataSource = value.isVariable ? value.value : value.item;
               return target.getProps().setPropValue('dataSource', dataSource);
             },
           },
@@ -242,7 +251,6 @@ export default {
               if (!value.value) {
                 return target.getProps().setPropValue('currentValue', '');
               }
-              console.log('value', value);
               return target
                 .getProps()
                 .setPropValue('currentValue', value.value);
@@ -251,7 +259,6 @@ export default {
           setter: {
             componentName: 'PisellDataSourceSetter',
             props: (target) => {
-              console.log('target getter', target);
               return {
                 isShowOriginalDataSource: false,
                 variables: getCurrentValueVariables(target),

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

@@ -1,3 +1,4 @@
+import { isString } from '@pisell/utils';
 import {
   nocobaseCpt2PisellCptMap,
   pisellCptMap,
@@ -50,6 +51,7 @@ export const createSubmitButton = (props: any = {}) => {
       afterSubmitType: 'none',
       ...props,
     },
+    children: [],
   };
 };
 
@@ -143,6 +145,7 @@ export const createFormItemSchema = (
     if (['Radio.Group', 'Checkbox.Group'].includes(xComponent)) {
       props.direction = 'horizontal';
     }
+    props.optionSourceType = 'default';
     props.options = uiSchema.enum;
   }
 
@@ -308,41 +311,97 @@ export const setBatchVariables = (
   target.getProps().setPropValue('_variables', newVariables);
 };
 
+// 获取当前节点所有变量
 export const getAllVariables = (target: any) => {
   return target.getProps().getPropValue('_variables');
 };
 
+// 获取当前节点单个变量
 export const getVariable = (target: any, label: string) => {
   return target.getProps().getPropValue('_variables')?.[label];
 };
 
+// 清除当前节点所有变量
 export const clearVariables = (target: any) => {
   return target.getProps().setPropValue('_variables', null);
 };
 
+type VariablesItemType = {
+  componentName: string;
+  title: string;
+  id: string;
+  variables: Record<string, any>;
+};
+
+// 获取当前节点父节点所有变量
 const getParentVariables = (target: any) => {
-  let parent = target.node.parent;
-  while (parent && !parent.getProps().getPropValue('_variables')) {
+  let parent = target.node;
+  const variables: VariablesItemType[] = [];
+
+  while (parent) {
+    const { componentName, title, id } = parent;
+    const _variables = parent.getProps().getPropValue('_variables');
+
+    const strTitle = isString(title) ? title : title['zh-CN'];
+
+    if (_variables) {
+      variables.push({
+        componentName,
+        title: strTitle,
+        id,
+
+        variables: _variables,
+      });
+    }
+
     parent = parent.parent;
   }
-  return parent ? getAllVariables(parent) : {};
+
+  return variables;
 };
 
+// 获取数据源变量
 export const getDataSourceVariables = (target: any) => {
   const variables = getParentVariables(target);
-  return variables?.dataSourceVariables || [];
+
+  return variables?.map((item: VariablesItemType) => {
+    return {
+      label: item.title,
+      value: item.id,
+      children: item.variables.dataSourceVariables,
+      isVariable: true,
+    };
+  }).filter(item => item?.children?.length);
 };
 
 export const getCurrentValueVariables = (target: any) => {
   const variables = getParentVariables(target);
   const currentDataSourceTitle = getVariable(target, 'dataSourceTitle');
 
-  const currentValueVariables = [
+  const currentValueVariables: any[] = [
     {
       label: currentDataSourceTitle,
       value: 'server',
     },
   ];
 
-  return currentValueVariables.concat(variables?.currentValueVariables || []);
+  variables.forEach((item: VariablesItemType) => {
+    if (item.variables?.currentValueVariables?.length) {
+      currentValueVariables.push({
+        label: item.title,
+        value: item.id,
+        children: item.variables.currentValueVariables,
+        isVariable: true,
+      });
+    }
+  });
+
+  return currentValueVariables;
 };
+
+export const getDataSourceValue = (target: any) => {
+  const variables = getParentVariables(target);
+  return variables?.find(item => item.variables.dataSourceValue)?.variables.dataSourceValue;
+};
+
+

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

@@ -1,6 +1,6 @@
 import snippets from './snippets';
 import button from '../button/meta';
-import { columns2Options, fields2Columns } from './utils';
+import { columns2Options, fields2Columns, genDataSourceValueKey } from './utils';
 import {
   fields2ChildrenSchemas,
   getVariable,
@@ -9,6 +9,7 @@ import {
   setBatchVariables,
   createSubmitButton,
 } from '../data-source-form/utils';
+import { omit } from '../_utils/utils';
 
 const getI18n = (
   item:
@@ -47,6 +48,12 @@ const getFormContent = (target: any, mode: 'add' | 'edit' | 'view') => {
     );
   }
 
+  // 过滤不需要继承的变量
+  const variables = omit(getAllVariables(target), [
+    'currentValueVariables',
+    'dataSourceVariables',
+  ]);
+
   return {
     type: 'JSSlot',
     params: [],
@@ -55,15 +62,18 @@ const getFormContent = (target: any, mode: 'add' | 'edit' | 'view') => {
         componentName: 'DataSourceForm',
         title,
         props: {
-          _variables: getAllVariables(target),
-          dataSource: '{{global.currentDataSource}}',
+          _variables: variables,
+          dataSource: genDataSourceValueKey(target, 'currentDataSource'),
           showTitle: false,
           showDescription: false,
           groupInfoPosition: 'top',
           layout: 'vertical',
           size: 'large',
           mode,
-          currentValue: mode !== 'add' ? '{{currentRecord}}' : undefined,
+          currentValue:
+            mode !== 'add'
+              ? genDataSourceValueKey(target, 'currentRecord')
+              : undefined,
         },
         children: childrenSchemas,
       },
@@ -108,6 +118,7 @@ export default {
           display: 'block',
           extraProps: {
             setValue(target: any, value: any) {
+              console.log(target, 'target');
               // 如果value为空，则清空表格
               if (!value.item) {
                 target.getProps().setPropValue('columns', []);
@@ -134,8 +145,9 @@ export default {
                   value: [
                     {
                       label: '当前数据表',
-                      value: '{{global.currentDataSource}}',
+                      value: genDataSourceValueKey(target, 'currentDataSource'),
                       item: value.item,
+                      isVariable: true,
                     },
                   ],
                 },
@@ -148,7 +160,7 @@ export default {
                   value: [
                     {
                       label: '当前行数据',
-                      value: '{{currentRecord}}',
+                      value: genDataSourceValueKey(target, 'currentRecord'),
                     },
                   ],
                 },

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

@@ -138,3 +138,8 @@ export const columns2Options = (columns: any[], allFields: any[] = []) => {
     },
   ];
 };
+
+// 生成数据源的值的key
+export const genDataSourceValueKey = (target: any, key: string) => {
+  return `{{${target.node.id}.value.${key}}}`;
+};

package/lowcode/date-picker.range-picker/meta.ts

@@ -171,6 +171,26 @@ export default {
               },
             },
           },
+          {
+            name: "isHideCustomSelect",
+            title: {
+              label: "是否隐藏自定义范围",
+              tip: "isHideCustomSelect | 是否隐藏自定义范围",
+            },
+            propType: "bool",
+            defaultValue: false,
+            setter: "BoolSetter",
+          },
+          {
+            name: "endDateDays",
+            title: {
+              label: "结束时间在开始时间的几天之后",
+              tip: "endDateDays | 结束时间在开始时间的几天之后",
+            },
+            defaultValue: 0,
+            propType: "number",
+            setter: "NumberSetter",
+          },
         ],
       },
       {

package/lowcode/form-group/meta.ts

@@ -1,5 +1,5 @@
 import snippets from './snippets';
-import { createFormItemSchema, formSchema2PisellFieldsOptions, getVariable } from '../data-source-form/utils';
+import { createFormItemSchema, formSchema2PisellFieldsOptions, getVariable, getDataSourceValue } from '../data-source-form/utils';
 
 export default {
   snippets,
@@ -77,8 +77,7 @@ export default {
           display: 'inline',
           extraProps: {
             getValue(target: any) {
-              const dataSource = target.node.parent.getProps().getPropValue('dataSource');
-              return dataSource?.key || dataSource?.tableName;
+              return getDataSourceValue(target);
             },
           },
           setter: {

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

@@ -15,6 +15,8 @@ export default [
     schema: {
       componentName: 'FormItemCheckbox.Group',
       props: {
+        direction: 'horizontal',
+        optionSourceType: 'default',
         options: [
           {
             label: 'A',

package/lowcode/form-item-checkbox.group/meta.ts

@@ -1,23 +1,48 @@
 import { uuid } from '../_utils/utils';
-import { formItemGeneralProps } from "../_utils/defaultSchema";
+import {
+  formItemGeneralDataGroup,
+  getFormItemGeneralInfoGroup,
+  getFormItemValidateGroup,
+  generalItemMap,
+  formItemGeneralOptionTypeGroup,
+  getFormItemGeneralAppearanceGroup,
+} from '../_utils/defaultSchema';
 
 export default {
   componentName: 'FormItemCheckbox.Group',
   title: '多选框组',
   category: '表单',
-  group: "无代码组件",
-  docUrl: "",
-  screenshot: "",
-  devMode: "proCode",
+  group: '无代码组件',
+  docUrl: '',
+  screenshot: '',
+  devMode: 'proCode',
   npm: {
-    package: "@pisell/materials",
-    version: "1.0.1",
-    exportName: "FormItemCheckbox",
-    main: "src/index.tsx",
+    package: '@pisell/materials',
+    version: '1.0.1',
+    exportName: 'FormItemCheckbox',
+    main: 'src/index.tsx',
     destructuring: true,
-    subName: "Group",
+    subName: 'Group',
   },
-  generalProps: formItemGeneralProps,
+  generalProps: [
+    // 数据分组
+    formItemGeneralDataGroup,
+    // 信息分组
+    getFormItemGeneralInfoGroup([
+      generalItemMap['label'],
+      generalItemMap['tooltip'],
+      generalItemMap['extra'],
+      generalItemMap['noStyle'],
+      generalItemMap['mode'],
+      generalItemMap['defaultValue'],
+    ]),
+    // 选项类型分组
+    formItemGeneralOptionTypeGroup,
+    // 校验分组
+    getFormItemValidateGroup([generalItemMap['requiredobj']]),
+    // 外观分组
+    getFormItemGeneralAppearanceGroup([generalItemMap['direction']]),
+  ],
 
   props: [
     {
@@ -30,10 +55,10 @@ export default {
         props: {
           itemSetter: {
             componentName: 'StringSetter',
-          }
-        }
+          },
+        },
       },
-      supportVariable: true
+      supportVariable: true,
     },
     {
       name: 'value',
@@ -44,10 +69,10 @@ export default {
         props: {
           itemSetter: {
             componentName: 'StringSetter',
-          }
-        }
+          },
+        },
       },
-      supportVariable: true
+      supportVariable: true,
     },
     {
       name: 'disabled',
@@ -55,14 +80,14 @@ export default {
       propType: 'bool',
       defaultValue: false,
       setter: 'BoolSetter',
-      supportVariable: true
+      supportVariable: true,
     },
     {
       name: 'name',
       title: { label: 'name属性', tip: 'name属性' },
       propType: 'string',
       setter: 'StringSetter',
-      supportVariable: true
+      supportVariable: true,
     },
     {
       name: 'options',
@@ -105,13 +130,13 @@ export default {
                     name: 'label',
                     title: '选项名',
                     setter: 'PisellI18nSetter',
-                    isRequired: true
+                    isRequired: true,
                   },
                   {
                     name: 'value',
                     title: '选项值',
                     setter: 'StringSetter',
-                    isRequired: true
+                    isRequired: true,
                   },
                   {
                     name: 'disabled',
@@ -131,7 +156,7 @@ export default {
           },
         },
       },
-      supportVariable: true
+      supportVariable: true,
     },
     {
       name: 'direction',

package/lowcode/form-item-color-picker/meta.ts

@@ -1,24 +1,36 @@
 import snippets from './snippets';
-import { formItemGeneralProps } from "../_utils/defaultSchema";
-
+import { formItemGeneralDataGroup, getFormItemGeneralInfoGroup, generalItemMap, getFormItemValidateGroup } from '../_utils/defaultSchema';
 export default {
   snippets,
   componentName: 'FormItemColorPicker',
   title: '颜色选择器',
   category: '表单',
   group: '无代码组件',
-  docUrl: "",
-  screenshot: "",
-  devMode: "proCode",
+  docUrl: '',
+  screenshot: '',
+  devMode: 'proCode',
   npm: {
-    package: "@pisell/materials",
-    version: "1.0.1",
-    exportName: "FormItemColorPicker",
-    main: "src/index.tsx",
+    package: '@pisell/materials',
+    version: '1.0.1',
+    exportName: 'FormItemColorPicker',
+    main: 'src/index.tsx',
     destructuring: true,
-    subName: "",
+    subName: '',
   },
-  generalProps: formItemGeneralProps,
+  generalProps: [
+    // 数据分组
+    formItemGeneralDataGroup,
+    // 信息分组
+    getFormItemGeneralInfoGroup([
+      generalItemMap['label'],
+      generalItemMap['tooltip'],
+      generalItemMap['extra'],
+      generalItemMap['noStyle'],
+      generalItemMap['mode'],
+    ]),
+     // 校验分组
+     getFormItemValidateGroup([generalItemMap['requiredobj']]),
+  ],
   props: [
     {
       name: 'allowClear',
@@ -130,7 +142,7 @@ export default {
     {
       name: 'presets',
       title: { label: '预设的颜色', tip: '预设的颜色' },
-      setter: "JsonSetter",
+      setter: 'JsonSetter',
     },
     {
       name: 'placement',
@@ -213,7 +225,7 @@ export default {
       name: 'value',
       title: { label: '当前值', tip: '当前值' },
       propType: 'string',
-      setter: 'StringSetter'
+      setter: 'StringSetter',
     },
     {
       name: 'showText',
@@ -283,7 +295,8 @@ export default {
         },
         {
           name: 'onFormatChange',
-          template: "onFormatChange(event,${extParams}){\n// 颜色格式变化的回调\nconsole.log('onFormatChange',event);}",
+          template:
+            "onFormatChange(event,${extParams}){\n// 颜色格式变化的回调\nconsole.log('onFormatChange',event);}",
         },
         {
           name: 'onOpenChange',

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

@@ -1,5 +1,10 @@
 import snippets from './snippets';
-import { formItemGeneralProps } from '../_utils/defaultSchema';
+import {
+  formItemGeneralDataGroup,
+  getFormItemGeneralInfoGroup,
+  generalItemMap,
+  getFormItemValidateGroup,
+} from '../_utils/defaultSchema';
 
 export default {
   snippets,
@@ -18,7 +23,23 @@ export default {
     destructuring: true,
     subName: '',
   },
-  generalProps: formItemGeneralProps,
+  generalProps: [
+    formItemGeneralDataGroup,
+    getFormItemGeneralInfoGroup([
+      generalItemMap['label'],
+      generalItemMap['placeholder'],
+      generalItemMap['tooltip'],
+      generalItemMap['extra'],
+      generalItemMap['noStyle'],
+      generalItemMap['mode'],
+      generalItemMap['defaultValue'],
+    ]),
+    getFormItemValidateGroup([
+      generalItemMap['requiredobj'],
+      generalItemMap['minLengthobj'],
+      generalItemMap['maxLengthobj'],
+    ]),
+  ],
   props: [
     {
       name: 'defaultValue',

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

@@ -1,7 +1,8 @@
 export default [
   {
     title: '单选框',
-    screenshot: 'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/radio-1.png',
+    screenshot:
+      'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/radio-1.png',
     schema: {
       componentName: 'FormItemRadio',
       props: {
@@ -11,11 +12,13 @@ export default [
   },
   {
     title: '单选框组',
-    screenshot: 'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/radio-group-1.png',
+    screenshot:
+      'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/radio-group-1.png',
     schema: {
       componentName: 'FormItemRadio.Group',
       props: {
-        direction: "horizontal",
+        direction: 'horizontal',
+        optionSourceType: 'default',
         options: [
           {
             label: 'A',

package/lowcode/form-item-radio.group/meta.ts

@@ -1,5 +1,5 @@
 import { uuid } from '../_utils/utils';
-import { formItemGeneralProps } from "../_utils/defaultSchema";
+import { formItemGeneralDataGroup,generalItemMap, getFormItemGeneralInfoGroup, formItemGeneralOptionTypeGroup, getFormItemValidateGroup, getFormItemGeneralAppearanceGroup } from '../_utils/defaultSchema';
 
 export default {
   componentName: 'FormItemRadio.Group',
@@ -17,7 +17,25 @@ export default {
     destructuring: true,
     subName: "Group",
   },
-  generalProps: formItemGeneralProps,
+  generalProps: [
+    // 数据分组
+    formItemGeneralDataGroup,
+    // 信息分组
+    getFormItemGeneralInfoGroup([
+      generalItemMap['label'],
+      generalItemMap['tooltip'],
+      generalItemMap['extra'],
+      generalItemMap['noStyle'],
+      generalItemMap['mode'],
+      generalItemMap['defaultValue'],
+    ]),
+    // 选项类型分组
+    formItemGeneralOptionTypeGroup,
+    // 校验分组
+    getFormItemValidateGroup([generalItemMap['requiredobj']]),
+    // 外观分组
+    getFormItemGeneralAppearanceGroup([generalItemMap['direction']]),
+  ],
   props: [
     {
       name: 'defaultValue',