cnhis-design-vue 3.4.0-release.3 → 3.4.0-release.7

package/es/components/form-config/src/components/FormConfigEdit.vue2.js

@@ -1,11 +1,11 @@
 import { i18n } from '../../../../_virtual/_virtual_i18n-methods.js';
-import { defineComponent, computed, ref, inject, watch, toRaw, openBlock, createElementBlock, Fragment, createVNode, unref, mergeProps, withCtx, createElementVNode, renderList, toDisplayString, h } from 'vue';
+import { defineComponent, computed, ref, inject, watch, toRaw, h, openBlock, createElementBlock, Fragment, createVNode, unref, mergeProps, withCtx, createElementVNode, renderList, toDisplayString } from 'vue';
 import { cloneDeep, set, isEmpty, isArray } from 'lodash-es';
 import { InjectionActiveFieldItem, EditAbleField } from '../constants/index.js';
 import '../../../../shared/components/VueDraggable/src/vuedraggable.js';
 import { findFieldItemByKey } from '../utils/index.js';
 import '@vicons/ionicons5';
-import { NModal, NInput, NButton } from 'naive-ui';
+import { NColorPicker, NModal, NInput, NButton } from 'naive-ui';
 import '../../../../shared/utils/index.js';
 import { useConfigurationField } from '../hooks/useConfigurationField.js';
 import '../../../index.js';
@@ -39,6 +39,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, {
     expose: __expose
   }) {
+    var _a;
     const props = __props;
     const wrapperSelector = computed(() => `#${props.uuid} .form-config__config`);
     const formRenderRef = ref();
@@ -49,7 +50,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       generateFieldListByFormConfigItem
     } = useConfigurationField();
     watch(currentActiveField, async (formConfigItem, oldFormConfigItem) => {
-      var _a, _b;
+      var _a2, _b;
       if (!formConfigItem)
         return fieldList.value = [];
       initialData.value = {
@@ -57,7 +58,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         show: true,
         ...cloneDeep(toRaw(formConfigItem))
       };
-      const fieldItemList = (_a = props.bindFormRenderRef) == null ? void 0 : _a.getFieldList();
+      const fieldItemList = (_a2 = props.bindFormRenderRef) == null ? void 0 : _a2.getFieldList();
       fieldList.value = generateFieldListByFormConfigItem(formConfigItem, findFieldItemByKey(fieldItemList, formConfigItem.key));
       (_b = formRenderRef.value) == null ? void 0 : _b.reload();
     }, {
@@ -86,10 +87,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           text: true,
           type: "primary",
           onClick() {
-            var _a;
+            var _a2;
             showOptionModal.value = true;
             editOptions.value = cloneDeep(originOptions);
-            if (isEmpty((_a = currentActiveField.value) == null ? void 0 : _a.optionAliasList))
+            if (isEmpty((_a2 = currentActiveField.value) == null ? void 0 : _a2.optionAliasList))
               return;
             editOptions.value.forEach((option) => {
               const target = currentActiveField.value.optionAliasList.find((item) => item.value === option.value);
@@ -104,8 +105,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function applyOptionAlias(options) {
       return isArray(options) ? options.map((option) => {
-        var _a;
-        const target = (_a = currentActiveField.value.optionAliasList) == null ? void 0 : _a.find((item) => {
+        var _a2;
+        const target = (_a2 = currentActiveField.value.optionAliasList) == null ? void 0 : _a2.find((item) => {
           return item.value === option.value;
         });
         return target ? {
@@ -115,17 +116,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }) : options;
     }
     const visitor = {
-      "*"({
-        field
-      }) {
-        if (field.val_key !== EditAbleField.DEFAULT_VALUE)
-          return;
-        const originOption = field.option;
-        field.option = applyOptionAlias(field.option);
-        field.decoratorProps = {
-          labelRender: createLabelRender(originOption)
-        };
-      }
+      "*"(payload) {
+        var _a2, _b, _c;
+        const {
+          field
+        } = payload;
+        if (field.val_key === EditAbleField.DEFAULT_VALUE) {
+          const originOption = field.option;
+          field.option = applyOptionAlias(field.option);
+          field.decoratorProps = {
+            labelRender: createLabelRender(originOption)
+          };
+        }
+        (_c = (_b = (_a2 = props.formProps) == null ? void 0 : _a2.fieldVisitor) == null ? void 0 : _b["*"]) == null ? void 0 : _c.call(_b, payload);
+      },
+      ...((_a = props.formProps) == null ? void 0 : _a.fieldVisitor) || {}
     };
     const showOptionModal = ref(false);
     const editOptions = ref([]);
@@ -134,7 +139,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       editOptions.value = [];
     }
     function onOptionModalConfirm() {
-      var _a;
+      var _a2;
       showOptionModal.value = false;
       currentActiveField.value.optionAliasList = editOptions.value.reduce((res, option) => {
         if (option.alias)
@@ -150,12 +155,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         show: true,
         ...cloneDeep(toRaw(currentActiveField.value))
       };
-      (_a = formRenderRef.value) == null ? void 0 : _a.reload();
+      (_a2 = formRenderRef.value) == null ? void 0 : _a2.reload();
     }
     __expose({
       validate() {
-        var _a;
-        return (_a = formRenderRef.value) == null ? void 0 : _a.validate();
+        var _a2;
+        return (_a2 = formRenderRef.value) == null ? void 0 : _a2.validate();
+      }
+    });
+    const ColorPicker = defineComponent({
+      props: {
+        value: {
+          type: String,
+          required: true
+        },
+        onChange: {}
+      },
+      setup(props2) {
+        return () => h(NColorPicker, {
+          modes: ["hex"],
+          value: props2.value,
+          onUpdateValue: props2.onChange
+        });
       }
     });
     return (_ctx, _cache) => {
@@ -165,11 +186,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         column: 12,
         ref_key: "formRenderRef",
         ref: formRenderRef,
+        components: {
+          COLOR_PICKER: unref(ColorPicker)
+        },
         onFormChange,
         "field-visitor": visitor,
         "field-list": fieldList.value,
         "initial-data": initialData.value
-      }), null, 16, ["field-list", "initial-data"]), createVNode(unref(NModal), {
+      }), null, 16, ["components", "field-list", "initial-data"]), createVNode(unref(NModal), {
         show: showOptionModal.value,
         "onUpdate:show": _cache[0] || (_cache[0] = ($event) => showOptionModal.value = $event),
         preset: "dialog",

package/es/components/form-config/src/components/FormConfigEventSetting.vue.d.ts

@@ -864,6 +864,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
                 enterToNextWidget: boolean | ((fieldItem: import("../../../../components/form-render").FieldItem) => boolean | void);
                 autoExpand: boolean;
                 lowCodeReactions: LowCodeTypes.reactionConfig[];
+                newLowCodeReactions: LowCodeTypes.newReactionConfig[];
                 linebarAutoHidden: boolean;
                 labelPlacementOverwrite: boolean;
                 bordered: string | boolean;

package/es/components/form-config/src/constants/index.d.ts

@@ -17,9 +17,11 @@ export declare enum EditAbleField {
     SHOW = "show",
     ROWS = "initialHigh",
     TITLE_RED = "fieldTitleRed",
+    LABEL_COLOR = "labelColor",
     CONFIRM = "confirmBeforeValueChange",
     ALLOW_PARTIAL = "elementExtraSetting.allowPartial",
     PARTIAL_LEVEL = "elementExtraSetting.partialLevel",
+    MAX_LEVEL = "elementExtraSetting.maxLevel",
     DATE_FORMAT = "elementExtraSetting.dateFormat",
     DATE_DEFAULT_VALUE_CONDITION = "elementExtraSetting.defaultValue.condition",
     DATE_DEFAULT_VALUE_UNIT = "elementExtraSetting.defaultValue.unit",

package/es/components/form-config/src/constants/index.js

@@ -20,9 +20,11 @@ var EditAbleField = /* @__PURE__ */ ((EditAbleField2) => {
   EditAbleField2["SHOW"] = "show";
   EditAbleField2["ROWS"] = "initialHigh";
   EditAbleField2["TITLE_RED"] = "fieldTitleRed";
+  EditAbleField2["LABEL_COLOR"] = "labelColor";
   EditAbleField2["CONFIRM"] = "confirmBeforeValueChange";
   EditAbleField2["ALLOW_PARTIAL"] = "elementExtraSetting.allowPartial";
   EditAbleField2["PARTIAL_LEVEL"] = "elementExtraSetting.partialLevel";
+  EditAbleField2["MAX_LEVEL"] = "elementExtraSetting.maxLevel";
   EditAbleField2["DATE_FORMAT"] = "elementExtraSetting.dateFormat";
   EditAbleField2["DATE_DEFAULT_VALUE_CONDITION"] = "elementExtraSetting.defaultValue.condition";
   EditAbleField2["DATE_DEFAULT_VALUE_UNIT"] = "elementExtraSetting.defaultValue.unit";

package/es/components/form-config/src/hooks/useConfigurationField.js

@@ -116,7 +116,14 @@ function useConfigurationField() {
     alias: "\u6807\u9898\u663E\u793A\u7EA2\u8272",
     elem_width: 6,
     default_val: false,
+    remark: "\u8BE5\u5B57\u6BB5\u8BBE\u7F6E\u4E3A\u5FC5\u586B\u65F6\u624D\u751F\u6548\uFF0C\u4F18\u5148\u5C55\u793A",
     html_type: "SWITCH"
+  })], [EditAbleField.LABEL_COLOR, () => ({
+    alias: "\u6807\u7B7E\u989C\u8272",
+    remark: "\u6807\u9898\u5FC5\u586B\u7EA2\u8272\u5F00\u542F\u65F6\uFF0C\u8BE5\u914D\u7F6E\u4E0D\u751F\u6548",
+    elem_width: 6,
+    default_val: "",
+    html_type: "COLOR_PICKER"
   })], [EditAbleField.ALLOW_PARTIAL, () => ({
     alias: "\u5141\u8BB8\u9009\u62E9\u4E2D\u95F4\u5C42\u7EA7",
     elem_width: 6,
@@ -134,7 +141,17 @@ function useConfigurationField() {
         }))
       }
     };
-  }], [EditAbleField.DATE_FORMAT, () => ({
+  }], [EditAbleField.MAX_LEVEL, () => ({
+    alias: "\u6700\u5927\u9009\u62E9\u5C42\u7EA7",
+    elem_width: 6,
+    html_type: "SELECT",
+    componentProps: {
+      options: range(1, 11).map((item) => ({
+        text: item + "",
+        value: item
+      }))
+    }
+  })], [EditAbleField.DATE_FORMAT, () => ({
     alias: i18n("10010.1.541", "\u65E5\u671F\u683C\u5F0F"),
     elem_width: 6,
     html_type: "SELECT",
@@ -169,7 +186,7 @@ function useConfigurationField() {
     });
   }
   const htmlMap = new Map([["LINE_BAR", [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.NOTES, EditAbleField.DEFAULT_EXPAND, EditAbleField.FOLD]], ["NEWLINE", [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS]], ...["COMPLEX", "COMBINATION"].map((key) => [key, [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.LAYOUT_WIDTH_ENUM]])]);
-  const defaultItems = [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.DEFAULT_VALUE, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.DESC, EditAbleField.NOTES, EditAbleField.EDITABLE, EditAbleField.CONFIRM, EditAbleField.REQUIRED, EditAbleField.SHOW, EditAbleField.TITLE_RED];
+  const defaultItems = [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.DEFAULT_VALUE, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.DESC, EditAbleField.NOTES, EditAbleField.EDITABLE, EditAbleField.CONFIRM, EditAbleField.REQUIRED, EditAbleField.SHOW, EditAbleField.TITLE_RED, EditAbleField.LABEL_COLOR];
   function generateFieldListByFormConfigItem(formConfigItem, fieldItem) {
     var _a, _b, _c, _d, _e;
     const keys = [...htmlMap.get(formConfigItem.type) || defaultItems];
@@ -177,7 +194,7 @@ function useConfigurationField() {
       keys.splice(3, 0, EditAbleField.ROWS);
     }
     if (["SEARCH_CASCADE", "LEVEL_SEARCH_CASCADE", "LEVEL_SEARCH_CASCADE2"].includes(fieldItem ? fieldItem.html_type : (_c = (_b = formConfigItem.originalSetting) == null ? void 0 : _b.html_type) != null ? _c : "")) {
-      keys.splice(9, 0, EditAbleField.ALLOW_PARTIAL, EditAbleField.PARTIAL_LEVEL);
+      keys.splice(9, 0, EditAbleField.ALLOW_PARTIAL, EditAbleField.PARTIAL_LEVEL, EditAbleField.MAX_LEVEL);
     }
     if (["DATE"].includes(fieldItem ? fieldItem.html_type : (_e = (_d = formConfigItem.originalSetting) == null ? void 0 : _d.html_type) != null ? _e : "")) {
       keys.splice(keys.indexOf(EditAbleField.DEFAULT_VALUE), 1, EditAbleField.DATE_FORMAT, EditAbleField.DATE_DEFAULT_VALUE_CONDITION, EditAbleField.DATE_MIN_VALUE_CONDITION, EditAbleField.DATE_MAX_VALUE_CONDITION);

package/es/components/form-render/index.d.ts

@@ -592,6 +592,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             enterToNextWidget: boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void);
             autoExpand: boolean;
             lowCodeReactions: import("../../shared/types").LowCodeTypes.reactionConfig[];
+            newLowCodeReactions: import("../../shared/types").LowCodeTypes.newReactionConfig[];
             linebarAutoHidden: boolean;
             labelPlacementOverwrite: boolean;
             bordered: string | boolean;

package/es/components/form-render/src/FormRender.vue.d.ts

@@ -587,6 +587,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         autoExpand: boolean;
         lowCodeReactions: LowCodeTypes.reactionConfig[];
+        newLowCodeReactions: LowCodeTypes.newReactionConfig[];
         linebarAutoHidden: boolean;
         labelPlacementOverwrite: boolean;
         bordered: string | boolean;

package/es/components/form-render/src/FormRenderWrapper.vue.d.ts

@@ -590,6 +590,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             enterToNextWidget: boolean | ((fieldItem: import("../../../components/form-render").FieldItem) => boolean | void);
             autoExpand: boolean;
             lowCodeReactions: import("../../../shared/types").LowCodeTypes.reactionConfig[];
+            newLowCodeReactions: import("../../../shared/types").LowCodeTypes.newReactionConfig[];
             linebarAutoHidden: boolean;
             labelPlacementOverwrite: boolean;
             bordered: string | boolean;

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

@@ -59,7 +59,7 @@ function useCombination(props) {
   function renderRemoveBtn(attrs, idx) {
     return createVNode(NButton, mergeProps(attrs, {
       "text": true,
-      "disabled": !deletableList.value[idx],
+      "disabled": !deletableList.value[idx] || props.disabled,
       "type": "error",
       "size": "small"
     }), {

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

@@ -166,6 +166,7 @@ const script = /* @__PURE__ */ defineComponent({
       })]), range(currentGroupNum.value).map((_, idx) => createVNode("section", {
         "class": "form-render__combinationContentJson"
       }, [createVNode(FormRenderComponent, {
+        "lifeCycle": globProps == null ? void 0 : globProps.lifeCycle,
         "ref": (_ref) => setFormRenderRef(idx, _ref),
         "fieldList": props.properties,
         "components": globProps == null ? void 0 : globProps.components,

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.d.ts

@@ -142,6 +142,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         enterToNextWidget: boolean | ((fieldItem: import("../../../../../../components/form-render").FieldItem) => boolean | void);
         autoExpand: boolean;
         lowCodeReactions: import("../../../../../../shared/types").LowCodeTypes.reactionConfig[];
+        newLowCodeReactions: import("../../../../../../shared/types").LowCodeTypes.newReactionConfig[];
         linebarAutoHidden: boolean;
         labelPlacementOverwrite: boolean;
         bordered: string | boolean;

package/es/components/form-render/src/components/renderer/lineBar/index.d.ts

@@ -141,6 +141,7 @@ export declare const LINEBAR: import("@vue/runtime-core").DefineComponent<import
         enterToNextWidget: boolean | ((fieldItem: import("../../../types").FieldItem) => boolean | void);
         autoExpand: boolean;
         lowCodeReactions: import("../../../../../../shared/types").LowCodeTypes.reactionConfig[];
+        newLowCodeReactions: import("../../../../../../shared/types").LowCodeTypes.newReactionConfig[];
         linebarAutoHidden: boolean;
         labelPlacementOverwrite: boolean;
         bordered: string | boolean;

package/es/components/form-render/src/components/renderer/radio_checkbox.js

@@ -94,7 +94,8 @@ function createComponent(name, Wrapper, Item) {
         set: (value) => emit("update:value", value)
       });
       const {
-        renderComplexOption
+        renderComplexOption,
+        hasComplexOption
       } = useComplexOptions(props, valueRef);
       const {
         labelKey,
@@ -179,7 +180,7 @@ function createComponent(name, Wrapper, Item) {
             style.width = percentWidth;
           }
         }
-        if (index === options.length - 1) {
+        if (index === options.length - 1 && hasComplexOption.value) {
           classList.push("form-render__lastOption");
         }
         return createVNode(Item, {

package/es/components/form-render/src/hooks/useFieldNormalize.d.ts

@@ -90,6 +90,7 @@ export declare function useFieldNormalize(): {
         enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         autoExpand: boolean;
         lowCodeReactions: import("../../../../shared/types").LowCodeTypes.reactionConfig[];
+        newLowCodeReactions: import("../../../../shared/types").LowCodeTypes.newReactionConfig[];
         linebarAutoHidden: boolean;
         labelPlacementOverwrite: boolean;
         bordered: string | boolean;
@@ -199,6 +200,7 @@ export declare function useFieldNormalize(): {
         enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         autoExpand: boolean;
         lowCodeReactions: import("../../../../shared/types").LowCodeTypes.reactionConfig[];
+        newLowCodeReactions: import("../../../../shared/types").LowCodeTypes.newReactionConfig[];
         linebarAutoHidden: boolean;
         labelPlacementOverwrite: boolean;
         bordered: string | boolean;

package/es/components/form-render/src/hooks/useFormEvent.js

@@ -133,7 +133,7 @@ function useFormExposeEvent({
       wordbookSettingHandler2.triggerDisabled = options.avoidWordbookSettingConnection;
       operationalFormHandler.triggerDisabled = options.avoidOperationalFormConnection;
       if (options.needSplitExtendKey) {
-        values = splitExtendKey(getFieldList(), values);
+        values = splitExtendKey(getFieldList(), values, !!options.overwrite);
       }
       if (options.avoidFormChangeEvent) {
         emitFormChange.value = false;

package/es/components/form-render/src/hooks/useNewLowCodeReactions.js

@@ -39,6 +39,14 @@ function useNewLowCodeReactions(configListRef, formModel) {
       createFieldHandler((state, isPositive) => {
         state.disabled = isPositive;
       })
+    ],
+    [
+      ["setValue", "_"],
+      createFieldHandler((state, isPositive, { actionConfig: { value } = {} }) => {
+        if (!isPositive)
+          return;
+        state.value = value === null ? "null" : value === void 0 ? "undefined" : value;
+      })
     ]
   ]);
   const relativeFieldMap = computed(() => {

package/es/components/form-render/src/types/index.d.ts

@@ -158,6 +158,7 @@ export type FormRenderProps = Partial<{
     enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
     autoExpand: boolean;
     lowCodeReactions: LowCodeTypes.reactionConfig[];
+    newLowCodeReactions: LowCodeTypes.newReactionConfig[];
     linebarAutoHidden: boolean;
     labelPlacementOverwrite: boolean;
     bordered: boolean | string;

package/es/components/form-render/src/utils/index.d.ts

@@ -18,7 +18,7 @@ export declare function createSlot(renderer: unknown, props: AnyObject, defaultR
 export declare function createInputSlot(props: AnyObject, defaultRenderer?: (v: unknown) => unknown[]): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}, any, {}>>>;
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;
 export declare function combineExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
-export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
+export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject, overwrite: boolean): AnyObject;
 export declare function isNestedType(type?: string): boolean | "" | undefined;
 export declare function isNestedFieldType(field: FieldItem | GeneralField): boolean | "" | undefined;
 export declare function renderOptionLabel(option: AnyObject, labelKey: string): any;

package/es/components/form-render/src/utils/index.js

@@ -136,7 +136,7 @@ function combineExtendKey(fieldList, values) {
   });
   return result;
 }
-function splitExtendKey(fieldList, values) {
+function splitExtendKey(fieldList, values, overwrite) {
   const fieldListWithExtendKey = findExtendKeyField(fieldList);
   if (!fieldListWithExtendKey.length)
     return values;
@@ -156,7 +156,10 @@ function splitExtendKey(fieldList, values) {
   }) => {
     if (Reflect.has(result, val_key))
       return;
-    result[val_key] = queryFieldValue(extendKey)[val_key];
+    const value = queryFieldValue(extendKey)[val_key];
+    if (value == null && !overwrite)
+      return;
+    result[val_key] = value;
   });
   return result;
 }