@aplus-frontend/ui 6.9.0 → 6.10.0

package/es/src/ap-descriptions/formatter/index.d.ts

@@ -63,6 +63,11 @@ interface NumberExtraProps {
     style?: StyleValue;
     /** 限制小数点位数 */
     precision?: number;
+    /**
+     * 是否固定位数
+     * @default true
+     */
+    isFixed?: boolean;
 }
 /** 处理数字型数据 */
 export declare function number({ value }: FormatOptions, opt: NumberExtraProps): import("vue/jsx-runtime").JSX.Element;

package/es/src/ap-descriptions/formatter/index.mjs

@@ -1,18 +1,18 @@
 import { createVNode as f } from "vue";
-import { getTimeFormatToZone as g } from "@aplus-frontend/utils";
-import { isBoolean as h, merge as p, get as l, debounce as Y } from "lodash-unified";
-import { formatString as A } from "./utils.mjs";
-import { toDecimalMark as b } from "@fruits-chain/utils";
-import { TypographyParagraph as M } from "@aplus-frontend/antdv";
+import { getTimeFormatToZone as g, toThousand as h } from "@aplus-frontend/utils";
+import { isBoolean as Y, merge as p, get as l, debounce as A } from "lodash-unified";
+import { formatString as b } from "./utils.mjs";
+import { TypographyParagraph as d } from "@aplus-frontend/antdv";
+import { toDecimalMark as M } from "@fruits-chain/utils";
 function S({
   value: t
 }, n) {
   if (!(n != null && n.ellipsis))
     return t;
-  const r = {
+  const i = {
     ...n,
     content: t,
-    ellipsis: n.ellipsis ? h(n.ellipsis) ? {
+    ellipsis: n.ellipsis ? Y(n.ellipsis) ? {
       tooltip: t,
       rows: 1
     } : {
@@ -20,61 +20,61 @@ function S({
       tooltip: t
     } : !1
   };
-  return f(M, r, null);
+  return f(d, i, null);
 }
 function D({
   value: t
 }, n) {
   var o;
   const {
-    joinSymbol: r
+    joinSymbol: i
   } = p({
     joinSymbol: " "
   }, n);
-  return (o = t == null ? void 0 : t.join) == null ? void 0 : o.call(t, r);
+  return (o = t == null ? void 0 : t.join) == null ? void 0 : o.call(t, i);
 }
 function u({
   value: t
 }, n) {
   const {
-    zoneAlias: r,
+    zoneAlias: i,
     format: o
   } = p({
     zoneAlias: "LA",
     format: "YYYY-MM-DD HH:mm:ss"
   }, n);
-  return g(t, r, o);
+  return g(t, i, o);
 }
 function y({
   value: t,
   record: n
-}, r) {
+}, i) {
   const {
     fieldList: o,
-    templateString: i = "{0}",
-    formatter: e
-  } = r, s = (o == null ? void 0 : o.map((m, a) => {
+    templateString: e = "{0}",
+    formatter: r
+  } = i, s = (o == null ? void 0 : o.map((m, a) => {
     const c = l(n, m);
-    return e ? e(c, a) : c;
+    return r ? r(c, a) : c;
   })) || [];
-  return s.length === 0 && s.push(t), A(i, s);
+  return s.length === 0 && s.push(t), b(e, s);
 }
 function j({
   value: t,
   record: n
-}, r) {
+}, i) {
   const {
     fieldList: o,
-    format: i = "YYYY-MM-DD HH:mm:ss",
-    joinSymbol: e = "~",
+    format: e = "YYYY-MM-DD HH:mm:ss",
+    joinSymbol: r = "~",
     zoneAlias: s = "LA"
-  } = r, m = Array.isArray(i) ? i : [i, i];
+  } = i, m = Array.isArray(e) ? e : [e, e];
   return y({
     value: t,
     record: n
   }, {
     fieldList: o,
-    templateString: `{0} ${e} {1}`,
+    templateString: `{0} ${r} {1}`,
     formatter(a, c) {
       return u({
         value: a,
@@ -90,16 +90,16 @@ function k({
   record: t
 }, n) {
   const {
-    urlPath: r = "url",
+    urlPath: i = "url",
     namePath: o = "name",
-    style: i,
-    downloadFile: e,
+    style: e,
+    downloadFile: r,
     className: s
-  } = n, m = l(t, o), a = l(t, r), c = Y(() => {
-    e == null || e(a, m);
+  } = n, m = l(t, o), a = l(t, i), c = A(() => {
+    r == null || r(a, m);
   }, 500);
   return f("span", {
-    style: i,
+    style: e,
     class: [s, "ap-descriptions-item-content__link "],
     onClick: c
   }, [m]);
@@ -108,21 +108,22 @@ function H({
   value: t
 }, n) {
   const {
-    style: r = {},
-    precision: o
+    style: i = {},
+    precision: o,
+    isFixed: e = !0
   } = n;
-  let i = "";
+  let r = "";
   try {
-    i = b(t, o);
+    e ? r = h(t, o, "fixed") : r = M(t, o);
   } catch {
-    i = t;
+    r = t;
   }
   return f("span", {
-    style: r,
+    style: i,
     class: "ap-descriptions-item-content__number"
-  }, [i]);
+  }, [r]);
 }
-const N = {
+const B = {
   text: S,
   array: D,
   date: u,
@@ -136,7 +137,7 @@ export {
   k as attachment,
   u as date,
   j as dateRange,
-  N as formatterMap,
+  B as formatterMap,
   H as number,
   y as template,
   S as text

package/es/src/ap-descriptions/interface.d.ts

@@ -12,10 +12,16 @@ type MixObjectPropertyType<O, key extends keyof O> = key extends keyof O ? {
 } : never;
 export type TransformOptionType = MixObjectPropertyType<FormatterMapType, FormatterValueType>;
 type Recordable = Record<string, any>;
+type AllKeys<T, P extends string = '', Level extends unknown[] = []> = Level['length'] extends 5 ? never : T extends object ? {
+    [K in keyof T]: `${P}${K extends string ? K : never}` | (T[K] extends object ? AllKeys<T[K], `${P}${K extends string ? K : never}.`, [
+        ...Level,
+        unknown
+    ]> : never);
+}[keyof T] : never;
 /** 基本描述类型 */
 export interface ItemSchema<T extends Recordable = Recordable> {
     label: VNodeChild | VNode;
-    field: keyof T | (string & {}) | string[];
+    field: Extract<AllKeys<T>, string> | string[];
     span?: number;
     prefix?: VNodeChild | VNode;
     suffix?: VNodeChild | VNode;

package/es/src/ap-form/search-form/hooks/use-collapse-input-count.mjs

@@ -1,24 +1,39 @@
-import { computed as s } from "vue";
-import { useInjectForm as f } from "../../context.mjs";
-import { isArray as e, isObject as a } from "lodash-unified";
-function p(t, r) {
-  return e(r) ? r.reduce((n, o) => n == null ? void 0 : n[o], t) : t == null ? void 0 : t[r];
+import { computed as u } from "vue";
+import { useInjectForm as l } from "../../context.mjs";
+import { isArray as o, isObject as d } from "lodash-unified";
+function a(t, r) {
+  return o(r) ? r.reduce((n, e) => n == null ? void 0 : n[e], t) : t == null ? void 0 : t[r];
 }
-function g(t) {
-  return t == null ? !1 : typeof t == "string" ? t.trim() !== "" : e(t) ? t.length > 0 : a(t) ? Object.keys(t).length > 0 : !0;
+function i(t) {
+  if (t == null)
+    return !1;
+  if (typeof t == "string")
+    return t.trim() !== "";
+  if (o(t))
+    return t.some((n) => i(n));
+  if (d(t)) {
+    const r = Object.keys(t);
+    if (r.length === 0)
+      return !1;
+    for (const n of r)
+      if (i(t[n]))
+        return !0;
+    return !1;
+  }
+  return !0;
 }
-const b = (t) => {
-  const { model: r } = f();
+const y = (t) => {
+  const { model: r } = l();
   return {
-    count: s(() => {
-      let o = 0;
-      return t.value.forEach((u) => {
-        const i = [u.node.props.name].flat(1), c = p(r == null ? void 0 : r.value, i);
-        g(c) && (o += 1);
-      }), o;
+    count: u(() => {
+      let e = 0;
+      return t.value.forEach((s) => {
+        const c = [s.node.props.name].flat(1), f = a(r == null ? void 0 : r.value, c);
+        i(f) && (e += 1);
+      }), e;
     })
   };
 };
 export {
-  b as useCollapseInputCount
+  y as useCollapseInputCount
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.9.0";
+declare const _default: "6.10.0";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.9.0";
+const e = "6.10.0";
 export {
   e as default
 };

package/lib/src/ap-descriptions/formatter/index.d.ts

@@ -63,6 +63,11 @@ interface NumberExtraProps {
     style?: StyleValue;
     /** 限制小数点位数 */
     precision?: number;
+    /**
+     * 是否固定位数
+     * @default true
+     */
+    isFixed?: boolean;
 }
 /** 处理数字型数据 */
 export declare function number({ value }: FormatOptions, opt: NumberExtraProps): import("vue/jsx-runtime").JSX.Element;

package/lib/src/ap-descriptions/formatter/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("vue"),M=require("@aplus-frontend/utils"),a=require("lodash-unified"),S=require("./utils.js"),Y=require("@fruits-chain/utils"),A=require("@aplus-frontend/antdv");function g({value:t},e){if(!(e!=null&&e.ellipsis))return t;const o={...e,content:t,ellipsis:e.ellipsis?a.isBoolean(e.ellipsis)?{tooltip:t,rows:1}:{...e.ellipsis,tooltip:t}:!1};return u.createVNode(A.TypographyParagraph,o,null)}function y({value:t},e){var n;const{joinSymbol:o}=a.merge({joinSymbol:" "},e);return(n=t==null?void 0:t.join)==null?void 0:n.call(t,o)}function f({value:t},e){const{zoneAlias:o,format:n}=a.merge({zoneAlias:"LA",format:"YYYY-MM-DD HH:mm:ss"},e);return M.getTimeFormatToZone(t,o,n)}function p({value:t,record:e},o){const{fieldList:n,templateString:r="{0}",formatter:i}=o,s=(n==null?void 0:n.map((c,l)=>{const m=a.get(e,c);return i?i(m,l):m}))||[];return s.length===0&&s.push(t),S.formatString(r,s)}function d({value:t,record:e},o){const{fieldList:n,format:r="YYYY-MM-DD HH:mm:ss",joinSymbol:i="~",zoneAlias:s="LA"}=o,c=Array.isArray(r)?r:[r,r];return p({value:t,record:e},{fieldList:n,templateString:`{0} ${i} {1}`,formatter(l,m){return f({value:l,record:e},{format:c[m],zoneAlias:s})}})}function h({record:t},e){const{urlPath:o="url",namePath:n="name",style:r,downloadFile:i,className:s}=e,c=a.get(t,n),l=a.get(t,o),m=a.debounce(()=>{i==null||i(l,c)},500);return u.createVNode("span",{style:r,class:[s,"ap-descriptions-item-content__link "],onClick:m},[c])}function b({value:t},e){const{style:o={},precision:n}=e;let r="";try{r=Y.toDecimalMark(t,n)}catch{r=t}return u.createVNode("span",{style:o,class:"ap-descriptions-item-content__number"},[r])}const q={text:g,array:y,date:f,dateRange:d,template:p,number:b,attachment:h};exports.array=y;exports.attachment=h;exports.date=f;exports.dateRange=d;exports.formatterMap=q;exports.number=b;exports.template=p;exports.text=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("vue"),g=require("@aplus-frontend/utils"),a=require("lodash-unified"),S=require("./utils.js"),Y=require("@aplus-frontend/antdv"),A=require("@fruits-chain/utils");function y({value:t},e){if(!(e!=null&&e.ellipsis))return t;const o={...e,content:t,ellipsis:e.ellipsis?a.isBoolean(e.ellipsis)?{tooltip:t,rows:1}:{...e.ellipsis,tooltip:t}:!1};return u.createVNode(Y.TypographyParagraph,o,null)}function d({value:t},e){var n;const{joinSymbol:o}=a.merge({joinSymbol:" "},e);return(n=t==null?void 0:t.join)==null?void 0:n.call(t,o)}function f({value:t},e){const{zoneAlias:o,format:n}=a.merge({zoneAlias:"LA",format:"YYYY-MM-DD HH:mm:ss"},e);return g.getTimeFormatToZone(t,o,n)}function p({value:t,record:e},o){const{fieldList:n,templateString:i="{0}",formatter:r}=o,s=(n==null?void 0:n.map((c,l)=>{const m=a.get(e,c);return r?r(m,l):m}))||[];return s.length===0&&s.push(t),S.formatString(i,s)}function h({value:t,record:e},o){const{fieldList:n,format:i="YYYY-MM-DD HH:mm:ss",joinSymbol:r="~",zoneAlias:s="LA"}=o,c=Array.isArray(i)?i:[i,i];return p({value:t,record:e},{fieldList:n,templateString:`{0} ${r} {1}`,formatter(l,m){return f({value:l,record:e},{format:c[m],zoneAlias:s})}})}function b({record:t},e){const{urlPath:o="url",namePath:n="name",style:i,downloadFile:r,className:s}=e,c=a.get(t,n),l=a.get(t,o),m=a.debounce(()=>{r==null||r(l,c)},500);return u.createVNode("span",{style:i,class:[s,"ap-descriptions-item-content__link "],onClick:m},[c])}function M({value:t},e){const{style:o={},precision:n,isFixed:i=!0}=e;let r="";try{i?r=g.toThousand(t,n,"fixed"):r=A.toDecimalMark(t,n)}catch{r=t}return u.createVNode("span",{style:o,class:"ap-descriptions-item-content__number"},[r])}const q={text:y,array:d,date:f,dateRange:h,template:p,number:M,attachment:b};exports.array=d;exports.attachment=b;exports.date=f;exports.dateRange=h;exports.formatterMap=q;exports.number=M;exports.template=p;exports.text=y;

package/lib/src/ap-descriptions/interface.d.ts

@@ -12,10 +12,16 @@ type MixObjectPropertyType<O, key extends keyof O> = key extends keyof O ? {
 } : never;
 export type TransformOptionType = MixObjectPropertyType<FormatterMapType, FormatterValueType>;
 type Recordable = Record<string, any>;
+type AllKeys<T, P extends string = '', Level extends unknown[] = []> = Level['length'] extends 5 ? never : T extends object ? {
+    [K in keyof T]: `${P}${K extends string ? K : never}` | (T[K] extends object ? AllKeys<T[K], `${P}${K extends string ? K : never}.`, [
+        ...Level,
+        unknown
+    ]> : never);
+}[keyof T] : never;
 /** 基本描述类型 */
 export interface ItemSchema<T extends Recordable = Recordable> {
     label: VNodeChild | VNode;
-    field: keyof T | (string & {}) | string[];
+    field: Extract<AllKeys<T>, string> | string[];
     span?: number;
     prefix?: VNodeChild | VNode;
     suffix?: VNodeChild | VNode;

package/lib/src/ap-form/search-form/hooks/use-collapse-input-count.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("vue"),f=require("../../context.js"),u=require("lodash-unified");function a(t,n){return u.isArray(n)?n.reduce((e,r)=>e==null?void 0:e[r],t):t==null?void 0:t[n]}function l(t){return t==null?!1:typeof t=="string"?t.trim()!=="":u.isArray(t)?t.length>0:u.isObject(t)?Object.keys(t).length>0:!0}const g=t=>{const{model:n}=f.useInjectForm();return{count:c.computed(()=>{let r=0;return t.value.forEach(o=>{const s=[o.node.props.name].flat(1),i=a(n==null?void 0:n.value,s);l(i)&&(r+=1)}),r})}};exports.useCollapseInputCount=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("vue"),l=require("../../context.js"),i=require("lodash-unified");function a(t,e){return i.isArray(e)?e.reduce((n,r)=>n==null?void 0:n[r],t):t==null?void 0:t[e]}function s(t){if(t==null)return!1;if(typeof t=="string")return t.trim()!=="";if(i.isArray(t))return t.some(n=>s(n));if(i.isObject(t)){const e=Object.keys(t);if(e.length===0)return!1;for(const n of e)if(s(t[n]))return!0;return!1}return!0}const d=t=>{const{model:e}=l.useInjectForm();return{count:f.computed(()=>{let r=0;return t.value.forEach(o=>{const u=[o.node.props.name].flat(1),c=a(e==null?void 0:e.value,u);s(c)&&(r+=1)}),r})}};exports.useCollapseInputCount=d;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.9.0";
+declare const _default: "6.10.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="6.9.0";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.10.0";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.9.0",
+  "version": "6.10.0",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -65,14 +65,14 @@
     "@aplus-frontend/hooks": "1.0.7"
   },
   "peerDependencies": {
-    "@aplus-frontend/antdv": "^1.1.10",
+    "@aplus-frontend/antdv": "^1.1.12",
     "@aplus-frontend/icon": "^1.2.6",
     "@aplus-frontend/oss": "^1.1.2",
     "vue": "^3.5.14",
     "vxe-table": "4.11.29"
   },
   "devDependencies": {
-    "@aplus-frontend/antdv": "^1.1.10",
+    "@aplus-frontend/antdv": "^1.1.12",
     "@aplus-frontend/icon": "^1.2.6",
     "@aplus-frontend/oss": "^1.1.2",
     "@types/sortablejs": "^1.15.8",

package/theme/ap-grid/index.css

@@ -684,3 +684,7 @@
   background-color: var(--ap-table-header-bg);
   border-radius: 4px;
 }
+.aplus-ap-grid .vxe-cell--checkbox span.vxe-checkbox--icon {
+  line-height: 0;
+  vertical-align: -1px;
+}

package/theme/ap-grid/index.less

@@ -202,4 +202,8 @@
     background-color: var(--ap-table-header-bg);
     border-radius: 4px;
   }
+  .vxe-cell--checkbox span.vxe-checkbox--icon {
+    line-height: 0;
+    vertical-align: -1px;
+  }
 });

package/theme/index.css

@@ -3578,6 +3578,10 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   background-color: var(--ap-table-header-bg);
   border-radius: 4px;
 }
+.aplus-ap-grid .vxe-cell--checkbox span.vxe-checkbox--icon {
+  line-height: 0;
+  vertical-align: -1px;
+}
 .aplus-editable-grid__header-cell--required {
   color: #FF4D4F;
   padding-right: 2px;