cnhis-design-vue 3.1.21-beta.2 → 3.1.21-beta.4

package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -433,8 +433,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         let filterField = false;
         let filterItems = [];
         try {
-          const fieldSetting = JSON.parse(item.fieldSetting);
-          filterField = ((_a2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _a2.type) === "manual" && item.isMerge != 1;
+          const fieldSetting = JSON.parse(item.fieldSetting || "{}");
+          let notParticipatingSearch = (fieldSetting == null ? void 0 : fieldSetting.notParticipatingSearch) || "";
+          filterField = notParticipatingSearch != 1 && ((_a2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _a2.type) === "manual" && item.isMerge != 1;
           filterItems = (_c2 = (_b2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _b2.mappingFiled) == null ? void 0 : _c2.map((item2) => item2.value[0]);
         } catch (e) {
         }

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

@@ -6,8 +6,8 @@ import { cloneDeep, isArray } from 'lodash-es';
 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 { useNuiThemeOverrides } from '../../form-table/src/hooks/useNuiThemeOverrides2.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor2.js';
 import '../index2.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor2.js';
@@ -65,7 +65,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const formModel = createForm({
       initialValues: props.initialData,
       effects() {
-        onFieldValueChange("*", async (field) => {
+        onFieldValueChange("*", (field) => {
           const fieldKey = field.props.name.toString();
           businessCollector.trigger(fieldKey);
           formItemDepsCollector.trigger(fieldKey);
@@ -74,7 +74,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             fieldKey,
             fieldName: field.title,
             value: field.value,
-            context: await changeContextCollector.getContext(fieldKey)
+            context: changeContextCollector.getContext(fieldKey, field.value)
           });
         });
       }

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
+import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
 import { cloneDeep, isEqual, isString } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector } from '../../constants/index2.js';
@@ -125,13 +125,12 @@ const script = defineComponent({
       }
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
-    changeContextCollector.setContext(fieldKey.value, async () => {
-      await nextTick();
+    changeContextCollector.setContext(fieldKey.value, (v) => {
       return {
-        currentOption: cloneDeep(getCurrentOption())
+        currentOption: cloneDeep(getCurrentOption(v))
       };
-      function getCurrentOption() {
-        return parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value);
+      function getCurrentOption(v2) {
+        return parsedOptions.value.find((option) => option[valueKey.value] === v2);
       }
     });
     watch(() => props.wordbook, (wordbook, oldWordbook) => {

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
+import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { cloneDeep, isEqual, isString } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
@@ -136,13 +136,12 @@ const script = defineComponent({
       }
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
-    changeContextCollector.setContext(fieldKey.value, async () => {
-      await nextTick();
+    changeContextCollector.setContext(fieldKey.value, (v) => {
       return {
-        currentOption: cloneDeep(getCurrentOption())
+        currentOption: cloneDeep(getCurrentOption(v))
       };
-      function getCurrentOption() {
-        return parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value);
+      function getCurrentOption(v2) {
+        return parsedOptions.value.find((option) => option[valueKey.value] === v2);
       }
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);

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

@@ -1,12 +1,10 @@
 import { FormChangeContext } from '../types';
 export declare class ContextCollector {
     private readonly contextMap;
-    setContext(key: string, value: () => Promise<FormChangeContext> | FormChangeContext): void;
-    getContext(key: string): Partial<{
+    setContext(key: string, value: (value: unknown) => FormChangeContext): void;
+    getContext(key: string, value: unknown): Partial<{
         currentOption: import("../../../../shared/types").AnyObject;
-    }> | Promise<Partial<{
-        currentOption: import("../../../../shared/types").AnyObject;
-    }>> | undefined;
+    }> | undefined;
 }
 export declare function useChangeContext(): {
     create: () => ContextCollector;

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

@@ -5,9 +5,9 @@ class ContextCollector {
   setContext(key, value) {
     this.contextMap.set(key, value);
   }
-  getContext(key) {
+  getContext(key, value) {
     var _a;
-    return (_a = this.contextMap.get(key)) == null ? void 0 : _a();
+    return (_a = this.contextMap.get(key)) == null ? void 0 : _a(value);
   }
 }
 function useChangeContext() {

package/es/components/index.d.ts

@@ -9,7 +9,6 @@ import CSelectLabel, { CLabelFormContent } from './select-label';
 import CMap from './map';
 import CVodChunkUpload from './chunk-upload';
 import { CScaleView, CRadio, CCheckbox, CSelect, CDatetime } from './scale-view';
-import CFormTable from './form-table';
 import CInfoHeader from './info-header';
 import CTimeLine from './time-line';
 import CBpmnWorkflow from './bpmn-workflow';
@@ -27,7 +26,7 @@ export * from './big-table';
 export * from './button-print';
 export * from './form-config';
 declare function install(app: App): void;
-export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter, CFormConfig };
+export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter, CFormConfig };
 declare const _default: {
     install: typeof install;
 };

package/es/components/index.js

@@ -6,7 +6,6 @@ export { default as CDragLayout } from './drag-layout/index2.js';
 export { default as CButtonPrint } from './button-print/index2.js';
 export { default as CSelectPerson } from './select-person/index2.js';
 export { default as CVodChunkUpload } from './chunk-upload/index2.js';
-export { default as CFormTable } from './form-table/index2.js';
 export { default as CInfoHeader } from './info-header/index2.js';
 export { default as CTimeLine } from './time-line/index2.js';
 export { default as CBpmnWorkflow } from './bpmn-workflow/index2.js';

package/es/components/index2.js

@@ -18,8 +18,6 @@ import VodChunkUpload from './chunk-upload/index2.js';
 export { default as CVodChunkUpload } from './chunk-upload/index2.js';
 import { CScaleView, CRadio, CCheckbox, CSelect, CDatetime } from './scale-view/index2.js';
 export { CCheckbox, CDatetime, CRadio, CScaleView, CSelect } from './scale-view/index2.js';
-import FormTable from './form-table/index2.js';
-export { default as CFormTable } from './form-table/index2.js';
 import InfoHeader from './info-header/index2.js';
 export { default as CInfoHeader } from './info-header/index2.js';
 import TimeLine from './time-line/index2.js';
@@ -57,7 +55,6 @@ const components = {
   CCheckbox,
   CSelect,
   CDatetime,
-  CFormTable: FormTable,
   CInfoHeader: InfoHeader,
   CTimeLine: TimeLine,
   CBpmnWorkflow: BpmnWorkflow,

package/es/components/info-header/index.d.ts

@@ -181,8 +181,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             default: () => {};
         };
     }>>, {
-        content: string;
         contentStyle: import("vue").CSSProperties;
+        content: string;
     }>;
     HiddenContent: import("vue").DefineComponent<{
         content: {
@@ -250,8 +250,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
                 default: () => {};
             };
         }>>, {
-            content: string;
             contentStyle: import("vue").CSSProperties;
+            content: 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<{
         content: {
@@ -267,8 +267,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             default: () => {};
         };
     }>>, {
-        content: string;
         contentStyle: import("vue").CSSProperties;
+        content: string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("openPatientInfo" | "fieldSet" | "update:compact")[], "openPatientInfo" | "fieldSet" | "update:compact", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     compact: {

package/es/components/info-header/src/HiddenContent.vue.d.ts

@@ -65,8 +65,8 @@ declare const _default: import("vue").DefineComponent<{
             default: () => {};
         };
     }>>, {
-        content: string;
         contentStyle: CSSProperties;
+        content: 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<{
     content: {
@@ -82,7 +82,7 @@ declare const _default: import("vue").DefineComponent<{
         default: () => {};
     };
 }>>, {
-    content: string;
     contentStyle: CSSProperties;
+    content: string;
 }>;
 export default _default;

package/es/components/info-header/src/InfoEllipsis.vue.d.ts

@@ -27,7 +27,7 @@ declare const _default: import("vue").DefineComponent<{
         default: () => {};
     };
 }>>, {
-    content: string;
     contentStyle: CSSProperties;
+    content: string;
 }>;
 export default _default;

package/es/components/info-header/src/InfoHeader.vue.d.ts

@@ -182,8 +182,8 @@ declare const _default: import("vue").DefineComponent<{
             default: () => {};
         };
     }>>, {
-        content: string;
         contentStyle: CSSProperties;
+        content: string;
     }>;
     HiddenContent: import("vue").DefineComponent<{
         content: {
@@ -251,8 +251,8 @@ declare const _default: import("vue").DefineComponent<{
                 default: () => {};
             };
         }>>, {
-            content: string;
             contentStyle: CSSProperties;
+            content: 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<{
         content: {
@@ -268,8 +268,8 @@ declare const _default: import("vue").DefineComponent<{
             default: () => {};
         };
     }>>, {
-        content: string;
         contentStyle: CSSProperties;
+        content: string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("openPatientInfo" | "fieldSet" | "update:compact")[], "openPatientInfo" | "fieldSet" | "update:compact", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     compact: {

package/es/components/scale-view/src/components/formitem/text-over-tooltip/TextOverTooltip.vue.d.ts

@@ -80,8 +80,8 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>>, {
     placement: string;
+    effect: string;
     tooltipTitle: string | number;
     isAlias: boolean;
-    effect: string;
 }>;
 export default _default;

package/es/components/steps-wheel/index.d.ts

@@ -105,10 +105,10 @@ declare const StepsWheel: SFCWithInstall<import("vue").DefineComponent<{
     };
 }>>, {
     noDataMsg: string;
-    placement: string;
     stepInfo: Record<string, any>;
     currentStep: number;
     toolTipShow: boolean;
     lastNodeRender: boolean;
+    placement: string;
 }>>;
 export default StepsWheel;

package/es/components/steps-wheel/src/StepsWheel.vue.d.ts

@@ -104,10 +104,10 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>>, {
     noDataMsg: string;
-    placement: string;
     stepInfo: Record<string, any>;
     currentStep: number;
     toolTipShow: boolean;
     lastNodeRender: boolean;
+    placement: string;
 }>;
 export default _default;

package/es/shared/components/TextOverTooltip/TextOverTooltip.vue.d.ts

@@ -80,8 +80,8 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>>, {
     placement: string;
+    effect: string;
     tooltipTitle: string | number;
     isAlias: boolean;
-    effect: string;
 }>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.21-beta.2",
+  "version": "3.1.21-beta.4",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "b7eb6e1e2cc3c9ad58c462276bc230200a185de7"
+  "gitHead": "7ef5767506d850cf000b061261bea68a2aaac601"
 }