@pisell/materials 1.0.977 → 1.0.979

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

@@ -236,6 +236,11 @@ export const createFormItemSchema = (
     };
   }
 
+  // 如果类型是 integer，设置 precision 为 0，只允许输入整数
+  if (type === 'integer' && (xComponent === 'InputNumber' || xComponent === 'Percent')) {
+    props.precision = 0;
+  }
+
   if (xComponent === 'Input.JSON' && item?.interface !== 'i18nInput') {
     const jsonChildren = item._children || item.children || [];
 
@@ -255,21 +260,38 @@ export const createFormItemSchema = (
       props.autoSize = {
         minRows: 4,
       };
-      // props.validateTrigger = "onBlur";
+      
+      // 根据type类型生成不同的normalize和校验逻辑
+      const fieldType = type || 'object';
+      let normalizeValue = '';
+      let validatorValue = '';
+      
+      if (fieldType === 'array') {
+        // array类型：normalize时只转换数组
+        normalizeValue = '(value) => {\n  try {\n    if (typeof value === \'string\' && value.trim() !== \'\') {\n      const trimmedValue = value.trim();\n      // 只有以[开头才尝试转换\n      if (trimmedValue.startsWith(\'[\')) {\n        const parsed = JSON.parse(trimmedValue);\n        if (Array.isArray(parsed)) {\n          return parsed;\n        }\n      }\n    }\n  } catch(error) {\n    console.log(error)\n  }\n  return value\n}';
+        validatorValue = "async (value) => {\n  try {\n    if (typeof value === 'string' && value.trim() !== '') {\n      const trimmedValue = value.trim();\n      // 确保JSON是数组格式\n      if (!trimmedValue.startsWith('[')) {\n        return Promise.reject(new Error('该字段类型为数组，JSON必须以[开头'));\n      }\n      const parsed = JSON.parse(trimmedValue);\n      if (!Array.isArray(parsed)) {\n        return Promise.reject(new Error('该字段类型为数组，请输入合法的JSON数组'));\n      }\n    }\n  } catch (err) {\n    return Promise.reject(new Error(err.message));\n  }\n}";
+      } else if (fieldType === 'object') {
+        // object类型：normalize时只转换对象
+        normalizeValue = '(value) => {\n  try {\n    if (typeof value === \'string\' && value.trim() !== \'\') {\n      const trimmedValue = value.trim();\n      // 只有以{开头才尝试转换\n      if (trimmedValue.startsWith(\'{\')) {\n        const parsed = JSON.parse(trimmedValue);\n        if (!Array.isArray(parsed) && typeof parsed === \'object\') {\n          return parsed;\n        }\n      }\n    }\n  } catch(error) {\n    console.log(error)\n  }\n  return value\n}';
+        validatorValue = "async (value) => {\n  try {\n    if (typeof value === 'string' && value.trim() !== '') {\n      const trimmedValue = value.trim();\n      // 确保JSON是对象格式\n      if (!trimmedValue.startsWith('{')) {\n        return Promise.reject(new Error('该字段类型为对象，JSON必须以{开头'));\n      }\n      const parsed = JSON.parse(trimmedValue);\n      if (Array.isArray(parsed) || typeof parsed !== 'object') {\n        return Promise.reject(new Error('该字段类型为对象，请输入合法的JSON对象'));\n      }\n    }\n  } catch (err) {\n    return Promise.reject(new Error(err.message));\n  }\n}";
+      } else {
+        // 默认：normalize时只转换对象或数组
+        normalizeValue = '(value) => {\n  try {\n    if (typeof value === \'string\' && value.trim() !== \'\') {\n      const trimmedValue = value.trim();\n      // 只有以{或[开头才尝试转换\n      if (trimmedValue.startsWith(\'{\') || trimmedValue.startsWith(\'[\')) {\n        return JSON.parse(trimmedValue);\n      }\n    }\n  } catch(error) {\n    console.log(error)\n  }\n  return value\n}';
+        validatorValue = "async (value) => {\n  try {\n    if (typeof value === 'string' && value.trim() !== '') {\n      const trimmedValue = value.trim();\n      // 确保JSON以{或[开头，以避免纯数字或字符串通过校验\n      if (!trimmedValue.startsWith('{') && !trimmedValue.startsWith('[')) {\n        return Promise.reject(new Error('JSON必须是对象或数组，请以{或[开头'));\n      }\n      JSON.parse(trimmedValue);\n    }\n  } catch (err) {\n    return Promise.reject(new Error(err.message));\n  }\n}";
+      }
+      
       props.normalize = {
         type: 'JSExpression',
-        value:
-          '(value) => {\n  try {\n    return JSON.parse(value);\n  } catch(error) {\n    console.log(error)\n  }\n  return value\n}',
+        value: normalizeValue,
       };
       props.getValueProps = {
         type: 'JSExpression',
         value:
-          '(value) => {\n  try {\n   return { value: value != "" && typeof value === \'object\' ? JSON.stringify(value, null, 2) : value};\n  } catch(error) {\n    console.log(error)\n  }\n  return {value: value}\n}',
+          '(value) => {\n  try {\n    // 使用严格检查：null/undefined不转换，其他对象类型都转换\n    if (value !== null && value !== undefined && typeof value === \'object\') {\n      return { value: JSON.stringify(value, null, 2) };\n    }\n    return { value: value };\n  } catch(error) {\n    console.log(error)\n  }\n  return {value: value}\n}',
       };
       props.validator = {
         type: 'JSExpression',
-        value:
-          "async (value) => {\n try {\n    if (typeof value === 'string' && value.trim() !== '') {\n      JSON.parse(value);\n    }\n  } catch (err) {\n    return Promise.reject(new Error(err.message));\n  }\n}",
+        value: validatorValue,
       };
     }
   }
@@ -339,10 +361,15 @@ export const createFormItemSchema = (
     props.defaultValue = defaultValue;
   }
 
+  if (xComponent === 'Switch') {
+    props.placeholder = '';
+    props.allowClear = false;
+  }
+
   const _componentName = nocobaseCpt2PisellCptMap[componentName];
 
   // 确定 schema type
-  let schemaType: 'void' | 'string' | 'number' | 'object' | 'array' = 'string';
+  let schemaType: 'void' | 'string' | 'number' | 'object' | 'array' | 'boolean' = 'string';
   if (type) {
     schemaType = type as any;
   } else if (xComponent === 'InputNumber' || xComponent === 'Percent') {
@@ -351,6 +378,8 @@ export const createFormItemSchema = (
     schemaType = 'object';
   } else if (['Checkbox.Group', 'Select'].includes(xComponent) && props.mode === 'multiple') {
     schemaType = 'array';
+  } else if (xComponent === 'Switch' || xComponent === 'Checkbox') {
+    schemaType = 'boolean';
   }
 
   // 构建完整的 UI Schema 格式

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

@@ -0,0 +1,145 @@
+import snippets from './snippets';
+import {
+  formItemGeneralDataGroup,
+  getFormItemGeneralInfoGroup,
+  generalItemMap,
+  getFormItemValidateGroup,
+} from '../_utils/defaultSchema';
+
+export default {
+  snippets,
+  componentName: 'FormItemSwitch',
+  title: '开关(高级)',
+  category: '无代码表单',
+  group: '无代码组件',
+  docUrl: '',
+  screenshot: '',
+  devMode: 'proCode',
+  npm: {
+    package: '@pisell/materials',
+    version: '1.0.1',
+    exportName: 'FormItemSwitch',
+    main: 'src/index.tsx',
+    destructuring: true,
+    subName: '',
+  },
+  generalProps: [
+    // 数据分组
+    formItemGeneralDataGroup,
+    // 信息分组
+    getFormItemGeneralInfoGroup([
+      generalItemMap['label'],
+      generalItemMap['tooltip'],
+      generalItemMap['extra'],
+      generalItemMap['hideLabel'],
+      generalItemMap['renderMode'],
+    ]),
+    // 校验分组
+    getFormItemValidateGroup([generalItemMap['requiredobj']]),
+  ],
+  configure: {
+    props: [
+      {
+        name: 'checkedChildren',
+        title: { label: '选中时内容', tip: '选中时的内容' },
+        propType: 'string',
+        setter: 'PisellI18nSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'unCheckedChildren',
+        title: { label: '非选中时内容', tip: '非选中时的内容' },
+        propType: 'string',
+        setter: 'PisellI18nSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'autoFocus',
+        title: { label: '自动聚焦', tip: '自动获取焦点' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'checked',
+        title: { label: '当前值', tip: '指定当前是否选中' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'defaultChecked',
+        title: { label: '默认值', tip: '初始是否选中' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'disabled',
+        title: { label: '是否禁用', tip: '是否为禁用状态' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'loading',
+        title: { label: '加载中', tip: '加载中' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'size',
+        title: { label: '尺寸', tip: '开关大小' },
+        propType: { type: 'oneOf', value: ['default', 'small'] },
+        setter: {
+          componentName: 'RadioGroupSetter',
+          props: {
+            options: [
+              {
+                title: '默认',
+                value: 'default',
+              },
+              {
+                title: '小',
+                value: 'small',
+              },
+            ],
+          },
+        },
+        defaultValue: 'default',
+      },
+      {
+        name: 'onChange',
+        title: { label: '变化时回调函数', tip: '变化时回调函数' },
+        propType: 'func',
+      },
+      {
+        name: 'onClick',
+        title: { label: '点击时回调函数', tip: '点击时回调函数' },
+        propType: 'func',
+      },
+    ],
+    supports: {
+      style: true,
+      events: [
+        {
+          name: 'onChange',
+          template:
+            "onChange(checked,event,${extParams}){\n// 变化时回调函数\nconsole.log('onChange', checked, event);}",
+        },
+        {
+          name: 'onClick',
+          template:
+            "onClick(checked,event,${extParams}){\n// 点击时回调函数\nconsole.log('onClick', checked, event);}",
+        },
+      ],
+    },
+  },
+};
+

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

@@ -0,0 +1,15 @@
+export default [
+  {
+    title: '开关(高级)',
+    screenshot: 'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/switch-1.png',
+    schema: {
+      componentName: 'FormItemSwitch',
+      props: {
+        name: 'switch',
+        label: '开关',
+        defaultChecked: false,
+      },
+    },
+  },
+];
+