cnhis-design-vue 3.1.11-beta.7 → 3.1.12-beta.0

package/es/packages/form-render/src/components/renderer/combination.d.ts

@@ -1,3 +1,4 @@
+import { FieldItem } from '../../types';
 import { PropType } from 'vue';
 export declare const COMBINATION: import("vue").DefineComponent<{
     title: {
@@ -7,65 +8,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
-    properties: {
-        type: PropType<Record<string, import("@formily/vue").Stringify<{
-            [key: symbol]: any;
-            [key: `x-${string}`]: any;
-            [key: `x-${number}`]: any;
-            version?: string | undefined;
-            name?: import("@formily/vue").SchemaKey | undefined;
-            title?: any;
-            description?: any;
-            default?: any;
-            readOnly?: boolean | undefined;
-            writeOnly?: boolean | undefined;
-            type?: import("@formily/vue").SchemaTypes | undefined;
-            enum?: import("@formily/vue").SchemaEnum<any> | undefined;
-            const?: any;
-            multipleOf?: number | undefined;
-            maximum?: number | undefined;
-            exclusiveMaximum?: number | undefined;
-            minimum?: number | undefined;
-            exclusiveMinimum?: number | undefined;
-            maxLength?: number | undefined;
-            minLength?: number | undefined;
-            pattern?: string | RegExp | undefined;
-            maxItems?: number | undefined;
-            minItems?: number | undefined;
-            uniqueItems?: boolean | undefined;
-            maxProperties?: number | undefined;
-            minProperties?: number | undefined;
-            required?: string | boolean | string[] | undefined;
-            format?: string | undefined;
-            $ref?: string | undefined;
-            $namespace?: string | undefined;
-            definitions?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            properties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            items?: import("@formily/vue").SchemaItems<any, any, any, any, any, any, any, any> | undefined;
-            additionalItems?: import("@formily/vue").Stringify<any> | undefined;
-            patternProperties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            additionalProperties?: import("@formily/vue").Stringify<any> | undefined;
-            "x-value"?: any;
-            "x-index"?: number | undefined;
-            "x-pattern"?: any;
-            "x-display"?: any;
-            "x-validator"?: any;
-            "x-decorator"?: any;
-            "x-decorator-props"?: any;
-            "x-component"?: any;
-            "x-component-props"?: any;
-            "x-reactions"?: import("@formily/vue").SchemaReactions<any> | undefined;
-            "x-content"?: any;
-            "x-data"?: any;
-            "x-visible"?: boolean | undefined;
-            "x-hidden"?: boolean | undefined;
-            "x-disabled"?: boolean | undefined;
-            "x-editable"?: boolean | undefined;
-            "x-read-only"?: boolean | undefined;
-            "x-read-pretty"?: boolean | undefined;
-            "x-compile-omitted"?: string[] | undefined;
-        }>>>;
-        required: true;
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: {
@@ -75,68 +20,13 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
-    properties: {
-        type: PropType<Record<string, import("@formily/vue").Stringify<{
-            [key: symbol]: any;
-            [key: `x-${string}`]: any;
-            [key: `x-${number}`]: any;
-            version?: string | undefined;
-            name?: import("@formily/vue").SchemaKey | undefined;
-            title?: any;
-            description?: any;
-            default?: any;
-            readOnly?: boolean | undefined;
-            writeOnly?: boolean | undefined;
-            type?: import("@formily/vue").SchemaTypes | undefined;
-            enum?: import("@formily/vue").SchemaEnum<any> | undefined;
-            const?: any;
-            multipleOf?: number | undefined;
-            maximum?: number | undefined;
-            exclusiveMaximum?: number | undefined;
-            minimum?: number | undefined;
-            exclusiveMinimum?: number | undefined;
-            maxLength?: number | undefined;
-            minLength?: number | undefined;
-            pattern?: string | RegExp | undefined;
-            maxItems?: number | undefined;
-            minItems?: number | undefined;
-            uniqueItems?: boolean | undefined;
-            maxProperties?: number | undefined;
-            minProperties?: number | undefined;
-            required?: string | boolean | string[] | undefined;
-            format?: string | undefined;
-            $ref?: string | undefined;
-            $namespace?: string | undefined;
-            definitions?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            properties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            items?: import("@formily/vue").SchemaItems<any, any, any, any, any, any, any, any> | undefined;
-            additionalItems?: import("@formily/vue").Stringify<any> | undefined;
-            patternProperties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            additionalProperties?: import("@formily/vue").Stringify<any> | undefined;
-            "x-value"?: any;
-            "x-index"?: number | undefined;
-            "x-pattern"?: any;
-            "x-display"?: any;
-            "x-validator"?: any;
-            "x-decorator"?: any;
-            "x-decorator-props"?: any;
-            "x-component"?: any;
-            "x-component-props"?: any;
-            "x-reactions"?: import("@formily/vue").SchemaReactions<any> | undefined;
-            "x-content"?: any;
-            "x-data"?: any;
-            "x-visible"?: boolean | undefined;
-            "x-hidden"?: boolean | undefined;
-            "x-disabled"?: boolean | undefined;
-            "x-editable"?: boolean | undefined;
-            "x-read-only"?: boolean | undefined;
-            "x-read-pretty"?: boolean | undefined;
-            "x-compile-omitted"?: string[] | undefined;
-        }>>>;
-        required: true;
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
     };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     title: string;
+    getProperties: () => FieldItem[];
 }>;

package/es/packages/form-render/src/components/renderer/combination.js

@@ -1,118 +1 @@
-import { defineComponent, computed, ref, createVNode, createTextVNode, toRaw } from 'vue';
-import { assignUpdateValue, formRenderLog } from '../../utils/index.js';
-import { connect, mapProps } from '@formily/vue';
-import { useDebounceFn, isObject } from '@vueuse/core';
-import { NButton } from 'naive-ui';
-import '../../FormRender.js';
-import script$1 from '../../FormRender.vue_vue_type_script_setup_true_lang.js';
-
-const script = defineComponent({
-  name: "FormCombination",
-  props: {
-    title: {
-      type: String,
-      default: ""
-    },
-    value: {
-      type: String
-    },
-    properties: {
-      type: Object,
-      required: true
-    }
-  },
-  emits: ["update:value"],
-  setup(props, {
-    emit
-  }) {
-    const _schema = computed(() => {
-      return {
-        type: "void",
-        properties: props.properties
-      };
-    });
-    const emitChange = useDebounceFn(function emitChange2() {
-      emit("update:value", JSON.stringify(_values.value));
-    }, 300);
-    const combinationRepeat = ref(1);
-    function add() {
-      combinationRepeat.value++;
-      _values.value.push({});
-      emitChange();
-    }
-    function remove(idx) {
-      combinationRepeat.value--;
-      _values.value.splice(idx, 1);
-      emitChange();
-    }
-    const _values = ref([{}]);
-    function initValues(data) {
-      if (!data)
-        return;
-      try {
-        const parsed = JSON.parse(data);
-        if (!Array.isArray(parsed))
-          throw new Error();
-        parsed.forEach((v, idx) => {
-          if (isObject(v)) {
-            _values.value[idx] = v;
-          } else {
-            _values.value[idx] = {};
-            formRenderLog(`invalid Object value ${v} in COMBINATION => ${props.title}[${idx}]`, "warn");
-          }
-        });
-        combinationRepeat.value = _values.value.length;
-      } catch (e) {
-        formRenderLog(`invalid JSON value ${data} in COMBINATION => ${props.title}`, "warn");
-      }
-    }
-    initValues(props.value);
-    function stop(event) {
-      event.stopPropagation();
-    }
-    function onChange(idx, {
-      fieldKey,
-      value
-    }) {
-      !_values.value[idx] && (_values.value[idx] = {});
-      _values.value[idx][fieldKey] = value;
-      emitChange();
-    }
-    const FormRenderComponent = script$1;
-    return () => {
-      return createVNode("section", {
-        "class": "form-render__combination"
-      }, [createVNode("header", {
-        "class": "form-render__combinationHeader"
-      }, [createVNode("div", {
-        "class": "form-render__combinationHeaderText"
-      }, [props.title]), createVNode(NButton, {
-        "onClick": add,
-        "type": "info",
-        "text": true
-      }, {
-        default: () => [" ", createTextVNode("\u65B0\u589E"), " "]
-      })]), Array.from({
-        length: combinationRepeat.value
-      }).map((_, idx) => {
-        return createVNode("section", {
-          "class": "form-render__combinationContent"
-        }, [createVNode(FormRenderComponent, {
-          "initialData": toRaw(_values.value[idx]) || {},
-          "schema": _schema.value,
-          "onUpdateValue": () => false,
-          "onInput": stop,
-          "onBlur": stop,
-          "onChange": stop,
-          "onFormChange": (payload) => onChange(idx, payload)
-        }, null), idx !== 0 ? createVNode("i", {
-          "class": "form-render__combinationClose",
-          "onClick": () => remove(idx)
-        }, ["-"]) : null]);
-      })]);
-    };
-  }
-});
-const COMBINATION = connect(script, mapProps(assignUpdateValue));
-
-export { COMBINATION };
+export { COMBINATION } from './combination2.js';

package/es/packages/form-render/src/components/renderer/combination2.js

@@ -0,0 +1,112 @@
+import { defineComponent, ref, createVNode, createTextVNode, toRaw } from 'vue';
+import { assignUpdateValue, formRenderLog } from '../../utils/index2.js';
+import { connect, mapProps } from '@formily/vue';
+import { useDebounceFn, isObject } from '@vueuse/core';
+import { NButton } from 'naive-ui';
+import '../../FormRender2.js';
+import script$1 from '../../FormRender.vue_vue_type_script_setup_true_lang.js';
+
+const script = defineComponent({
+  name: "FormCombination",
+  props: {
+    title: {
+      type: String,
+      default: ""
+    },
+    value: {
+      type: String
+    },
+    getProperties: {
+      type: Function,
+      default: () => []
+    }
+  },
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const emitChange = useDebounceFn(function emitChange2() {
+      emit("update:value", JSON.stringify(_values.value));
+    }, 300);
+    const combinationRepeat = ref(1);
+    function add() {
+      combinationRepeat.value++;
+      _values.value.push({});
+      emitChange();
+    }
+    function remove(idx) {
+      combinationRepeat.value--;
+      _values.value.splice(idx, 1);
+      emitChange();
+    }
+    const _values = ref([{}]);
+    function initValues(data) {
+      if (!data)
+        return;
+      try {
+        const parsed = JSON.parse(data);
+        if (!Array.isArray(parsed))
+          throw new Error();
+        parsed.forEach((v, idx) => {
+          if (isObject(v)) {
+            _values.value[idx] = v;
+          } else {
+            _values.value[idx] = {};
+            formRenderLog(`invalid Object value ${v} in COMBINATION => ${props.title}[${idx}]`, "warn");
+          }
+        });
+        combinationRepeat.value = _values.value.length;
+      } catch (e) {
+        formRenderLog(`invalid JSON value ${data} in COMBINATION => ${props.title}`, "warn");
+      }
+    }
+    initValues(props.value);
+    function stop(event) {
+      event.stopPropagation();
+    }
+    function onChange(idx, {
+      fieldKey,
+      value
+    }) {
+      !_values.value[idx] && (_values.value[idx] = {});
+      _values.value[idx][fieldKey] = value;
+      emitChange();
+    }
+    const FormRenderComponent = script$1;
+    return () => {
+      return createVNode("section", {
+        "class": "form-render__combination"
+      }, [createVNode("header", {
+        "class": "form-render__combinationHeader"
+      }, [createVNode("div", {
+        "class": "form-render__combinationHeaderText"
+      }, [props.title]), createVNode(NButton, {
+        "onClick": add,
+        "type": "info",
+        "text": true
+      }, {
+        default: () => [createTextVNode("\u65B0\u589E")]
+      })]), Array.from({
+        length: combinationRepeat.value
+      }).map((_, idx) => {
+        return createVNode("section", {
+          "class": "form-render__combinationContent"
+        }, [createVNode(FormRenderComponent, {
+          "initialData": toRaw(_values.value[idx]) || {},
+          "fieldList": props.getProperties(),
+          "onUpdateValue": () => false,
+          "onInput": stop,
+          "onBlur": stop,
+          "onChange": stop,
+          "onFormChange": (payload) => onChange(idx, payload)
+        }, null), idx !== 0 ? createVNode("i", {
+          "class": "form-render__combinationClose",
+          "onClick": () => remove(idx)
+        }, ["-"]) : null]);
+      })]);
+    };
+  }
+});
+const COMBINATION = connect(script, mapProps(assignUpdateValue));
+
+export { COMBINATION };

package/es/packages/form-render/src/components/renderer/complex.js

@@ -1,39 +1 @@
-import { defineComponent, createVNode } from 'vue';
-import { connect, mapProps } from '@formily/vue';
-import { assignUpdateValue } from '../../utils/index.js';
-
-const script = defineComponent({
-  props: {
-    span: {
-      type: Number,
-      default: 6
-    },
-    display: {
-      type: String,
-      default: "grid"
-    },
-    wrapperStyle: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  setup(props, {
-    slots
-  }) {
-    function onChange(e) {
-      e.stopPropagation();
-    }
-    return () => {
-      return createVNode("section", {
-        "class": "form-render__complex"
-      }, [createVNode("section", {
-        "class": `form-render__complexContent--${props.display}`,
-        "style": props.wrapperStyle,
-        "onChange": onChange
-      }, [slots.default && slots.default()])]);
-    };
-  }
-});
-const COMPLEX = connect(script, mapProps(assignUpdateValue));
-
-export { COMPLEX };
+export { COMPLEX } from './complex2.js';

package/es/packages/form-render/src/components/renderer/complex2.js

@@ -0,0 +1,39 @@
+import { defineComponent, createVNode } from 'vue';
+import { connect, mapProps } from '@formily/vue';
+import { assignUpdateValue } from '../../utils/index2.js';
+
+const script = defineComponent({
+  props: {
+    span: {
+      type: Number,
+      default: 6
+    },
+    display: {
+      type: String,
+      default: "grid"
+    },
+    wrapperStyle: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  setup(props, {
+    slots
+  }) {
+    function onChange(e) {
+      e.stopPropagation();
+    }
+    return () => {
+      return createVNode("section", {
+        "class": "form-render__complex"
+      }, [createVNode("section", {
+        "class": `form-render__complexContent--${props.display}`,
+        "style": props.wrapperStyle,
+        "onChange": onChange
+      }, [slots.default && slots.default()])]);
+    };
+  }
+});
+const COMPLEX = connect(script, mapProps(assignUpdateValue));
+
+export { COMPLEX };

package/es/packages/form-render/src/components/renderer/date.js

@@ -1,51 +1 @@
-import { defineComponent, createVNode } from 'vue';
-import { isField } from '@formily/core';
-import { connect, mapProps } from '@formily/vue';
-import { isObject } from '@vueuse/core';
-import { NDatePicker } from 'naive-ui';
-
-const script = defineComponent({
-  props: {
-    onChange: {},
-    value: {}
-  },
-  setup(_) {
-    return () => {
-      return createVNode(NDatePicker, null, null);
-    };
-  }
-});
-const DATE = connect(script, mapProps((props, field) => {
-  const _props = {
-    ...props
-  };
-  if (isField(field)) {
-    Object.assign(_props, {
-      "formatted-value": field.value,
-      "onUpdate:formatted-value"(v) {
-        field.setValue(v);
-      }
-    });
-    if (isObject(props.validate)) {
-      const {
-        min_date,
-        max_date
-      } = props.validate;
-      if (min_date || max_date) {
-        _props.isDateDisabled = (time) => {
-          let disabled = false;
-          if (min_date === "currTime") {
-            disabled = time < Date.now();
-          }
-          if (max_date === "currTime") {
-            disabled = time > Date.now();
-          }
-          return disabled;
-        };
-      }
-    }
-  }
-  return _props;
-}));
-
-export { DATE };
+export { DATE } from './date2.js';

package/es/packages/form-render/src/components/renderer/date2.js

@@ -0,0 +1,51 @@
+import { defineComponent, createVNode } from 'vue';
+import { isField } from '@formily/core';
+import { connect, mapProps } from '@formily/vue';
+import { isObject } from '@vueuse/core';
+import { NDatePicker } from 'naive-ui';
+
+const script = defineComponent({
+  props: {
+    onChange: {},
+    value: {}
+  },
+  setup(_) {
+    return () => {
+      return createVNode(NDatePicker, null, null);
+    };
+  }
+});
+const DATE = connect(script, mapProps((props, field) => {
+  const _props = {
+    ...props
+  };
+  if (isField(field)) {
+    Object.assign(_props, {
+      "formatted-value": field.value,
+      "onUpdate:formatted-value"(v) {
+        field.setValue(v);
+      }
+    });
+    if (isObject(props.validate)) {
+      const {
+        min_date,
+        max_date
+      } = props.validate;
+      if (min_date || max_date) {
+        _props.isDateDisabled = (time) => {
+          let disabled = false;
+          if (min_date === "currTime") {
+            disabled = time < Date.now();
+          }
+          if (max_date === "currTime") {
+            disabled = time > Date.now();
+          }
+          return disabled;
+        };
+      }
+    }
+  }
+  return _props;
+}));
+
+export { DATE };

package/es/packages/form-render/src/components/renderer/formItem.d.ts

@@ -157,11 +157,9 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
     labelElementRef: import("vue").Ref<HTMLLabelElement | null>;
     mergedClsPrefix: import("vue").ComputedRef<string>;
     mergedRequired: import("vue").ComputedRef<boolean>;
+    hasFeedback: import("vue").ComputedRef<number | true>;
     feedbackId: import("vue").Ref<string>;
-    renderExplains: import("vue").Ref<{
-        key: string;
-        render: () => import("vue").VNodeChild;
-    }[]>;
+    explains: import("vue").Ref<string[]>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly label: StringConstructor;
     readonly labelWidth: import("vue").PropType<string | number>;
@@ -285,10 +283,10 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
         labelTextAlignHorizontal: string;
     }, any>>>;
 }>>, {
-    readonly required: boolean;
-    readonly first: boolean;
-    readonly showRequireMark: boolean | undefined;
-    readonly showFeedback: boolean | undefined;
-    readonly showLabel: boolean | undefined;
-    readonly ignorePathChange: boolean;
+    required: boolean;
+    first: boolean;
+    showRequireMark: boolean | undefined;
+    showFeedback: boolean | undefined;
+    showLabel: boolean | undefined;
+    ignorePathChange: boolean;
 }>;

package/es/packages/form-render/src/components/renderer/formItem.js

@@ -1,22 +1 @@
-import { isVoidField } from '@formily/core';
-import { connect, mapProps } from '@formily/vue';
-import { NFormItem } from 'naive-ui';
-
-const FORM_ITEM = connect(NFormItem, mapProps({
-  title: "label"
-}, (props, field) => {
-  var _a;
-  const feedback = !isVoidField(field) ? field.selfErrors.length ? field.selfErrors.join(",") : void 0 : void 0;
-  return {
-    ...props,
-    required: field.required,
-    class: "form-render__formItem",
-    style: {
-      "--form-item-column": (_a = props.span) != null ? _a : 3
-    },
-    feedback,
-    "validation-status": feedback ? "error" : void 0
-  };
-}));
-
-export { FORM_ITEM };
+export { FORM_ITEM } from './formItem2.js';

package/es/packages/form-render/src/components/renderer/formItem2.js

@@ -0,0 +1,22 @@
+import { isVoidField } from '@formily/core';
+import { connect, mapProps } from '@formily/vue';
+import { NFormItem } from 'naive-ui';
+
+const FORM_ITEM = connect(NFormItem, mapProps({
+  title: "label"
+}, (props, field) => {
+  var _a;
+  const feedback = !isVoidField(field) ? field.selfErrors.length ? field.selfErrors.join(",") : void 0 : void 0;
+  return {
+    ...props,
+    required: field.required,
+    class: "form-render__formItem",
+    style: {
+      "--form-item-column": (_a = props.span) != null ? _a : 3
+    },
+    feedback,
+    "validation-status": feedback ? "error" : void 0
+  };
+}));
+
+export { FORM_ITEM };

package/es/packages/form-render/src/components/renderer/index.js

@@ -1,16 +1,16 @@
-export { INPUT } from './input.js';
-export { SELECT } from './select.js';
-export { FORM_ITEM } from './formItem.js';
-export { TEXTAREA } from './textarea.js';
-export { INPUT_NUMBER } from './inputNumber.js';
-export { LINEBAR } from './linebar.js';
-export { INPUT_GROUP } from './inputGroup.js';
-export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
-export { COMBINATION } from './combination.js';
-export { CHECKBOX } from './checkbox.js';
-export { SWITCH } from './switch.js';
-export { RADIO } from './radio.js';
-export { LABEL } from './labelSelect.js';
-export { SLIDER } from './slider.js';
-export { COMPLEX } from './complex.js';
+export { INPUT } from './input2.js';
+export { SELECT } from './select2.js';
+export { FORM_ITEM } from './formItem2.js';
+export { TEXTAREA } from './textarea2.js';
+export { INPUT_NUMBER } from './inputNumber2.js';
+export { LINEBAR } from './linebar2.js';
+export { INPUT_GROUP } from './inputGroup2.js';
+export { DATE } from './date2.js';
+export { SEARCH_CASCADE } from './cascader2.js';
+export { COMBINATION } from './combination2.js';
+export { CHECKBOX } from './checkbox2.js';
+export { SWITCH } from './switch2.js';
+export { RADIO } from './radio2.js';
+export { LABEL } from './labelSelect2.js';
+export { SLIDER } from './slider2.js';
+export { COMPLEX } from './complex2.js';