cnhis-design-vue 3.1.21-beta.9 → 3.1.22-beta.0

package/es/components/field-set/src/FieldSet.js

@@ -186,7 +186,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!state.fields.length)
         return false;
       return state.fields.every((i) => {
-        if (!Object.prototype.hasOwnProperty.call(i, key))
+        if (!Object.prototype.hasOwnProperty.call(i, key) || isDisable(i, key))
           return true;
         return i[key];
       });
@@ -194,7 +194,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleAllCheck = (e, key) => {
       const value = e;
       const data = state.fields.map((i) => {
-        if (Object.prototype.hasOwnProperty.call(i, key)) {
+        if (Object.prototype.hasOwnProperty.call(i, key) && !isDisable(i, key)) {
           i[key] = value;
         }
         return i;
@@ -204,6 +204,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleFieldClick = (item) => {
       state.clickItem = item;
     };
+    function isDisable(item, key) {
+      return ["editable", "required"].includes(key) && item[`${key}Disable`];
+    }
     function setWidth() {
       if (props.isEdit) {
         state.widthShow = "9%";
@@ -292,7 +295,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     tag: "ul"
                   }, {
                     item: withCtx(({ element }) => [
-                      createElementVNode("li", {
+                      !element.hide ? (openBlock(), createElementBlock("li", {
+                        key: 0,
                         class: "left-style",
                         style: normalizeStyle(leftStyle(element)),
                         onClick: ($event) => handleFieldClick(element)
@@ -327,18 +331,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createCommentVNode(" \u662F\u5426\u53EF\u7F16\u8F91 "),
                         __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_22, [
                           withDirectives(createVNode(unref(NCheckbox), {
+                            disabled: element.editableDisable,
                             checked: element.editable,
                             "onUpdate:checked": ($event) => element.editable = $event
-                          }, null, 8, ["checked", "onUpdate:checked"]), [
+                          }, null, 8, ["disabled", "checked", "onUpdate:checked"]), [
                             [vShow, element.id != "0001"]
                           ])
                         ])) : createCommentVNode("v-if", true),
                         createCommentVNode(" \u662F\u5426\u5FC5\u586B "),
                         __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_23, [
                           withDirectives(createVNode(unref(NCheckbox), {
+                            disabled: element.requiredDisable,
                             checked: element.required,
                             "onUpdate:checked": ($event) => element.required = $event
-                          }, null, 8, ["checked", "onUpdate:checked"]), [
+                          }, null, 8, ["disabled", "checked", "onUpdate:checked"]), [
                             [vShow, element.id != "0001"]
                           ])
                         ])) : createCommentVNode("v-if", true),
@@ -379,7 +385,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             style: { width: "120px" }
                           }, null, 8, ["value", "onUpdate:value"])
                         ])
-                      ], 12, _hoisted_16)
+                      ], 12, _hoisted_16)) : createCommentVNode("v-if", true)
                     ]),
                     _: 1
                   }, 8, ["list"])

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -10,7 +10,10 @@ declare type Ifields = {
     fixedWay: 'NONE' | 'LEFT' | 'RIGHT';
     columnWidth: number;
     editable: boolean;
+    editableDisable: boolean;
     required: boolean;
+    requiredDisable: boolean;
+    hide: boolean;
     [key: string]: any;
 };
 declare type Istate = {
@@ -81,6 +84,7 @@ declare const _default: import("vue").DefineComponent<{
     calculateCheck: (key: string) => boolean;
     handleAllCheck: (e: boolean, key: string) => void;
     handleFieldClick: (item: Ifields) => void;
+    isDisable: (item: Ifields, key: string) => any;
     setWidth: () => void;
     NButton: any;
     NCheckbox: any;

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

@@ -1,4 +1,5 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, toDisplayString, nextTick } from 'vue';
+import { arrayed } from '../../../shared/utils/index2.js';
 import { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
@@ -7,7 +8,7 @@ import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from './constants/index2.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle2.js';
 import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides2.js';
-import { arrayed } from './utils/index.js';
+import './utils/index.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor2.js';
 import '../index2.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor2.js';

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

@@ -2,7 +2,7 @@ import { isField } from '@formily/core';
 import { flatten } from 'lodash-es';
 import { onMounted } from 'vue';
 import '../../../../../index2.js';
-import { arrayed } from '../../../../utils/index.js';
+import { arrayed } from '../../../../../../../shared/utils/index2.js';
 import { useFormField } from '../../../../hooks/useFormField2.js';
 
 function useDeepValidate() {

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

@@ -1,7 +1,8 @@
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { isObject } from '@vueuse/core';
 import { cloneDeep, omit, pick } from 'lodash-es';
 import '../../index2.js';
-import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
+import { parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { useFieldNormalize } from './useFieldNormalize2.js';
 import { fieldKeyEscape, createLinebarId } from '../utils/schema2.js';
 import { transformDateFormat } from '../utils/business2.js';

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

@@ -21,6 +21,12 @@ function useFieldNormalize() {
   FieldNormalizeWaterfallHook.tap("__age", (fieldItem) => {
     if (fieldItem.html_type === "AGE") {
       fieldItem.html_type = "INPUT_NUMBER";
+      fieldItem.reactions = {
+        target: fieldItem.val_key_unit,
+        fulfill: {
+          state: { disabled: "{{$self.disabled}}" }
+        }
+      };
       fieldItem.suffixConfig = [
         {
           validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },

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

@@ -1,4 +1,4 @@
-import { arrayed } from '../utils/index.js';
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { isFunction } from '@vueuse/core';
 
 function useFieldVisitor() {

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

@@ -1,5 +1,6 @@
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { isString } from 'lodash-es';
-import { arrayed } from '../utils/index.js';
+import '../utils/index.js';
 import { isFunction } from '@vueuse/core';
 import { isIdCard } from '../utils/business2.js';
 

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

@@ -5,7 +5,6 @@ export * from './business';
 export * from './dom';
 export * from './schema';
 export declare function formRenderLog(message: string): void;
-export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function parseNumberFromMaybeString<T>(value: T): T extends number | string ? number : T;

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

@@ -1,4 +1,5 @@
 import { computed, createVNode, Fragment, inject, provide } from 'vue';
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
 import { useMemoize } from '@vueuse/core';
@@ -9,11 +10,6 @@ import '@formily/core';
 function formRenderLog(message) {
   console.warn(`[FormRender]: ${message}`);
 }
-function arrayed(maybeArray) {
-  if (Array.isArray(maybeArray))
-    return maybeArray;
-  return [maybeArray];
-}
 function mergeDeepProperties(target, fieldList, traverseProperties = ["children", "properties", "suffixConfig"], property = "val_key", targetProperty = "default_val") {
   function traverse(_target, _fieldList) {
     _fieldList.forEach((field) => {
@@ -138,4 +134,4 @@ function optionMatcher(options, input, key, matcherOption = {
   }
 }
 
-export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };
+export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };