cnhis-design-vue 3.1.23-beta.13 → 3.1.23-beta.14

package/es/components/search-cascader/src/SearchCascader.js

@@ -1,7 +1,7 @@
-import { defineComponent, ref, computed, provide, nextTick, openBlock, createBlock, unref, normalizeStyle, withCtx, createVNode, isRef, createElementVNode, renderSlot } from 'vue';
+import { defineComponent, computed, ref, provide, nextTick, openBlock, createBlock, unref, isRef, normalizeStyle, withCtx, createVNode, createElementVNode, renderSlot } from 'vue';
 import { uuidGenerator } from '../../../shared/utils/index2.js';
 import { onClickOutside, useDebounceFn } from '@vueuse/core';
-import { isString, isArray, isFunction } from 'lodash-es';
+import { isString, isArray, isFunction, isObject } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
 import { InjectionSearchCascaderLoadingNode } from './constants/index2.js';
 import { useCssVariable } from './hooks/useCssVariable2.js';
@@ -13,6 +13,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "SearchCascader",
   props: {
     value: { type: [String, Array] },
+    show: { type: Boolean, default: false },
     clearable: { type: Boolean, default: false },
     childKey: { type: String, default: "children" },
     placeholder: { type: String, default: "\u8BF7\u9009\u62E9" },
@@ -23,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     valueKey: { type: String, default: "value" },
     beforeSetValue: { type: Function }
   },
-  emits: ["update:value", "focus"],
+  emits: ["update:value", "focus", "update:show"],
   setup(__props, { emit: emits }) {
     const props = __props;
     function emitValue(value) {
@@ -37,7 +38,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const cssVariable = useCssVariable();
     const uuid = uuidGenerator();
-    const show = ref(false);
+    const show = computed({
+      get() {
+        return props.show;
+      },
+      set(value) {
+        emits("update:show", value);
+      }
+    });
     const patternContent = ref("");
     const displayValue = computed({
       get() {
@@ -110,8 +118,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       try {
         loadingNode.value = node;
-        await (isFunction(props.search) && props.search(node, keyword));
-        currentNode.value = node;
+        const result = await (isFunction(props.search) && props.search(node, keyword));
+        currentNode.value = isObject(result) ? result : node;
       } finally {
         loadingNode.value = null;
         await nextTick();
@@ -122,8 +130,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createBlock(unref(NPopover), {
         class: "search-cascader",
         trigger: "manual",
-        show: show.value,
-        "onUpdate:show": _cache[1] || (_cache[1] = ($event) => show.value = $event),
+        show: unref(show),
+        "onUpdate:show": _cache[1] || (_cache[1] = ($event) => isRef(show) ? show.value = $event : null),
         "show-arrow": false,
         placement: "bottom-start",
         style: normalizeStyle(unref(cssVariable)),
@@ -133,7 +141,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         trigger: withCtx(() => [
           createVNode(unref(NInput), {
-            placeholder: show.value ? __props.editPlaceholder : __props.placeholder,
+            placeholder: unref(show) ? __props.editPlaceholder : __props.placeholder,
             clearable: __props.clearable,
             onClear,
             value: unref(displayValue),

package/es/components/search-cascader/src/SearchCascader.vue.d.ts

@@ -5,6 +5,10 @@ declare const _default: import("vue").DefineComponent<{
     value: {
         type: PropType<ValueType>;
     };
+    show: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     clearable: {
         type: BooleanConstructor;
         default: boolean;
@@ -44,6 +48,10 @@ declare const _default: import("vue").DefineComponent<{
         value: {
             type: PropType<ValueType>;
         };
+        show: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         clearable: {
             type: BooleanConstructor;
             default: boolean;
@@ -81,15 +89,16 @@ declare const _default: import("vue").DefineComponent<{
     }>> & {
         onFocus?: ((...args: any[]) => any) | undefined;
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+        "onUpdate:show"?: ((...args: any[]) => any) | undefined;
     }>>;
-    emits: (event: "update:value" | "focus", ...args: any[]) => void;
+    emits: (event: "update:value" | "update:show" | "focus", ...args: any[]) => void;
     emitValue: (value: ValueType) => void;
     onClear: () => void;
     cssVariable: {
         '--menu-width': number;
     };
     uuid: string;
-    show: import("vue").Ref<boolean>;
+    show: import("vue").WritableComputedRef<boolean>;
     patternContent: import("vue").Ref<string>;
     displayValue: import("vue").WritableComputedRef<string>;
     onFocus: (focusEvt: Event) => void;
@@ -145,10 +154,14 @@ declare const _default: import("vue").DefineComponent<{
         childKey: string;
         labelKey: string;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "focus")[], "focus" | "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "update:show" | "focus")[], "focus" | "update:value" | "update:show", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
         type: PropType<ValueType>;
     };
+    show: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     clearable: {
         type: BooleanConstructor;
         default: boolean;
@@ -186,7 +199,9 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onFocus?: ((...args: any[]) => any) | undefined;
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:show"?: ((...args: any[]) => any) | undefined;
 }, {
+    show: boolean;
     options: AnyObject[];
     placeholder: string;
     valueKey: string;

package/es/shared/utils/tapable/index.d.ts

@@ -0,0 +1,139 @@
+type FixedSizeArray<T extends number, U> = T extends 0
+	? void[]
+	: ReadonlyArray<U> & {
+			0: U;
+			length: T;
+	  };
+type Measure<T extends number> = T extends 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 ? T : never;
+type Append<T extends any[], U> = {
+	0: [U];
+	1: [T[0], U];
+	2: [T[0], T[1], U];
+	3: [T[0], T[1], T[2], U];
+	4: [T[0], T[1], T[2], T[3], U];
+	5: [T[0], T[1], T[2], T[3], T[4], U];
+	6: [T[0], T[1], T[2], T[3], T[4], T[5], U];
+	7: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], U];
+	8: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7], U];
+}[Measure<T['length']>];
+type AsArray<T> = T extends any[] ? T : [T];
+
+declare class UnsetAdditionalOptions {
+	_UnsetAdditionalOptions: true;
+}
+type IfSet<X> = X extends UnsetAdditionalOptions ? {} : X;
+
+type Callback<E, T> = (error: E | null, result?: T) => void;
+type InnerCallback<E, T> = (error?: E | null | false, result?: T) => void;
+
+type FullTap = Tap & {
+	type: 'sync' | 'async' | 'promise';
+	fn: Function;
+};
+
+type Tap = TapOptions & {
+	name: string;
+};
+
+type TapOptions = {
+	before?: string;
+	stage?: number;
+};
+
+interface HookInterceptor<T, R, AdditionalOptions = UnsetAdditionalOptions> {
+	name?: string;
+	tap?: (tap: FullTap & IfSet<AdditionalOptions>) => void;
+	call?: (...args: any[]) => void;
+	loop?: (...args: any[]) => void;
+	error?: (err: Error) => void;
+	result?: (result: R) => void;
+	done?: () => void;
+	register?: (tap: FullTap & IfSet<AdditionalOptions>) => FullTap & IfSet<AdditionalOptions>;
+}
+
+type ArgumentNames<T extends any[]> = FixedSizeArray<T['length'], string>;
+
+declare class Hook<T, R, AdditionalOptions = UnsetAdditionalOptions> {
+	constructor(args?: ArgumentNames<AsArray<T>>, name?: string);
+	name: string | undefined;
+	taps: FullTap[];
+	intercept(interceptor: HookInterceptor<T, R, AdditionalOptions>): void;
+	isUsed(): boolean;
+	callAsync(...args: Append<AsArray<T>, Callback<Error, R>>): void;
+	promise(...args: AsArray<T>): Promise<R>;
+	tap(options: string | (Tap & IfSet<AdditionalOptions>), fn: (...args: AsArray<T>) => R): void;
+	withOptions(options: TapOptions & IfSet<AdditionalOptions>): Omit<this, 'call' | 'callAsync' | 'promise'>;
+}
+
+export class SyncHook<T, R = void, AdditionalOptions = UnsetAdditionalOptions> extends Hook<T, R, AdditionalOptions> {
+	call(...args: AsArray<T>): R;
+}
+
+export class SyncBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<T, R, AdditionalOptions> {}
+export class SyncLoopHook<T, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<T, void, AdditionalOptions> {}
+export class SyncWaterfallHook<T, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<
+	T,
+	AsArray<T>[0],
+	AdditionalOptions
+> {}
+
+declare class AsyncHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends Hook<T, R, AdditionalOptions> {
+	tapAsync(
+		options: string | (Tap & IfSet<AdditionalOptions>),
+		fn: (...args: Append<AsArray<T>, InnerCallback<Error, R>>) => void
+	): void;
+	tapPromise(options: string | (Tap & IfSet<AdditionalOptions>), fn: (...args: AsArray<T>) => Promise<R>): void;
+}
+
+export class AsyncParallelHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	void,
+	AdditionalOptions
+> {}
+export class AsyncParallelBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	R,
+	AdditionalOptions
+> {}
+export class AsyncSeriesHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	void,
+	AdditionalOptions
+> {}
+export class AsyncSeriesBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	R,
+	AdditionalOptions
+> {}
+export class AsyncSeriesLoopHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	void,
+	AdditionalOptions
+> {}
+export class AsyncSeriesWaterfallHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	AsArray<T>[0],
+	AdditionalOptions
+> {}
+
+type HookFactory<H> = (key: any, hook?: H) => H;
+
+interface HookMapInterceptor<H> {
+	factory?: HookFactory<H>;
+}
+
+export class HookMap<H> {
+	constructor(factory: HookFactory<H>, name?: string);
+	name: string | undefined;
+	get(key: any): H | undefined;
+	for(key: any): H;
+	intercept(interceptor: HookMapInterceptor<H>): void;
+}
+
+export class MultiHook<H> {
+	constructor(hooks: H[], name?: string);
+	name: string | undefined;
+	tap(options: string | Tap, fn?: Function): void;
+	tapAsync(options: string | Tap, fn?: Function): void;
+	tapPromise(options: string | Tap, fn?: Function): void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.23-beta.13",
+  "version": "3.1.23-beta.14",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "167f92da3f533240af1a598f58f70b85a365414f"
+  "gitHead": "112bf14c5aaabbb89b6c5d96e1d89bbbd4158e19"
 }