@aplus-frontend/ui 0.5.23 → 0.5.25

package/lib/src/business/ap-select-layout/index.d.ts

@@ -1,5 +1,5 @@
 import { ApSelectItem } from './interface';
-import { PublicProps, ShallowUnwrapRef, VNode, Plugin } from 'vue';
+import { PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement, Plugin } from 'vue';
 export * from './interface';
 declare const ApSelectLayout: (<T extends ApSelectItem>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: {
     attrs: any;
@@ -38,7 +38,9 @@ declare const ApSelectLayout: (<T extends ApSelectItem>(__VLS_props: NonNullable
         (event: "afterEnter", el: Element): void;
         (event: "afterLeave", el: Element): void;
     };
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 }) & ( Plugin & (new (...args: any[]) => {
     $props: {

package/lib/src/business/ap-select-layout/select-layout.vue.d.ts

@@ -1,5 +1,5 @@
 import { ApSelectItem, ApSelectLayoutProps } from './interface';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
 declare const _default: <T extends ApSelectItem>(__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 onOnSelect?: ((value: T) => any) | undefined;
@@ -19,7 +19,9 @@ declare const _default: <T extends ApSelectItem>(__VLS_props: NonNullable<Awaite
         (event: "afterEnter", el: Element): void;
         (event: "afterLeave", el: Element): void;
     };
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

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

@@ -2,11 +2,7 @@ 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,6 +1,6 @@
 import { EditableColumnType, EditableTableFormItemProps } from './interface';
 import { StandardBehaviorOptions } from '../../node_modules/scroll-into-view-if-needed';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
 import { UnwrapRefSimple } from '@vue/reactivity';
 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;
@@ -48,7 +48,9 @@ declare const _default: <RecordType = any>(__VLS_props: NonNullable<Awaited<type
         }) => void;
     };
     emit: {};
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

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

@@ -2,7 +2,7 @@ import { EditableTableProps, EditableColumnType } from './interface';
 import { NamePath, ValidateOptions } from '@aplus-frontend/antdv/es/form/interface';
 import { Recordable } from '../type';
 import { StandardBehaviorOptions } from '../../node_modules/scroll-into-view-if-needed';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } 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;
@@ -53,7 +53,9 @@ declare const _default: <RecordType extends Recordable = any>(__VLS_props: NonNu
         }) => void;
     };
     emit: (event: "update:value", ...args: any[]) => void;
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

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

@@ -1,5 +1,5 @@
 import { ScrollOptions, ScrollViewProps } from './interface';
-import { ScrollBarDirection, InternalScrollBarProps } from '../scroll-bar';
+import { ScrollBarDirection, InternalScrollBarProps, ColorType } from '../scroll-bar';
 import { CreateComponentPublicInstanceWithMixins, Ref, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, DefineComponent, ComputedRef } from 'vue';
 declare function scroll(x?: number, y?: number): void;
 declare function scrollTo({ smooth, left, top }: ScrollOptions): void;
@@ -106,8 +106,8 @@ declare const __VLS_component: DefineComponent<ScrollViewProps, {
         onScroll?: ((percent: number) => void) | undefined;
         disabled?: boolean | undefined;
         trackSpeed?: number | undefined;
-        barColor?: import("csstype").Property.BackgroundColor | undefined;
-        trackColor?: import("csstype").Property.BackgroundColor | undefined;
+        barColor?: ColorType;
+        trackColor?: ColorType;
         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?: import("csstype").Property.BackgroundColor | undefined;
-        trackColor?: import("csstype").Property.BackgroundColor | undefined;
+        barColor?: ColorType;
+        trackColor?: ColorType;
         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/work-order-modal/work-order-modal.vue.d.ts

@@ -1,15 +1,16 @@
 import { WorkOrderModalProps } from './interfaces';
 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 { ButtonSize, SizeType } from '@aplus-frontend/antdv/es/button';
-import { ValidateMessages, FormLabelAlign, FieldData, ValidateErrorEntity, NamePath, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
+import { ValidateMessages, FormLabelAlign, FieldData, ValidateErrorEntity, NamePath, RuleObject, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { RequiredMark } from '@aplus-frontend/antdv/es/form/Form';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
 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 { VueNode } from '@aplus-frontend/antdv/es/_util/type';
-import { ApFormProps, ApFormInternalInstance, WatchFunc } from '..';
+import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc } from '..';
 import { OnCleanup } from '@vue/reactivity';
 declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {} & {
     "update:open": () => any;
@@ -112,7 +113,7 @@ declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, Com
             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;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
         $attrs: {
@@ -766,7 +767,7 @@ declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, Com
         $el: any;
         $options: ComponentOptionsBase<Readonly< ApFormProps> & Readonly<{}>, {
             setFieldsValue: (fields: Partial<any>) => void;
-            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
             clearValidate: (name?: NamePath) => void;
             validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -815,7 +816,7 @@ declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, Com
         syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
     }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
-        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;
         clearValidate: (name?: NamePath) => void;
         validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.5.23",
+  "version": "0.5.25",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -71,13 +71,13 @@
     "@aplus-frontend/utils": "1.0.55"
   },
   "peerDependencies": {
-    "@aplus-frontend/antdv": "^1.1.3",
+    "@aplus-frontend/antdv": "^1.1.4",
     "@aplus-frontend/icon": "^1.2.1",
     "@aplus-frontend/oss": "^1.1.2",
     "vue": "^3.5.13"
   },
   "devDependencies": {
-    "@aplus-frontend/antdv": "^1.1.3",
+    "@aplus-frontend/antdv": "^1.1.4",
     "@aplus-frontend/icon": "^1.2.1",
     "@aplus-frontend/oss": "^1.1.2",
     "@types/sortablejs": "^1.15.8",

package/theme/ap-grid/index.css

@@ -302,6 +302,9 @@
   padding: 12px 16px 16px;
   background-color: #fff;
 }
+.aplus-ap-grid__table-wrapper-card:has(.aplus-ap-grid-pagination-wrapper) {
+  padding-bottom: 0;
+}
 .aplus-ap-grid-pagination {
   margin-top: 16px;
   display: flex;

package/theme/ap-grid/index.less

@@ -68,6 +68,9 @@
   &__table-wrapper-card {
     padding: 12px 16px 16px;
     background-color: #fff;
+    &:has(.@{pg}) {
+      padding-bottom: 0;
+    }
   }
   &-pagination {
     margin-top: 16px;

package/theme/ap-ladder/ap-ladder.css

@@ -20,6 +20,12 @@
   display: inline-block;
   color: #8896B0;
   word-break: break-all;
+  position: relative;
+  justify-content: center;
+}
+.aplus-ap-ladder__value-group-label-semicolon {
+  display: inline-block;
+  padding: 0 3px;
 }
 .aplus-ap-ladder__value-group-value {
   color: #182948;
@@ -29,16 +35,19 @@
   white-space: nowrap;
 }
 .aplus-ap-ladder__value-group-link {
-  cursor: pointer !important;
-  color: #0070ff !important;
-  text-decoration: none !important;
+  cursor: pointer ;
+  color: #0070ff;
+  text-decoration: none ;
 }
-.aplus-ap-ladder__label-align-left {
+.aplus-ap-ladder__value-group-label-left {
   text-align: left;
 }
-.aplus-ap-ladder__label-align-right {
+.aplus-ap-ladder__value-group-label-right {
   text-align: right;
 }
+.aplus-ap-ladder__label-align-space-between {
+  justify-content: space-between;
+}
 .aplus-ap-ladder-base {
   display: flex;
 }

package/theme/ap-ladder/ap-ladder.less

@@ -13,16 +13,22 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    min-width: 0; // Import
+    min-width: 0; 
   }
   &__value-group-value-end{
     justify-content: flex-end;
   }
 
   &__value-group-label{
-    display: inline-block;
+     display: inline-block;
     color: #8896B0;
     word-break: break-all;
+    position: relative;
+    justify-content: center;
+  }
+  &__value-group-label-semicolon{
+    display: inline-block;
+    padding: 0 3px;
   }
   &__value-group-value{
     color: #182948;
@@ -32,15 +38,18 @@
     white-space: nowrap;
   }
   &__value-group-link{
-    cursor: pointer !important;
-    color: @aplus-primary-color !important;
-    text-decoration: none !important;
+    cursor: pointer ;
+    color: @aplus-primary-color;
+    text-decoration: none ;
   }
-  &__label-align-left{
+  &__value-group-label-left{
     text-align: left;
   }
-  &__label-align-right{
+  &__value-group-label-right{
     text-align: right;
+  }
+   &__label-align-space-between{
+    justify-content: space-between
   }
   &-base{
     display: flex;

package/theme/index.css

@@ -608,6 +608,12 @@
   display: inline-block;
   color: #8896B0;
   word-break: break-all;
+  position: relative;
+  justify-content: center;
+}
+.aplus-ap-ladder__value-group-label-semicolon {
+  display: inline-block;
+  padding: 0 3px;
 }
 .aplus-ap-ladder__value-group-value {
   color: #182948;
@@ -617,16 +623,19 @@
   white-space: nowrap;
 }
 .aplus-ap-ladder__value-group-link {
-  cursor: pointer !important;
-  color: #0070ff !important;
-  text-decoration: none !important;
+  cursor: pointer ;
+  color: #0070ff;
+  text-decoration: none ;
 }
-.aplus-ap-ladder__label-align-left {
+.aplus-ap-ladder__value-group-label-left {
   text-align: left;
 }
-.aplus-ap-ladder__label-align-right {
+.aplus-ap-ladder__value-group-label-right {
   text-align: right;
 }
+.aplus-ap-ladder__label-align-space-between {
+  justify-content: space-between;
+}
 .aplus-ap-ladder-base {
   display: flex;
 }
@@ -2306,6 +2315,9 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   padding: 12px 16px 16px;
   background-color: #fff;
 }
+.aplus-ap-grid__table-wrapper-card:has(.aplus-ap-grid-pagination-wrapper) {
+  padding-bottom: 0;
+}
 .aplus-ap-grid-pagination {
   margin-top: 16px;
   display: flex;