cnhis-design-vue 3.1.14-beta.12 → 3.1.14-beta.15

package/es/packages/form-render/index.js

@@ -1,7 +1,6 @@
 import { COMPONENT_NAMESPACE } from '../../src/global/variable';
 import { safeComponentRegister } from '../../src/utils';
-import './src/FormRender.js';
-import script from './src/FormRender.vue_vue_type_script_setup_true_lang.js';
+import FormRender$1 from './src/FormRender.js';
 export { useFieldListAdaptor } from './src/hooks/useFieldListAdaptor.js';
 export { useFormRequest } from './src/hooks/useFormRequest.js';
 export { useCommonLog } from './src/hooks/useCommonLog.js';
@@ -17,7 +16,7 @@ export { useInitialData } from './src/hooks/useInitialData.js';
 export { useAnchor } from './src/hooks/useAnchor.js';
 export { useFormContext } from './src/hooks/useFormContext.js';
 
-const FormRender = script;
+const FormRender = FormRender$1;
 FormRender.install = function(app) {
   safeComponentRegister(app, FormRender, COMPONENT_NAMESPACE + "FormRender");
 };

package/es/packages/form-render/src/FormRender.js

@@ -1,4 +1,189 @@
-import script from './FormRender.vue_vue_type_script_setup_true_lang.js';
-export { default } from './FormRender.vue_vue_type_script_setup_true_lang.js';
+import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
+import { createForm, onFieldValueChange, isField } from '@formily/core';
+import { FormProvider, FormConsumer } from '@formily/vue';
+import { cloneDeep } from 'lodash-es';
+import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
+import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
+import { queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
+import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
+import { useFormContext } from './hooks/useFormContext.js';
+import { useInitialData } from './hooks/useInitialData.js';
+import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
+import { useFieldVisitor } from './hooks/useFieldVisitor.js';
+import { useAnchor } from './hooks/useAnchor.js';
 
-script.__file = "packages/form-render/src/FormRender.vue";
+const _hoisted_1 = {
+  key: 0,
+  style: { "height": "50px" }
+};
+const _hoisted_2 = { style: { "white-space": "pre" } };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "FormRender",
+  props: {
+    fieldList: { type: Array },
+    initialData: { type: Object, default: () => ({}) },
+    fieldVisitor: { type: Object },
+    column: { type: Number, default: 12 },
+    maxHeight: { type: [Number, String], default: "" },
+    anchor: { type: Boolean, default: false },
+    parallelism: { type: Number, default: 3 },
+    schema: { type: Object },
+    components: {
+      type: Object,
+      default: () => ({})
+    },
+    businessFilter: { type: Function },
+    scope: { type: Object, default: () => ({}) },
+    annotation: { type: Object },
+    consumer: { type: Boolean, default: false },
+    uuid: { type: String }
+  },
+  emits: [
+    "formChange"
+  ],
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const { nuiThemeOverrides } = useNuiThemeOverrides();
+    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props);
+    const formModel = createForm({
+      initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
+      effects() {
+        onFieldValueChange("*", (field) => {
+          const fieldKey = field.props.name.toString();
+          emit("formChange", {
+            fieldInstance: field,
+            fieldKey,
+            fieldName: field.title,
+            value: field.value,
+            context: changeContextCollector.getContext(fieldKey)
+          });
+          businessCollector.trigger(formModel, fieldKey, field.value);
+          formItemDepsCollector.trigger(fieldKey);
+        });
+      }
+    });
+    const { schemaAdaptor } = useFieldListAdaptor(businessCollector, formUUID);
+    const parsedSchema = computed(() => {
+      if (props.schema) {
+        return props.schema;
+      }
+      if (props.fieldList) {
+        const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
+        return { type: "object", properties: schemaAdaptor(_fieldList) };
+      }
+      return { type: "object", properties: {} };
+    });
+    const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, scrollTo, onScroll } = useAnchor(props, formItemDepsCollector);
+    watch(parsedSchema, generateAnchorList, { immediate: true });
+    async function queryWidget(key, wrapperElement, fieldList) {
+      if (!scrollbarRef.value)
+        return createResult();
+      const decoratorElement = queryDecorator(key, wrapperElement, formUUID);
+      if (decoratorElement)
+        return createResult(decoratorElement);
+      const parentLinebarKey = getParentLinebar(key, fieldList);
+      if (!parentLinebarKey)
+        return createResult();
+      formItemDepsCollector.trigger(FormItemLineBarDepKeyPrepend + parentLinebarKey, true);
+      await nextTick();
+      return createResult(queryDecorator(key, wrapperElement, formUUID));
+      function createResult(decoratorElement2) {
+        return { decoratorElement: decoratorElement2, ...queryInput(decoratorElement2) };
+      }
+    }
+    expose({
+      validate(path = "*") {
+        return formModel.validate(path).catch((err) => {
+          return Promise.reject(Array.isArray(err) ? err.map(bindInfo) : err);
+        });
+        function bindInfo(info) {
+          info.title = formModel.query(info.path).get("title");
+          info.decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
+          Object.assign(info, queryInput(info.decoratorElement));
+          return info;
+        }
+      },
+      getFormValues() {
+        return formModel.getFormState().values;
+      },
+      setFieldState(path, handler) {
+        formModel.setFieldState(path, handler);
+      },
+      resetFields(path = "*") {
+        formModel.setFieldState(path, async (field) => {
+          var _a;
+          if (isField(field)) {
+            field.modified = false;
+            field.visited = false;
+            field.feedbacks = [];
+            field.selfModified = false;
+            field.caches = {};
+            field.value = (_a = field.initialValue) != null ? _a : null;
+          }
+        });
+      },
+      async queryWidget(key) {
+        return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, props.fieldList || []) : null;
+      }
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(NForm), {
+        class: "form-render",
+        "require-mark-placement": "left"
+      }, {
+        default: withCtx(() => [
+          __props.anchor ? (openBlock(), createElementBlock("section", _hoisted_1, [
+            createVNode(unref(NTabs), {
+              value: unref(currentAnchor),
+              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => isRef(currentAnchor) ? currentAnchor.value = $event : null),
+              type: "line"
+            }, {
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(anchorIdList), (anchor) => {
+                  return openBlock(), createBlock(unref(NTabPane), {
+                    name: anchor.name,
+                    tab: anchor.title,
+                    key: anchor.name
+                  }, null, 8, ["name", "tab"]);
+                }), 128))
+              ]),
+              _: 1
+            }, 8, ["value"])
+          ])) : createCommentVNode("v-if", true),
+          createVNode(unref(NConfigProvider), { "theme-overrides": unref(nuiThemeOverrides) }, {
+            default: withCtx(() => [
+              createElementVNode("section", {
+                class: "form-render__wrapper",
+                style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
+                ref_key: "scrollbarRef",
+                ref: scrollbarRef,
+                onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args))
+              }, [
+                createVNode(unref(FormProvider), { form: unref(formModel) }, {
+                  default: withCtx(() => [
+                    renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
+                      createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
+                    ]),
+                    __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
+                      default: withCtx(({ form }) => [
+                        createElementVNode("div", _hoisted_2, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+                      ]),
+                      _: 1
+                    })) : createCommentVNode("v-if", true)
+                  ]),
+                  _: 3
+                }, 8, ["form"])
+              ], 36)
+            ]),
+            _: 3
+          }, 8, ["theme-overrides"])
+        ]),
+        _: 3
+      });
+    };
+  }
+});
+var FormRender = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "FormRender.vue"]]);
+
+export { FormRender as default };

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

@@ -8,6 +8,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];
@@ -20,6 +23,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];

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

@@ -1,10 +1,12 @@
-import { defineComponent, ref, createVNode, createTextVNode, toRaw } from 'vue';
+import { defineComponent, ref, computed, watch, onMounted, createVNode, createTextVNode } from 'vue';
+import { isField } from '@formily/core';
+import { Path } from '../../../../../node_modules/@formily/path/esm/index.js';
+import { isNumber } from 'lodash-es';
 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';
+import FormRender from '../../FormRender.js';
 
 const script = defineComponent({
   name: "FormCombination",
@@ -16,6 +18,9 @@ const script = defineComponent({
     value: {
       type: String
     },
+    maxGroupNum: {
+      type: Number
+    },
     getProperties: {
       type: Function,
       default: () => []
@@ -28,14 +33,31 @@ const script = defineComponent({
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(_values.value));
     }, 300);
-    const combinationRepeat = ref(1);
+    const formRenderRefs = ref([]);
+    const groupNum = ref(1);
+    const maxGroupNum = computed(() => {
+      if (!isNumber(props.maxGroupNum))
+        return Infinity;
+      if (props.maxGroupNum < 1)
+        return 0;
+      return ~~props.maxGroupNum;
+    });
+    watch(maxGroupNum, (value) => {
+      if (groupNum.value <= value)
+        return;
+      groupNum.value = value;
+      _values.value.splice(groupNum.value);
+      emitChange();
+    }, {
+      immediate: true
+    });
     function add() {
-      combinationRepeat.value++;
+      groupNum.value++;
       _values.value.push({});
       emitChange();
     }
     function remove(idx) {
-      combinationRepeat.value--;
+      groupNum.value--;
       _values.value.splice(idx, 1);
       emitChange();
     }
@@ -48,19 +70,32 @@ const script = defineComponent({
         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");
-          }
+          if (idx > maxGroupNum.value - 1)
+            return;
+          if (isObject(v))
+            return _values.value[idx] = v;
+          _values.value[idx] = {};
+          formRenderLog(`invalid Object value ${v} in COMBINATION => ${props.title}[${idx}]`, "warn");
         });
-        combinationRepeat.value = _values.value.length;
+        groupNum.value = Math.min(_values.value.length, maxGroupNum.value);
       } catch (e) {
         formRenderLog(`invalid JSON value ${data} in COMBINATION => ${props.title}`, "warn");
+      } finally {
+        setFormValueByInitValue();
+      }
+      function setFormValueByInitValue() {
+        _values.value.forEach((item, idx) => {
+          var _a;
+          (_a = formRenderRefs.value[idx]) == null ? void 0 : _a.setFieldState("*", (state) => {
+            if (!isField(state))
+              return;
+            state.value = Path.getIn(item, state.path);
+          });
+        });
       }
     }
-    initValues(props.value);
+    watch(() => props.value, (value) => initValues(value));
+    onMounted(() => initValues(props.value));
     function stop(event) {
       event.stopPropagation();
     }
@@ -69,10 +104,10 @@ const script = defineComponent({
       value
     }) {
       !_values.value[idx] && (_values.value[idx] = {});
-      _values.value[idx][fieldKey] = value;
+      Path.setIn(_values.value[idx], fieldKey, value);
       emitChange();
     }
-    const FormRenderComponent = script$1;
+    const FormRenderComponent = FormRender;
     return () => {
       return createVNode("section", {
         "class": "form-render__combination"
@@ -83,16 +118,17 @@ const script = defineComponent({
       }, [props.title]), createVNode(NButton, {
         "onClick": add,
         "type": "info",
-        "text": true
+        "text": true,
+        "disabled": groupNum.value >= maxGroupNum.value
       }, {
         default: () => [createTextVNode("\u65B0\u589E")]
       })]), Array.from({
-        length: combinationRepeat.value
+        length: groupNum.value
       }).map((_, idx) => {
         return createVNode("section", {
           "class": "form-render__combinationContent"
         }, [createVNode(FormRenderComponent, {
-          "initialData": toRaw(_values.value[idx]) || {},
+          "ref": (_ref) => formRenderRefs.value[idx] = _ref,
           "fieldList": props.getProperties(),
           "onUpdateValue": () => false,
           "onInput": stop,

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, inject, computed, nextTick, createVNode } from 'vue';
+import { defineComponent, ref, inject, computed, watch, nextTick, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual, cloneDeep } from 'lodash-es';
 import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../../constants/index.js';
@@ -31,7 +31,6 @@ const script = defineComponent({
     emit
   }) {
     const remoteOptions = ref(null);
-    watch(remoteOptions, (o) => console.log("remoteOption", o));
     const lastSearch = ref("");
     const asyncQueue = inject(InjectAsyncQueue);
     const {

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

@@ -3,6 +3,7 @@ export declare const TEXT: {
     props: {
         content: {};
         fieldItem: {};
+        value: {};
     };
 };
 export declare const BUTTON: {

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

@@ -11,12 +11,13 @@ function createPropFor(props) {
   };
 }
 const textScript = (props) => {
-  var _a, _b;
-  return createVNode("div", null, [(_b = (_a = createSlot(props.content, props)).default) == null ? void 0 : _b.call(_a)]);
+  var _a, _b, _c;
+  return createVNode("div", null, [(_c = (_b = createSlot((_a = props.content) != null ? _a : props.value, props)).default) == null ? void 0 : _c.call(_b)]);
 };
 textScript.props = {
   content: {},
-  fieldItem: {}
+  fieldItem: {},
+  value: {}
 };
 const TEXT = connect(textScript, mapProps((props) => {
   var _a;

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -98,6 +98,7 @@ function useFieldListAdaptor(collector, uuid) {
     schema["x-decorator-props"].showLabel = false;
     Object.assign(schema["x-component-props"], {
       title: item.alias || item.name,
+      maxGroupNum: item.maxGroupNum,
       getProperties: () => item.children || []
     });
     return schema;

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -72,6 +72,7 @@ export declare type FieldItem = {
     suffixConfig: FieldItem[] | FieldItem;
     fieldType: 'string' | 'object' | 'array' | 'number' | 'void' | 'boolean' | 'datetime';
     content: string | FormRenderer | Record<string, FormRenderer>;
+    maxGroupNum: number;
     properties: FieldItem[];
     children: FieldItem[];
     componentProps: AnyObject;

package/es/packages/form-table/index.js

@@ -1,7 +1,6 @@
 import { COMPONENT_NAMESPACE } from '../../src/global/variable';
 import { safeComponentRegister } from '../../src/utils';
-import './src/FormTable.js';
-import script from './src/FormTable.vue_vue_type_script_setup_true_lang.js';
+import script from './src/FormTable.js';
 
 const FormTable = script;
 FormTable.install = function(app) {