@aplus-frontend/ui 7.19.0-beta.1 → 7.19.0

package/lib/src/business/ap-view/components/menu-list-content.vue.d.ts

@@ -1,13 +1,12 @@
 import { ViewListModel } from '../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, ComponentInternalInstance, ExtractPropTypes, PropType, HTMLAttributes, VNodeProps, AllowedComponentProps, ComponentCustomProps, CreateComponentPublicInstanceWithMixins, GlobalComponents, GlobalDirectives, Slot, ComponentPublicInstance, ComponentOptionsBase, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties } from 'vue';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
-import { FormLabelAlign, ValidateMessages, FieldData, ValidateErrorEntity, NamePath, RuleObject, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
+import { FormLabelAlign, ValidateMessages, FieldData, ValidateErrorEntity, NamePath, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { RequiredMark } from '@aplus-frontend/antdv/es/form/Form';
 import { RuleObject } from '@aplus-frontend/antdv/es/form';
 import { Options } from '../../../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../../../type';
 import { VueTypeDef, VueTypeValidableDef } from '../../../../node_modules/vue-types';
-import { SizeType } from '@aplus-frontend/antdv/es/config-provider';
 import { SizeType } from '@aplus-frontend/antdv/es/button';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
 import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc } from '../../../ap-form';
@@ -111,7 +110,7 @@ declare const _default: DefineComponent<__VLS_Props, {}, {}, {}, {}, ComponentOp
             readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
             readonly initialValues?: Recordable | undefined;
             readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
-            readonly syncToUrl?: (boolean | ((values: Recordable, type: "get" | "set") => Recordable)) | undefined;
+            readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
             readonly syncToUrlPriority?: boolean | undefined;
             readonly autoFocusFirstInput?: boolean | undefined;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/lib/src/business/ap-view/hooks/use-send-to-url.d.ts

@@ -5,6 +5,8 @@ export declare const useSendToUrl: (option: {
     saveDataSource: SaveDataSource;
     sendToUrl: ComputedRef<boolean>;
     tableKey: ComputedRef<string>;
+    extraUrlParams: ComputedRef<(() => Recordable) | undefined>;
+    searchFormModel: ComputedRef<any>;
 }) => {
     mountedData: ComputedRef<Recordable>;
     isValidMountedData: ComputedRef<boolean>;

package/lib/src/business/ap-view/hooks/use-send-to-url.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("@aplus-frontend/utils"),t=require("vue"),l=require("../utils/query.js"),v=s=>{const{saveDataSource:c,sendToUrl:d,tableKey:u}=s;let n,a,o=!1;const r=t.ref({});return t.onMounted(()=>{if(d?.value){try{const e=l.getUrlQuery()[u.value]??"";r.value=e?JSON.parse(decodeURIComponent(e)):{}}catch{r.value={}}n=setInterval(()=>{try{const e=encodeURIComponent(JSON.stringify(c?.getSearchFormValues?.()??{}));e!==a&&(a=e,o=!0)}catch{a=""}o&&(l.setUrlQuery({[u.value]:a}),o=!1)},500)}}),t.onUnmounted(()=>{n&&clearInterval(n)}),{mountedData:t.computed(()=>r.value),isValidMountedData:t.computed(()=>i.isObjectWithContent(r.value))}};exports.useSendToUrl=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("@aplus-frontend/utils"),y=require("lodash-unified"),t=require("vue"),l=require("../utils/query.js"),U=d=>{const{saveDataSource:s,sendToUrl:r,tableKey:u,extraUrlParams:c,searchFormModel:i}=d;let a,o=!1;const n=t.ref({}),h=()=>{try{const e=encodeURIComponent(JSON.stringify({...s?.getSearchFormValues?.(),...c?.value?.()??{}}));e!==a&&(a=e,o=!0)}catch{a=""}o&&(l.setUrlQuery({[u.value]:a}),o=!1)},m=y.debounce(h,500),v=()=>{try{const e=l.getUrlQuery()[u.value]??"";n.value=e?JSON.parse(decodeURIComponent(e)):{}}catch{n.value={}}};return t.watch(i,()=>{r?.value&&m()},{deep:!0,immediate:!0}),t.onMounted(()=>{r?.value&&v()}),{mountedData:t.computed(()=>n.value),isValidMountedData:t.computed(()=>f.isObjectWithContent(n.value))}};exports.useSendToUrl=U;

package/lib/src/business/ap-view/index.d.ts

@@ -6,7 +6,7 @@ declare const ApView: {
     new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ApViewProps> & Readonly<{}>, {
         setFirstDefaultSystemView: (value: boolean) => void;
         setInitToUrl: (value: boolean) => void;
-        mountedData: Recordable;
+        getMountedData: () => Recordable;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
         manual: boolean;
         maxViewNum: number;
@@ -24,7 +24,7 @@ declare const ApView: {
     }, Readonly< ApViewProps> & Readonly<{}>, {
         setFirstDefaultSystemView: (value: boolean) => void;
         setInitToUrl: (value: boolean) => void;
-        mountedData: Recordable;
+        getMountedData: () => Recordable;
     }, {}, {}, {}, {
         manual: boolean;
         maxViewNum: number;
@@ -39,7 +39,7 @@ declare const ApView: {
 } & ComponentOptionsBase<Readonly< ApViewProps> & Readonly<{}>, {
     setFirstDefaultSystemView: (value: boolean) => void;
     setInitToUrl: (value: boolean) => void;
-    mountedData: Recordable;
+    getMountedData: () => Recordable;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
     manual: boolean;
     maxViewNum: number;

package/lib/src/business/ap-view/interface.d.ts

@@ -19,6 +19,10 @@ export interface SaveDataSource {
     resetSearchFormSorterItems?: () => void;
     /** 是否转换搜索表单,默认为 false */
     searchFormTransform?: boolean;
+    /**
+     * searchForm的model,用于当searchFormModel变更时触发url参数更新
+     */
+    searchFormModel?: any;
 }
 export interface ViewCacheOption {
     /** 获取视图列表 */
@@ -98,9 +102,11 @@ export interface ApViewProps {
      * 是否在第一次进入页面时将参数保存在url回显在 searchForm，默认为 true，设置为 false 后，第一次进入页面时 searchForm 将不会将参数保存在url上
      */
     initToUrl?: boolean;
+    /** 额外的保存在url的参数 */
+    extraUrlParams?: () => Recordable;
 }
 export interface ApViewExpose {
     setFirstDefaultSystemView: (value: boolean) => void;
     setInitToUrl: (value: boolean) => void;
-    mountedData: Recordable;
+    getMountedData: () => Recordable;
 }

package/lib/src/config-provider/hooks/use-namespace.d.ts

@@ -2,7 +2,11 @@ import { InjectionKey, Ref, ComputedRef } from 'vue';
 export declare const defaultNamespace = "aplus";
 export declare const namespaceContextKey: InjectionKey<Ref<string | undefined>>;
 export declare const useGetDerivedNamespace: (namespaceOverrides?: Ref<string | undefined>) => ComputedRef<string>;
-export declare const useNamespace: (block: string, namespaceOverrides?: Ref<string | undefined>) => {
+export declare const useNamespace: (
+/**
+ * 块 一般是指组件名
+ */
+block: string, namespaceOverrides?: Ref<string | undefined>) => {
     namespace: ComputedRef<string>;
     b: (blockSuffix?: string) => string;
     e: (element?: string) => string;

package/lib/src/editable-table/form-item.vue.d.ts

@@ -1,5 +1,5 @@
 import { EditableColumnType, EditableTableFormItemExpose, EditableTableFormItemProps } from './interface';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
 declare const _default: <RecordType = any>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & EditableTableFormItemProps<RecordType> & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<EditableTableFormItemExpose>): void;
@@ -36,9 +36,7 @@ declare const _default: <RecordType = any>(__VLS_props: NonNullable<Awaited<type
         }) => void;
     };
     emit: {};
-}>) => VNode<RendererNode, RendererElement, {
-    [key: string]: any;
-}> & {
+}>) => VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

package/lib/src/editable-table/index.vue.d.ts

@@ -1,6 +1,6 @@
 import { Recordable } from '../type';
 import { EditableTableProps, EditableColumnType, EditableTableExpose } from './interface';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
 declare const _default: <RecordType extends Recordable = any>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
         readonly "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -39,9 +39,7 @@ declare const _default: <RecordType extends Recordable = any>(__VLS_props: NonNu
         }) => void;
     };
     emit: (event: "update:value", ...args: any[]) => void;
-}>) => VNode<RendererNode, RendererElement, {
-    [key: string]: any;
-}> & {
+}>) => VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

package/lib/src/scroll-view/index.vue.d.ts

@@ -1,4 +1,4 @@
-import { ScrollBarDirection, InternalScrollBarProps, ColorType } from '../scroll-bar';
+import { ScrollBarDirection, InternalScrollBarProps } from '../scroll-bar';
 import { ScrollOptions, ScrollViewProps } from './interface';
 import { CreateComponentPublicInstanceWithMixins, Ref, ShallowRef, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, DefineComponent, ComputedRef } from 'vue';
 declare function scroll(x?: number, y?: number): void;
@@ -106,8 +106,8 @@ declare const __VLS_component: DefineComponent<ScrollViewProps, {
         onScroll?: ((percent: number) => void) | undefined;
         disabled?: boolean | undefined;
         trackSpeed?: number | undefined;
-        barColor?: ColorType;
-        trackColor?: ColorType;
+        barColor?: import("csstype").Property.BackgroundColor | undefined;
+        trackColor?: import("csstype").Property.BackgroundColor | undefined;
         trackWidth?: number | undefined;
         showTrack?: boolean | undefined;
         onScrollStart?: ((percent: number) => void) | undefined;
@@ -118,8 +118,8 @@ declare const __VLS_component: DefineComponent<ScrollViewProps, {
         onScroll?: ((percent: number) => void) | undefined;
         disabled?: boolean | undefined;
         trackSpeed?: number | undefined;
-        barColor?: ColorType;
-        trackColor?: ColorType;
+        barColor?: import("csstype").Property.BackgroundColor | undefined;
+        trackColor?: import("csstype").Property.BackgroundColor | undefined;
         trackWidth?: number | undefined;
         showTrack?: boolean | undefined;
         onScrollStart?: ((percent: number) => void) | undefined;

package/lib/src/tests/wrapper.d.ts

@@ -1,8 +1,8 @@
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 export declare const Wrapper: DefineComponent<{
-    uiMode?: ("admin" | "aplus") | undefined;
-    lang?: ("en" | "zh-cn") | undefined;
+    uiMode?: "admin" | "aplus" | undefined;
+    lang?: "en" | "zh-cn" | undefined;
 }, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<{
-    uiMode?: ("admin" | "aplus") | undefined;
-    lang?: ("en" | "zh-cn") | undefined;
+    uiMode?: "admin" | "aplus" | undefined;
+    lang?: "en" | "zh-cn" | undefined;
 }> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;

package/lib/src/time-ago/useTimeAgo.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const h=require("dayjs"),r=require("vue"),b=require("./utils.js");function s(n,u){const t=Math.abs(n-u),e={diffMs:t,type:n<u?"ago":"late",diffFormatted:b.formatDuration(t)};return t<60*1e3?(e.unit="s",e.count=Math.round(t/1e3)):t<60*60*1e3?(e.unit="m",e.count=Math.round(t/(60*1e3))):t<24*60*60*1e3?(e.unit="h",e.count=Math.round(t/(60*60*1e3))):t<30*24*60*60*1e3?(e.unit="d",e.count=Math.round(t/(24*60*60*1e3))):t<365*24*60*60*1e3?(e.unit="M",e.count=Math.round(t/(30*24*60*60*1e3))):(e.unit="y",e.count=Math.round(t/365/(24*60*60*1e3))),e}function i(n){return h(n).valueOf()}let p=1;function v(){return p++}const o=new Map;let l,c;function M(n,u){o.set(n,u),o.size&&!c&&(clearInterval(l),l=setInterval(()=>{c=!0;const t=Date.now();o.forEach(e=>{e.interval&&Math.abs(t-e.updated-e.interval)<50&&(e.timeAgo.value=s(e.ts,t),e.updated=t)})},5e3))}function m(n){o.delete(n),o.size||(clearInterval(l),c=!1)}const T=(n,u,t)=>{const e=v(),a=r.ref(s(i(n.value),i(u))),f={ts:i(n.value),timeAgo:a,interval:t.value,updated:Date.now()};return r.watch(()=>n.value,g=>{const d=i(g);f.ts=d,a.value=s(d,i(u))}),M(e,f),r.onBeforeUnmount(()=>{m(e)}),a};exports.default=T;exports.getId=v;exports.getTimeAgo=s;exports.subscribe=M;exports.unsubscribe=m;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const h=require("dayjs"),r=require("vue"),b=require("./utils.js");function s(n,u){const t=Math.abs(n-u),e={diffMs:t,type:n<u?"ago":"late",diffFormatted:b.formatDuration(t)};return t<60*1e3?(e.unit="s",e.count=Math.round(t/1e3)):t<3600*1e3?(e.unit="m",e.count=Math.round(t/(60*1e3))):t<1440*60*1e3?(e.unit="h",e.count=Math.round(t/(3600*1e3))):t<720*60*60*1e3?(e.unit="d",e.count=Math.round(t/(1440*60*1e3))):t<365*24*60*60*1e3?(e.unit="M",e.count=Math.round(t/(720*60*60*1e3))):(e.unit="y",e.count=Math.round(t/365/(1440*60*1e3))),e}function i(n){return h(n).valueOf()}let p=1;function v(){return p++}const o=new Map;let l,c;function M(n,u){o.set(n,u),o.size&&!c&&(clearInterval(l),l=setInterval(()=>{c=!0;const t=Date.now();o.forEach(e=>{e.interval&&Math.abs(t-e.updated-e.interval)<50&&(e.timeAgo.value=s(e.ts,t),e.updated=t)})},5e3))}function m(n){o.delete(n),o.size||(clearInterval(l),c=!1)}const T=(n,u,t)=>{const e=v(),a=r.ref(s(i(n.value),i(u))),f={ts:i(n.value),timeAgo:a,interval:t.value,updated:Date.now()};return r.watch(()=>n.value,g=>{const d=i(g);f.ts=d,a.value=s(d,i(u))}),M(e,f),r.onBeforeUnmount(()=>{m(e)}),a};exports.default=T;exports.getId=v;exports.getTimeAgo=s;exports.subscribe=M;exports.unsubscribe=m;

package/lib/src/type.d.ts

@@ -31,4 +31,5 @@ export type LiteralUnion<T extends U, U> = T | (U & {
 export type RecursivePartial<T> = {
     [P in keyof T]?: T[P] extends object ? RecursivePartial<T[P]> : T[P];
 };
+export type Awaitable<T> = T | Promise<T>;
 export {};

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "7.19.0-beta.1";
+declare const _default: "7.19.0";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="7.19.0-beta.1";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="7.19.0";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "7.19.0-beta.1",
+  "version": "7.19.0",
   "main": "./lib/index.js",
   "type": "module",
   "typings": "./lib/index.d.ts",