@pisell/materials 1.0.594 → 1.0.596

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

@@ -52,55 +52,7 @@ export default {
     ]),
     getFormItemValidateGroup([
       generalItemMap['requiredobj'],
-      {
-        name: 'typeobj',
-        title: {
-          label: {
-            type: 'i18n',
-            'en-US': 'Enable validation',
-            'zh-CN': '开启验证',
-          },
-          tip: '开启验证',
-        },
-        setter: {
-          componentName: 'ObjectSetter',
-          props: {
-            config: {
-              items: [
-                {
-                  name: 'enabled',
-                  title: {
-                    type: 'i18n',
-                    'en-US': 'Enabled',
-                    'zh-CN': '是否启用',
-                  },
-                  propType: 'bool',
-                  setter: 'BoolSetter',
-                  isRequired: true,
-                  extraProps: {
-                    setValue: (target: any, value: any) => {
-                      return target.parent.setPropValue('type', 'phone');
-                    },
-                  },
-                },
-                {
-                  name: 'message',
-                  title: {
-                    type: 'i18n',
-                    'en-US': 'Error message',
-                    'zh-CN': '错误信息提示',
-                  },
-                  propType: 'string',
-                  setter: 'PisellI18nSetter',
-                },
-              ],
-            },
-            columns: 1,
-            forceInline: 1,
-            mode: 'popup',
-          },
-        },
-      },
+      generalItemMap['typeobj'],
     ]),
   ],
   props: [
@@ -150,11 +102,6 @@ export default {
       defaultValue: '请输入',
       setter: 'PisellI18nSetter',
     },
-    // {
-    //   name: 'id',
-    //   title: { label: '输入框ID', tip: '输入框的ID' },
-    //   propType: 'string',
-    // },
     {
       name: 'maxLength',
       title: { label: '最大长度', tip: '最大长度' },
@@ -255,6 +202,35 @@ export default {
       title: { label: '按下清除按钮的回调', tip: '按下清除按钮的回调' },
       propType: 'func',
     },
+    {
+      name: 'typeobj',
+      title: '验证规则',
+      setter: {
+        componentName: 'ObjectSetter',
+        props: {
+          config: {
+            items: [
+              {
+                name: 'type',
+                title: '类型',
+                setter: {
+                  componentName: 'StringSetter',
+                  initialValue: 'mobile'
+                }
+              },
+              {
+                name: 'enabled',
+                title: '启用',
+                setter: {
+                  componentName: 'BoolSetter',
+                  initialValue: true
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
   ],
   configure: {
     supports: {

package/lowcode/form-item-input.mobile/snippets.ts

@@ -12,7 +12,7 @@ export default [
         type: 'tel',
         allowClear: true,
         typeobj: {
-          type: 'phone',
+          type: 'mobile',
           enabled: true,
         },
       },

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

@@ -52,55 +52,7 @@ export default {
     ]),
     getFormItemValidateGroup([
       generalItemMap['requiredobj'],
-      {
-        name: 'typeobj',
-        title: {
-          label: {
-            type: 'i18n',
-            'en-US': 'Enable validation',
-            'zh-CN': '开启验证',
-          },
-          tip: '开启验证',
-        },
-        setter: {
-          componentName: 'ObjectSetter',
-          props: {
-            config: {
-              items: [
-                {
-                  name: 'enabled',
-                  title: {
-                    type: 'i18n',
-                    'en-US': 'Enabled',
-                    'zh-CN': '是否启用',
-                  },
-                  propType: 'bool',
-                  setter: 'BoolSetter',
-                  isRequired: true,
-                  extraProps: {
-                    setValue: (target: any, value: any) => {
-                      return target.parent.setPropValue('type', 'phone');
-                    },
-                  },
-                },
-                {
-                  name: 'message',
-                  title: {
-                    type: 'i18n',
-                    'en-US': 'Error message',
-                    'zh-CN': '错误信息提示',
-                  },
-                  propType: 'string',
-                  setter: 'PisellI18nSetter',
-                },
-              ],
-            },
-            columns: 1,
-            forceInline: 1,
-            mode: 'popup',
-          },
-        },
-      },
+      generalItemMap['typeobj'],
     ]),
   ],
   props: [

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

@@ -102,8 +102,6 @@ export default {
     ]),
     getFormItemValidateGroup([
       generalItemMap['requiredobj'],
-      generalItemMap['minLengthobj'],
-      generalItemMap['maxLengthobj'],
       generalItemMap['typeobj'],
     ]),
   ],

package/lowcode/form-item-input.subdomain/snippets.ts

@@ -10,16 +10,15 @@ export default [
       props: {
         placeholder: inputPlaceholder,
         rootDomain:'xzero',
+        extra:  {
+          type: 'i18n',
+          en: 'Can only contain lowercase letters (a-z), numbers (0-9) and hyphens (-)  ',
+          'zh-CN': '只能使用小写字母(a-z)、数字(0-9)和连字符(-) ',
+          'zh-HK': '只能使用小寫字母(a-z)、數字(0-9)和連字符(-) ',
+        },
         typeobj: {
-          type: 'pattern',
-          pattern:'^[a-z0-9]([a-z0-9-]*[a-z0-9])?$',
-          message:
-          {
-            type: 'i18n',
-            en: 'Please enter a valid domain name',
-            'zh-CN': '请输入正确的域名',
-          },
-          enabled: false,
+          type: 'subdomain',
+          enabled: true,
         },
         allowClear: true,
       },

package/lowcode/form.item/meta.ts

@@ -397,6 +397,54 @@ export default {
         ],
       },
     },
+    {
+      name: 'subdomainobj',
+      title: { label: '子域名校验设置', tip: '子域名校验设置' },
+      propType: {
+        type: 'shape',
+        value: [
+          { name: 'subdomain', title: '子域名校验设置', propType: 'string' },
+          {
+            name: 'message',
+            title: '错误信息提示',
+            propType: 'string',
+            setter: 'PisellI18nSetter',
+          },
+        ],
+      },
+    },
+    {
+      name: 'phoneobj',
+      title: { label: '电话号码校验设置', tip: '电话号码校验设置' },
+      propType: {
+        type: 'shape',
+        value: [
+          { name: 'phone', title: '电话号码校验设置', propType: 'string' },
+          {
+            name: 'message',
+            title: '错误信息提示',
+            propType: 'string',
+            setter: 'PisellI18nSetter',
+          },
+        ],
+      },
+    },
+    {
+      name: 'mobileobj',
+      title: { label: '手机号码校验设置', tip: '手机号码校验设置' },
+      propType: {
+        type: 'shape',
+        value: [
+          { name: 'mobile', title: '手机号码校验设置', propType: 'string' },
+          {
+            name: 'message',
+            title: '错误信息提示',
+            propType: 'string',
+            setter: 'PisellI18nSetter',
+          },
+        ],
+      },
+    },
     {
       name: 'validator',
       title: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.594",
+  "version": "1.0.596",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",