@cniot/mdd-editor 0.2.0-beta.3 → 0.2.0-beta.5

package/build/index.es.js

@@ -17481,7 +17481,9 @@ const formilySchema = ({ moduleDataSource = {} }) => {
               "x-decorator": "CnFormItem",
               "x-component": "Input",
               "x-validator": [],
-              "x-component-props": {},
+              "x-component-props": {
+                hasClear: true
+              },
               "x-decorator-props": {},
               name: "width",
               default: "50%",
@@ -17508,7 +17510,9 @@ const formilySchema = ({ moduleDataSource = {} }) => {
               "x-decorator": "CnFormItem",
               "x-component": "Input",
               "x-validator": [],
-              "x-component-props": {},
+              "x-component-props": {
+                hasClear: true
+              },
               "x-decorator-props": {},
               name: "height",
               "x-reactions": {
@@ -18105,8 +18109,12 @@ var PrimaryKey = {
     "x-designable-id": "c1f6xiczrp8"
   }
 };
-var commonColumnProps = () => {
+var commonColumnProps = ({ listSchema = [] }) => {
   var _a2;
+  const columnsOpts = (listSchema == null ? void 0 : listSchema.map((item) => ({
+    ...item,
+    value: item.name || item.label
+  }))) || [];
   return {
     width: {
       type: "number",
@@ -18284,6 +18292,25 @@ var commonColumnProps = () => {
       },
       name: "tooltip",
       "x-designable-id": "sxbti21112zmzk"
+    },
+    parentHeaderColumn: {
+      type: "string",
+      title: "\u8868\u5934\u5206\u7EC4\u7236\u7EA7\u5217",
+      "x-decorator": "CnFormItem",
+      "x-component": "FormilySelect.AutoComplete",
+      "x-validator": [],
+      "x-component-props": {
+        style: {
+          width: "200px"
+        },
+        size: "small"
+      },
+      "x-decorator-props": {
+        tip: "\u8BBE\u7F6E\u7236\u7EA7\u540E\uFF0C\u5F53\u524D\u5217\u8868\u5934\u4F1A\u663E\u793A\u5728\u7236\u7EA7\u5217\u7684\u4E0B\u9762"
+      },
+      enum: columnsOpts,
+      name: "parentHeaderColumn",
+      "x-designable-id": "sxbti11221112zmzk"
     }
   };
 };
@@ -18302,7 +18329,7 @@ const shouldCopyClipboard = {
     "x-designable-id": "sxbti22331112zmzk"
   }
 };
-var TextSchema = () => {
+var TextSchema = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -18311,14 +18338,14 @@ var TextSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         ...shouldCopyClipboard
       },
       "x-designable-id": "j744a1rk494"
     }
   };
 };
-var TplSchema = () => {
+var TplSchema = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -18327,7 +18354,7 @@ var TplSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         tpl: {
           type: "string",
           title: "\u6A21\u677F\u8868\u8FBE\u5F0F",
@@ -18353,7 +18380,7 @@ var TplSchema = () => {
     }
   };
 };
-var TagSchema = () => {
+var TagSchema = (params) => {
   return {
     form: {
       labelCol: 4,
@@ -18362,7 +18389,7 @@ var TagSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         dataSource: {
           type: "array",
           title: "\u6807\u7B7E\u9879",
@@ -18566,7 +18593,7 @@ var TagSchema = () => {
     }
   };
 };
-var DateSchema = () => {
+var DateSchema = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -18575,7 +18602,7 @@ var DateSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         format: {
           type: "string",
           title: "\u65E5\u671F\u663E\u793A\u683C\u5F0F",
@@ -18617,7 +18644,8 @@ var DateSchema = () => {
     }
   };
 };
-var CustomSchema = ({ moduleDataSource = {} }) => {
+var CustomSchema = (params) => {
+  const { moduleDataSource = {} } = params || {};
   return {
     form: {
       labelCol: 6,
@@ -18626,7 +18654,7 @@ var CustomSchema = ({ moduleDataSource = {} }) => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         customType: {
           title: "\u81EA\u5B9A\u4E49\u7C7B\u578B",
           "x-decorator": "CnFormItem",
@@ -18689,7 +18717,7 @@ var CustomSchema = ({ moduleDataSource = {} }) => {
     }
   };
 };
-var EnumSchema = () => {
+var EnumSchema = (params) => {
   return {
     form: {
       labelCol: 4,
@@ -18698,7 +18726,7 @@ var EnumSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         dataSource: {
           type: "array",
           title: "\u679A\u4E3E\u9879",
@@ -18815,7 +18843,7 @@ var EnumSchema = () => {
     }
   };
 };
-var NumSchema = () => {
+var NumSchema = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -18824,7 +18852,7 @@ var NumSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         format: {
           title: "\u6570\u503C\u683C\u5F0F",
           "x-decorator": "CnFormItem",
@@ -18863,7 +18891,7 @@ var NumSchema = () => {
     }
   };
 };
-var ClipboardSchema = () => {
+var ClipboardSchema = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -18872,13 +18900,13 @@ var ClipboardSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps()
+        ...commonColumnProps(params)
       },
       "x-designable-id": "j741121rk494"
     }
   };
 };
-var ListSchema = () => {
+var ListSchema = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -18887,7 +18915,7 @@ var ListSchema = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         showNum: {
           type: "number",
           title: "\u663E\u793A\u5728\u8868\u683C\u5217\u7684\u6761\u6570",
@@ -18948,7 +18976,7 @@ var ListSchema = () => {
     }
   };
 };
-var TooltipText = () => {
+var TooltipText = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -18957,7 +18985,7 @@ var TooltipText = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         align: {
           title: "\u6D6E\u5C42\u65B9\u5411",
           "x-decorator": "CnFormItem",
@@ -18998,7 +19026,7 @@ var TooltipText = () => {
     }
   };
 };
-var Images = () => {
+var Images = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -19007,7 +19035,7 @@ var Images = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps(),
+        ...commonColumnProps(params),
         isFile: {
           type: "boolean",
           title: "\u662F\u5426\u662F\u9644\u4EF6",
@@ -19105,7 +19133,7 @@ var Images = () => {
     }
   };
 };
-var CnTag = () => {
+var CnTag = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -19114,13 +19142,13 @@ var CnTag = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps()
+        ...commonColumnProps(params)
       },
       "x-designable-id": "kv084cg1qw7"
     }
   };
 };
-var CnNumber = () => {
+var CnNumber = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -19129,13 +19157,13 @@ var CnNumber = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps()
+        ...commonColumnProps(params)
       },
       "x-designable-id": "kv084cg1qw7"
     }
   };
 };
-var CnBank = () => {
+var CnBank = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -19144,13 +19172,13 @@ var CnBank = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps()
+        ...commonColumnProps(params)
       },
       "x-designable-id": "kv084cg1qw7"
     }
   };
 };
-var CnImageText = () => {
+var CnImageText = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -19159,13 +19187,13 @@ var CnImageText = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps()
+        ...commonColumnProps(params)
       },
       "x-designable-id": "kv084cg1qw7"
     }
   };
 };
-var CnProgress = () => {
+var CnProgress = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -19174,13 +19202,13 @@ var CnProgress = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps()
+        ...commonColumnProps(params)
       },
       "x-designable-id": "kv084cg1qw7"
     }
   };
 };
-var cnGraphicsPercent = () => {
+var cnGraphicsPercent = (params) => {
   return {
     form: {
       labelCol: 6,
@@ -19189,7 +19217,7 @@ var cnGraphicsPercent = () => {
     schema: {
       type: "object",
       properties: {
-        ...commonColumnProps()
+        ...commonColumnProps(params)
       },
       "x-designable-id": "kv084cg3331qw7"
     }
@@ -19461,19 +19489,39 @@ const formValidator$1 = {
     enum: [
       {
         label: "\u90AE\u7BB1",
-        value: "email"
+        value: "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$"
       },
       {
-        label: "\u7535\u8BDD",
-        value: "phone"
+        label: "\u6570\u5B57",
+        value: "^[+-]?\\d+(\\.\\d+)?$"
       },
       {
-        label: "\u8EAB\u4EFD\u8BC1",
-        value: "idCard"
+        label: "\u6574\u6570",
+        value: "^[+-]?\\d+$"
       },
       {
         label: "QQ",
-        value: "qq"
+        value: "^(\\+?[1-9]\\d*|0)$"
+      },
+      {
+        label: "\u624B\u673A\u53F7",
+        value: "^\\d{3}-\\d{8}$|^\\d{4}-\\d{7}$|^\\d{11}$"
+      },
+      {
+        label: "\u8EAB\u4EFD\u8BC1\u53F7",
+        value: "^\\d{15}$|^\\d{17}(\\d|x|X)$"
+      },
+      {
+        label: "\u91D1\u989D",
+        value: "^([\\u0024\\u00A2\\u00A3\\u00A4\\u20AC\\u00A5\\u20B1\\u20B9\\uFFE5]\\s*)(\\d+,?)+\\.?\\d*\\s*$"
+      },
+      {
+        label: "\u4E2D\u6587",
+        value: "^[\\u4e00-\\u9fa5]+$"
+      },
+      {
+        label: "\u65E5\u671F",
+        value: "^[0-9]+[./-][0-9]+[./-][0-9]+\\s*(?:[0-9]+\\s*:\\s*[0-9]+\\s*:\\s*[0-9]+)?$"
       }
     ],
     "x-designable-id": "df97o0zfqde"
@@ -19801,7 +19849,7 @@ var EditNumberPickerSchema = {
     "x-designable-id": "edit-table-j744a1rk494"
   }
 };
-const selectSchema$2 = {
+const selectSchema$3 = {
   ...editCommonItem,
   mode: {
     type: "string | number",
@@ -19997,7 +20045,7 @@ var EditSelectSchema = {
         title: "\u7F16\u8F91\u5668\u5C5E\u6027",
         "x-designable-id": "xoirvxpflgk",
         properties: {
-          ...selectSchema$2
+          ...selectSchema$3
         }
       }
     },
@@ -20629,6 +20677,112 @@ var EditAddressSelectSchema = {
     "x-designable-id": "yk7opli2cp8"
   }
 };
+const selectSchema$2 = {
+  ...editCommonItem,
+  mode: {
+    type: "string | number",
+    title: "\u9009\u62E9\u6A21\u5F0F",
+    "x-decorator": "CnFormItem",
+    "x-component": "CnRadioGroup",
+    default: "single",
+    enum: [
+      {
+        label: "\u5355\u9009",
+        value: "single"
+      },
+      {
+        label: "\u591A\u9009",
+        value: "multiple"
+      }
+    ],
+    "x-validator": [],
+    "x-component-props": {},
+    "x-decorator-props": {},
+    name: "mode",
+    "x-designable-id": "y5mtbwr162t"
+  },
+  source: {
+    type: "string",
+    title: "\u6570\u636E\u6E90",
+    "x-decorator": "CnFormItem",
+    "x-component": "FormilyAjaxSchemaForm",
+    "x-validator": [],
+    "x-component-props": {},
+    default: {
+      type: "json",
+      content: [
+        {
+          label: "\u9009\u98791",
+          value: "1"
+        },
+        {
+          label: "\u9009\u98792",
+          value: "2"
+        }
+      ]
+    },
+    "x-decorator-props": {},
+    name: "dataSource",
+    "x-designable-id": "t0uv4o8e9ds"
+  },
+  optionLabelKey: {
+    title: "\u9009\u9879\u6807\u9898Key",
+    "x-decorator": "CnFormItem",
+    "x-component": "Input",
+    "x-validator": [],
+    "x-component-props": {},
+    "x-decorator-props": {},
+    name: "optionLabelKey",
+    default: "label",
+    "x-designable-id": "511333ac9k"
+  },
+  optionValueKey: {
+    title: "\u9009\u9879\u503CKey",
+    "x-decorator": "CnFormItem",
+    "x-component": "Input",
+    "x-validator": [],
+    "x-component-props": {},
+    "x-decorator-props": {},
+    name: "optionLabelKey",
+    default: "value",
+    "x-designable-id": "5112229k"
+  },
+  changeOnSelect: {
+    type: "string",
+    title: "\u9009\u62E9\u5373\u6539\u53D8",
+    "x-decorator": "CnFormItem",
+    "x-component": "Switch",
+    "x-validator": [],
+    "x-component-props": {},
+    "x-decorator-props": {},
+    name: "changeOnSelect",
+    default: false,
+    "x-designable-id": "bt66221112xl3px"
+  }
+};
+var EditCascaderSelectSchema = {
+  form: {
+    labelCol: 6,
+    wrapperCol: 16
+  },
+  schema: {
+    type: "object",
+    properties: {
+      ...getEditCommonColumnProps(),
+      decoratorProps: {
+        type: "object",
+        "x-validator": [],
+        name: "decoratorProps",
+        title: "\u7F16\u8F91\u5668\u5C5E\u6027",
+        "x-designable-id": "xoirvxpflgk",
+        properties: {
+          ...selectSchema$2
+        }
+      }
+    },
+    "x-designable-id": "edit-table-j744a1rk494"
+  }
+};
 var EditColumns = {
   "edit-custom": EditCustomSchema,
   "edit-input": EditInputSchema,
@@ -20637,7 +20791,8 @@ var EditColumns = {
   "edit-select": EditSelectSchema,
   "edit-date-picker": EditDatePickerSchema,
   "edit-time-picker": EditTimePickerSchema,
-  "edit-address-select": EditAddressSelectSchema
+  "edit-address-select": EditAddressSelectSchema,
+  "edit-cascader-select": EditCascaderSelectSchema
 };
 var ModuleImport = {
   form: {
@@ -23732,16 +23887,29 @@ const TitleRender$2 = (props) => {
     onClick: onRemove
   }));
 };
+const watchFields = (listSchema) => {
+  const fieldStringArray = listSchema.map((item) => {
+    return `${item.label}_${item.name}`;
+  });
+  return fieldStringArray.join(",");
+};
 const ContentRender$1 = (props) => {
-  const { values, effects, onChange, schema, index: index2, extraFieldSchema: extraFieldSchema2, updateForceFLag } = props;
+  const { values, effects, onChange, schema, index: index2, extraFieldSchema: extraFieldSchema2, updateForceFLag, listSchema } = props;
   const { type, label, name } = values;
   const { formilySchema: formilySchema2, dataAdaptor: dataAdaptor2 } = schema || {};
+  const [uuid, setUuid] = useState(uuidv4());
   const { dataMap, getModule } = useModule$1();
   const moduleDataSource = getModule("$ModuleDataSource");
+  React$1.useEffect(
+    debounce_1(() => {
+      setUuid(uuidv4());
+    }, 500),
+    [watchFields(listSchema)]
+  );
   const realSchema = useMemo(() => {
-    const srcSchema = getRealSchema(formilySchema2 || schema, { moduleDataSource });
+    const srcSchema = getRealSchema(formilySchema2 || schema, { moduleDataSource, listSchema });
     return getRealCompSchema(srcSchema, extraFieldSchema2);
-  }, [formilySchema2, schema, extraFieldSchema2, moduleDataSource]);
+  }, [formilySchema2, schema, extraFieldSchema2, moduleDataSource, uuid, listSchema]);
   const formilyForm = useMemo(() => {
     const realValues = dataAdaptor2 ? dataAdaptor2(values, true) : values;
     return {
@@ -23885,6 +24053,7 @@ function MddTableForm(props, ref) {
       schema: CompSchemaMap[item.type],
       extraFieldSchema: extraFieldSchema2,
       effects,
+      listSchema: dataRef.current,
       onChange: ({ record }) => {
         const { type, name, label, groupKey, ...otherProps } = dataRef.current[idx];
         const newRecord = { ...record, label, name, groupKey };
@@ -23919,6 +24088,12 @@ function getRealCompSchema(srcSchema, extraFieldSchema2) {
   }
   return srcSchema;
 }
+function uuidv4() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    var r = Math.random() * 16 | 0, v2 = c == "x" ? r : r & 3 | 8;
+    return v2.toString(16);
+  });
+}
 const PenetrateTypes = {
   FILTER: "filter",
   FORM: "form"
@@ -24175,6 +24350,10 @@ const columnsTypeOptionsWithEditCnTable = [
     value: "edit-address-select",
     label: "\u5730\u5740\u9009\u62E9"
   },
+  {
+    value: "edit-cascader-select",
+    label: "\u7EA7\u8054\u9009\u62E9\u5668"
+  },
   {
     value: "edit-custom",
     label: "\u81EA\u5B9A\u4E49"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cniot/mdd-editor",
-  "version": "0.2.0-beta.3",
+  "version": "0.2.0-beta.5",
   "description": "模型驱动编辑器",
   "scripts": {
     "build": "vite build"
@@ -39,4 +39,4 @@
     "@monaco-editor/react": "*"
   },
   "repository": "git@gitlab.alibaba-inc.com:one-code/mdd.git"
-}
+}

package/src/template/const.js

@@ -221,6 +221,11 @@ export const columnsTypeOptionsWithEditCnTable = [
     value: 'edit-address-select',
     label: '地址选择',
   },
+  {
+    value: 'edit-cascader-select',
+    label: '级联选择器',
+  },
+
   {
     value: 'edit-custom',
     label: '自定义',