cnhis-design-vue 3.1.21-beta.1 → 3.1.21-beta.11

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/form-render/src/hooks/useFormItemDeps2.js

@@ -1,8 +1,5 @@
 import { isFunction } from 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
+import '../utils/index.js';
 import { traverseDependKey } from '../utils/schema2.js';
 
 class FormItemDepsCollector {

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

@@ -1,9 +1,6 @@
 import { isString } from 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
+import '../utils/index.js';
 import { isIdCard, isMobile } from '../utils/business2.js';
-import '@formily/core';
 
 function usePresetScope() {
   return {

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

@@ -25,6 +25,7 @@ export declare type ValidateItem = Partial<{
 interface OptionItem {
     text: string;
     value: any;
+    keyword?: string;
     children?: OptionItem[];
 }
 interface FormRendererPayload {

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble } from '../../../../../es/shared/types';
+import { AnyObject, ArrayAble, Nullable } from '../../../../../es/shared/types';
 import { FunctionalComponent, InjectionKey, VNode } from 'vue';
 import { FieldItem } from '../types';
 export * from './business';
@@ -15,3 +15,6 @@ export declare function createSlot(renderer: unknown, props: AnyObject): Record<
 };
 export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;
 export declare function presetRequestHandler(res: unknown): any;
+export declare function optionMatcher(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
+    keyword?: string;
+}): AnyObject[];

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

@@ -1,6 +1,7 @@
 import { computed, createVNode, Fragment, inject, provide } from 'vue';
 import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
+import { useMemoize } from '@vueuse/core';
 import { isString, isFunction } from 'lodash-es';
 import 'date-fns';
 import '@formily/core';
@@ -111,5 +112,30 @@ function presetRequestHandler(res) {
     return map.rows;
   }
 }
+const keywordMatcher = useMemoize(function(text, keyword) {
+  if (!isString(keyword) || !isString(text))
+    return false;
+  return keyword.split(",").some((k) => k.trim().includes(text));
+}, {
+  getKey(...args) {
+    return args.reduce((res, arg) => {
+      return String(res) + "_" + String(arg);
+    }, "");
+  }
+});
+function optionMatcher(options, input, key, matcherOption = {
+  keyword: "keyword"
+}) {
+  if (!input)
+    return options;
+  return options.filter((option) => {
+    if (!isString(keyFor(option)))
+      return;
+    return keyFor(option).includes(input) || matcherOption.keyword && keywordMatcher(input, option[matcherOption.keyword]);
+  });
+  function keyFor(option) {
+    return option[key];
+  }
+}
 
-export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };
+export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };

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

@@ -15,8 +15,12 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             age: string;
             ageUnit?: string | undefined;
             tagList?: Partial<{
-                type: "warning" | "info";
+                type?: "warning" | "info" | undefined;
                 content: string;
+                color?: {
+                    color?: string | undefined;
+                    textColor?: string | undefined;
+                } | undefined;
             }>[] | undefined;
         }>>;
         default: () => {};
@@ -58,8 +62,12 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
                 age: string;
                 ageUnit?: string | undefined;
                 tagList?: Partial<{
-                    type: "warning" | "info";
+                    type?: "warning" | "info" | undefined;
                     content: string;
+                    color?: {
+                        color?: string | undefined;
+                        textColor?: string | undefined;
+                    } | undefined;
                 }>[] | undefined;
             }>>;
             default: () => {};
@@ -93,7 +101,14 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     toggleCompact: () => void;
     openPatientInfo: () => void;
     fieldSet: () => void;
-    getTagColor: (type: "warning" | "info") => {
+    getTagColor: ({ type }: Partial<{
+        type?: "warning" | "info" | undefined;
+        content: string;
+        color?: {
+            color?: string | undefined;
+            textColor?: string | undefined;
+        } | undefined;
+    }>) => {
         color: string;
         textColor: string;
     };
@@ -181,8 +196,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             default: () => {};
         };
     }>>, {
-        content: string;
         contentStyle: import("vue").CSSProperties;
+        content: string;
     }>;
     HiddenContent: import("vue").DefineComponent<{
         content: {
@@ -250,8 +265,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 +282,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: {
@@ -286,8 +301,12 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             age: string;
             ageUnit?: string | undefined;
             tagList?: Partial<{
-                type: "warning" | "info";
+                type?: "warning" | "info" | undefined;
                 content: string;
+                color?: {
+                    color?: string | undefined;
+                    textColor?: string | undefined;
+                } | undefined;
             }>[] | undefined;
         }>>;
         default: () => {};
@@ -324,8 +343,12 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         age: string;
         ageUnit?: string | undefined;
         tagList?: Partial<{
-            type: "warning" | "info";
+            type?: "warning" | "info" | undefined;
             content: string;
+            color?: {
+                color?: string | undefined;
+                textColor?: string | undefined;
+            } | undefined;
         }>[] | undefined;
     }>;
     labelField: string;

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.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, nextTick, onMounted, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createCommentVNode, Fragment, toDisplayString, renderList, withDirectives, createBlock, unref, withCtx, createTextVNode, vShow, createVNode } from 'vue';
+import { defineComponent, ref, nextTick, onMounted, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createCommentVNode, Fragment, toDisplayString, renderList, withDirectives, createBlock, unref, mergeProps, withCtx, createTextVNode, vShow, createVNode } from 'vue';
 import { NTag, NDescriptions, NDescriptionsItem } from 'naive-ui';
 import { useThrottleFn, useEventListener } from '@vueuse/core';
 import script$1 from '../../../shared/components/SlotRender/SlotRender.js';
@@ -57,11 +57,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function fieldSet() {
       emit("fieldSet");
     }
-    function getTagColor(type) {
-      return {
-        color: type === "warning" ? "#fcc200" : "rgba(45, 122, 255, 0.1)",
-        textColor: type === "warning" ? "#ffffff" : "#2563F4"
-      };
+    function getTagColor({ type = "warning" }) {
+      const colorMap = { warning: "#fcc200", info: "rgba(45, 122, 255, 0.1)" };
+      const textColorMap = { warning: "#fff", info: "#2563F4" };
+      return { color: colorMap[type], textColor: textColorMap[type] };
     }
     function getDescriptionItemStyle({ bold = true, contentStyle = {} } = {}) {
       return { fontWeight: bold ? 700 : 500, ...contentStyle };
@@ -124,17 +123,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 __props.patientInfo.sex ? (openBlock(), createElementBlock("div", _hoisted_6, "/ " + toDisplayString(__props.patientInfo.sex), 1)) : createCommentVNode("v-if", true),
                 __props.patientInfo.age ? (openBlock(), createElementBlock("div", _hoisted_7, " / " + toDisplayString(__props.patientInfo.age) + toDisplayString(__props.patientInfo.ageUnit || "\u5C81"), 1)) : createCommentVNode("v-if", true),
                 (openBlock(true), createElementBlock(Fragment, null, renderList(__props.patientInfo.tagList || [], (tag) => {
-                  return withDirectives((openBlock(), createBlock(unref(NTag), {
+                  return withDirectives((openBlock(), createBlock(unref(NTag), mergeProps({
                     key: tag.content,
                     size: "medium",
                     bordered: false,
-                    color: getTagColor(tag.type || "warning")
-                  }, {
+                    color: getTagColor(tag)
+                  }, tag), {
                     default: withCtx(() => [
                       createTextVNode(toDisplayString(tag.content), 1)
                     ]),
                     _: 2
-                  }, 1032, ["color"])), [
+                  }, 1040, ["color"])), [
                     [vShow, tag.content]
                   ]);
                 }), 128))

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

@@ -1,5 +1,13 @@
 import { AnyObject } from '../../../../es/shared/types';
 import { CSSProperties, PropType } from 'vue';
+declare type PatientTag = Partial<{
+    type?: 'warning' | 'info';
+    content: string;
+    color?: {
+        color?: string;
+        textColor?: string;
+    };
+}>;
 declare const _default: import("vue").DefineComponent<{
     compact: {
         type: BooleanConstructor;
@@ -16,8 +24,12 @@ declare const _default: import("vue").DefineComponent<{
             age: string;
             ageUnit?: string | undefined;
             tagList?: Partial<{
-                type: "warning" | "info";
+                type?: "warning" | "info" | undefined;
                 content: string;
+                color?: {
+                    color?: string | undefined;
+                    textColor?: string | undefined;
+                } | undefined;
             }>[] | undefined;
         }>>;
         default: () => {};
@@ -59,8 +71,12 @@ declare const _default: import("vue").DefineComponent<{
                 age: string;
                 ageUnit?: string | undefined;
                 tagList?: Partial<{
-                    type: "warning" | "info";
+                    type?: "warning" | "info" | undefined;
                     content: string;
+                    color?: {
+                        color?: string | undefined;
+                        textColor?: string | undefined;
+                    } | undefined;
                 }>[] | undefined;
             }>>;
             default: () => {};
@@ -94,7 +110,7 @@ declare const _default: import("vue").DefineComponent<{
     toggleCompact: () => void;
     openPatientInfo: () => void;
     fieldSet: () => void;
-    getTagColor: (type: 'warning' | 'info') => {
+    getTagColor: ({ type }: PatientTag) => {
         color: string;
         textColor: string;
     };
@@ -182,8 +198,8 @@ declare const _default: import("vue").DefineComponent<{
             default: () => {};
         };
     }>>, {
-        content: string;
         contentStyle: CSSProperties;
+        content: string;
     }>;
     HiddenContent: import("vue").DefineComponent<{
         content: {
@@ -251,8 +267,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 +284,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: {
@@ -287,8 +303,12 @@ declare const _default: import("vue").DefineComponent<{
             age: string;
             ageUnit?: string | undefined;
             tagList?: Partial<{
-                type: "warning" | "info";
+                type?: "warning" | "info" | undefined;
                 content: string;
+                color?: {
+                    color?: string | undefined;
+                    textColor?: string | undefined;
+                } | undefined;
             }>[] | undefined;
         }>>;
         default: () => {};
@@ -325,8 +345,12 @@ declare const _default: import("vue").DefineComponent<{
         age: string;
         ageUnit?: string | undefined;
         tagList?: Partial<{
-            type: "warning" | "info";
+            type?: "warning" | "info" | undefined;
             content: string;
+            color?: {
+                color?: string | undefined;
+                textColor?: string | undefined;
+            } | undefined;
         }>[] | undefined;
     }>;
     labelField: string;

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/shortcut-setter/index.d.ts

@@ -87,6 +87,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         option?: {
             text: string;
             value: any;
+            keyword?: string | undefined;
             children?: any[] | undefined;
         }[] | undefined;
         multi_select?: import("..").FormCommonState | undefined;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -89,6 +89,7 @@ declare const _default: import("vue").DefineComponent<{
         option?: {
             text: string;
             value: any;
+            keyword?: string | undefined;
             children?: any[] | undefined;
         }[] | undefined;
         multi_select?: import("../../../../es/components/form-render").FormCommonState | undefined;

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.1",
+  "version": "3.1.21-beta.11",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "2b7d590432186101e6997b3f736bdce8f61d4549"
+  "gitHead": "79a10ccc3e78b46f18703b08ab2edecfe5bcbb48"
 }

package/es/components/big-table/src/components/edit-form/useCommon.d.ts

@@ -1,4 +0,0 @@
-export declare const useCommon: (props: any, attrs: any) => {
-    formRef: import("vue").Ref<HTMLElement | null>;
-    isShow: import("vue").Ref<boolean>;
-};

package/es/components/bpmn-workflow/types/BpmnViewer.d.ts

@@ -1 +0,0 @@
-declare module 'bpmn-js/lib/Viewer';

package/es/components/bpmn-workflow/types/ModelingModule.d.ts

@@ -1 +0,0 @@
-declare module 'bpmn-js/lib/features/modeling';

package/es/components/bpmn-workflow/types/MoveCanvasModule.d.ts

@@ -1 +0,0 @@
-declare module 'diagram-js/lib/navigation/movecanvas';