@aplus-frontend/ui 0.2.1 → 0.2.2

package/es/src/ap-upload/apUpload.vue.d.ts

@@ -20,7 +20,7 @@ declare const __VLS_component: DefineComponent<{
         default: string;
     };
     value: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ObjectConstructor | ArrayConstructor | StringConstructor)[];
         default: undefined;
     };
     needName: {
@@ -68,7 +68,7 @@ declare const __VLS_component: DefineComponent<{
         default: string;
     };
     value: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ObjectConstructor | ArrayConstructor | StringConstructor)[];
         default: undefined;
     };
     needName: {

package/es/src/ap-upload/components/Picture.vue2.mjs

@@ -14,7 +14,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
 }, ye = { class: "picture-title" }, we = { key: 0 }, ke = { key: 1 }, Te = /* @__PURE__ */ K({
   __name: "Picture",
   setup(Ce, { expose: E }) {
-    const { t: r } = pe(), { b: U } = de("ap-upload-picture"), { put: O } = ie(), B = u("theme"), L = u("dirName"), y = u("accept") || "image/*", w = u("maxSize") ?? 5, A = u("title"), l = u("maxCount") ?? 10, v = u("uploadingCount"), N = u("beforeUpload"), P = u("customRequest"), S = u("getOssAccess"), x = R(null), c = u("value"), _ = u("needName");
+    const { t: r } = pe(), { b: U } = de("ap-upload-picture"), { put: O } = ie(), B = u("theme"), L = u("dirName"), y = u("accept") || "image/*", w = u("maxSize") ?? 5, S = u("title"), l = u("maxCount") ?? 10, v = u("uploadingCount"), A = u("beforeUpload"), N = u("customRequest"), P = u("getOssAccess"), x = R(null), c = u("value"), _ = u("needName");
     let s = R([]);
     const f = [];
     Q(
@@ -33,7 +33,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
       W(async () => {
         const a = [];
         for (let t of e) {
-          const n = ne(_, t), o = ae(_, t), p = await D(S), H = await p.getSignatureUrl(n), J = {
+          const n = ne(_, t), o = ae(_, t), p = await D(P), H = await p.getSignatureUrl(n), J = {
             ...typeof t == "string" ? {} : t,
             ...new File([t], o, {}),
             uid: `${(/* @__PURE__ */ new Date()).getTime()}-${Math.random()}`,
@@ -83,8 +83,8 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
             r("ap.apUpload.maxUploadPicture", { maxCount: l })
           );
         }), !1;
-      if (typeof N == "function") {
-        if (N(e) === !1)
+      if (typeof A == "function") {
+        if (A(e) === !1)
           return !1;
       } else {
         if (e.size > w * 1024 * 1024)
@@ -109,8 +109,8 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
       };
     }
     async function G(e, a) {
-      if (v.value++, typeof P == "function") {
-        P({
+      if (v.value++, typeof N == "function") {
+        N({
           onProgress: (t) => {
             const n = s.value.find((o) => o.uid === e.uid);
             n && (n.percent = t);
@@ -137,7 +137,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
         return;
       }
       try {
-        const t = await D(S);
+        const t = await D(P);
         e.oss = t, s.value.push(e), O({
           file: a,
           dirName: L,
@@ -174,12 +174,12 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
     }
     function I(e) {
       var t;
-      if (e.path) {
+      if (e.path && c) {
         if (Array.isArray(c.value)) {
           const n = f.findIndex(
             (o) => o.uid === e.uid
           );
-          n >= 0 && (c == null || c.value.splice(n, 1), f.splice(n, 1)), c.value.length === 0 && (c.value = void 0);
+          n >= 0 && (c.value = c == null ? void 0 : c.value.toSpliced(n, 1), f.splice(n, 1)), c.value.length === 0 && (c.value = void 0);
         }
       } else
         (t = e == null ? void 0 : e.oss) == null || t.pauseUpload();
@@ -256,7 +256,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
         ])) : $("", !0)
       ]),
       d("div", ye, [
-        i(A) ? (h(), g("div", we, C(i(A)), 1)) : (h(), g("div", ke, C(`${i(r)("ap.apUpload.supportExtension")}：${i(ue)(i(y))}，${i(r)(
+        i(S) ? (h(), g("div", we, C(i(S)), 1)) : (h(), g("div", ke, C(`${i(r)("ap.apUpload.supportExtension")}：${i(ue)(i(y))}，${i(r)(
           "ap.apUpload.maxUploadPictureSize",
           { maxSize: i(w) }
         )}`), 1))

package/es/src/business/ap-summary/style/css.js

@@ -1 +1 @@
-import '@aplus-frontend/ui-theme/dist/ap-summary/ap-summary.css';
+import '@aplus-frontend/ui-theme/dist/ap-summary/index.css';

package/es/src/business/ap-table-modal/table-modal.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as F, ref as m, unref as u, computed as U, h as q, openBlock as $, createBlock as z, mergeProps as b, withCtx as k, createVNode as T } from "vue";
+import { defineComponent as F, ref as m, unref as s, computed as U, h as q, openBlock as $, createBlock as z, mergeProps as b, withCtx as k, createVNode as T } from "vue";
 import { message as h, Modal as H } from "@aplus-frontend/antdv";
 import "../../index.mjs";
 import { cloneDeep as V, omit as S } from "lodash-unified";
@@ -64,14 +64,14 @@ const fe = /* @__PURE__ */ F({
   setup(B, { expose: R, emit: M }) {
     const e = B, P = M, i = m(!1), y = m({}), d = m(null), a = m([]), C = m();
     let c = null, n = null;
-    const K = Y("uiMode", "admin"), { t: g } = J(), _ = async (t = [], o = {}) => {
-      var l, r, s;
-      switch (a.value = [...t], i.value = !0, y.value = o == null ? void 0 : o.extraParams, C.value = o.apTableDataSources || ((l = e.apTableProps) == null ? void 0 : l.dataSource), o.refreshMode || "reset") {
+    const K = Y("uiMode", "admin"), { t: g } = J(), _ = async (o = [], t = {}) => {
+      var l, r, u;
+      switch (a.value = [...o], i.value = !0, y.value = t == null ? void 0 : t.extraParams, C.value = t.apTableDataSources || ((l = e.apTableProps) == null ? void 0 : l.dataSource), t.refreshMode || "reset") {
         case "reset":
           (r = d.value) == null || r.reset();
           break;
         case "submit":
-          (s = d.value) == null || s.submit();
+          (u = d.value) == null || u.submit();
           break;
         case "none":
           break;
@@ -81,13 +81,13 @@ const fe = /* @__PURE__ */ F({
       });
     }, w = () => {
       i.value = !1, c = null, n == null || n(x.ModalCancel), n = null;
-    }, I = async (t) => {
-      t = W({
-        ...t,
+    }, I = async (o) => {
+      o = W({
+        ...o,
         ...y.value
       });
-      const o = e.api, { records: l, total: r } = await o(t);
-      return console.log("records", l), {
+      const t = e.api, { records: l, total: r } = await t(o);
+      return {
         data: l,
         total: r
       };
@@ -97,8 +97,8 @@ const fe = /* @__PURE__ */ F({
         return;
       }
       if (e.getRowKey) {
-        const t = V(u(a)), o = t.map(e.getRowKey);
-        P("finish", o, t), c == null || c({ keys: o, rows: t });
+        const o = V(s(a)), t = o.map(e.getRowKey);
+        P("finish", t, o), c == null || c({ keys: t, rows: o });
       } else {
         n == null || n(x.NotFineGetRowKey);
         return;
@@ -106,28 +106,28 @@ const fe = /* @__PURE__ */ F({
       i.value = !1;
     }, A = U(() => {
       if (!e.getRowKey) return;
-      const t = e.getRowKey;
+      const o = e.getRowKey;
       return {
         fixed: !0,
-        selectedRowKeys: a.value.map(t),
+        selectedRowKeys: a.value.map(o),
         columnWidth: 50,
         preserveSelectedRowKeys: !0,
-        onSelectAll(o, l) {
-          var s, p;
+        onSelectAll(t, l) {
+          var u, p;
           if (l.length > e.maxCount) {
             h.warning(
               g("ap.apTableModal.messageMaxCount", { maxCount: e.maxCount })
             );
             return;
           }
-          const r = (s = d.value) == null ? void 0 : s.dataSource;
-          if (o) {
-            const f = u(r).filter((v) => !a.value.some((E) => t(E) === t(v)));
+          const r = (u = d.value) == null ? void 0 : u.dataSource;
+          if (t) {
+            const f = s(r).filter((v) => !a.value.some((E) => o(E) === o(v)));
             a.value = a.value.concat(f);
           } else
-            a.value = (p = a.value) == null ? void 0 : p.filter((f) => !r.some((v) => t(v) === t(f)));
+            a.value = (p = a.value) == null ? void 0 : p.filter((f) => !r.some((v) => o(v) === o(f)));
         },
-        onSelect(o, l) {
+        onSelect(t, l) {
           if (l) {
             if (a.value.length >= e.maxCount) {
               h.warning(
@@ -135,16 +135,16 @@ const fe = /* @__PURE__ */ F({
               );
               return;
             }
-            a.value.push(o);
+            a.value.push(t);
           } else {
             const r = a.value.findIndex(
-              (s) => t(o) === t(s)
+              (u) => o(t) === o(u)
             );
             a.value.splice(r, 1);
           }
         },
-        getCheckboxProps: (o) => ({
-          disabled: typeof e.disabledCheckbox == "function" ? e.disabledCheckbox(o, a.value) : e.disabledCheckbox
+        getCheckboxProps: (t) => ({
+          disabled: typeof e.disabledCheckbox == "function" ? e.disabledCheckbox(t, a.value) : e.disabledCheckbox
           // Column configuration not to be checked
         }),
         ...e.rowSelection || {}
@@ -161,11 +161,11 @@ const fe = /* @__PURE__ */ F({
       }
     ) : e.title, N = () => d.value, O = () => {
       a.value = [];
-    }, G = (t) => {
-      const o = e.getRowKey;
-      if (!o) return;
+    }, G = (o) => {
+      const t = e.getRowKey;
+      if (!t) return;
       const l = a.value.findIndex(
-        (r) => o(t) === o(r)
+        (r) => t(o) === t(r)
       );
       a.value.splice(l, 1);
     };
@@ -173,14 +173,14 @@ const fe = /* @__PURE__ */ F({
       open: _,
       close: w,
       getApTableInstance: N
-    }), (t, o) => ($(), z(u(H), b(
+    }), (o, t) => ($(), z(s(H), b(
       {
         onOk: L,
         onCancel: w,
         open: i.value,
-        "onUpdate:open": o[0] || (o[0] = (l) => i.value = l)
+        "onUpdate:open": t[0] || (t[0] = (l) => i.value = l)
       },
-      u(S)(e, [
+      s(S)(e, [
         "api",
         "getRowKey",
         "centered",
@@ -207,15 +207,15 @@ const fe = /* @__PURE__ */ F({
           onDeleteItem: G
         }), {
           default: k(() => [
-            T(u(Z), b({
+            T(s(Z), b({
               scroll: { y: "100%" },
               style: { padding: "0px" },
-              columns: t.columns,
+              columns: o.columns,
               request: I,
-              "row-key": t.getRowKey,
+              "row-key": o.getRowKey,
               "row-selection": A.value,
-              bordered: u(K) === "admin"
-            }, u(S)(e.apTableProps, "dataSource"), {
+              bordered: s(K) === "admin"
+            }, s(S)(e.apTableProps, "dataSource"), {
               ref_key: "apTableRef",
               ref: d,
               "data-source": C.value

package/es/src/editable-table/interface.d.ts

@@ -2,11 +2,11 @@ import { ColumnType, TableProps } from '@aplus-frontend/antdv/es/table';
 import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType, ValueEnum } from '../ap-table';
 import { NamePath, ValidateOptions } from '@aplus-frontend/antdv/es/form/interface';
 import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
-import { FormItemProps } from '@aplus-frontend/antdv';
 import { VNode } from 'vue';
 import { EllipsisConfig } from '@aplus-frontend/antdv/es/typography/Base';
 import { StandardBehaviorOptions } from '../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../type';
+import { ApFormItemProps } from '../ap-form';
 export type EditableColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ColumnType<RecordType>, 'children' | 'customRender' | 'ellipsis'> & {
     children?: EditableColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**
@@ -100,7 +100,7 @@ export type EditableTableFormItemProps<RecordType = any> = Omit<EditableTablePro
     /**
      * 额外的表单项配置属性
      */
-    formItem?: Partial<Omit<FormItemProps, 'name' | 'label'>>;
+    formItem?: Partial<Omit<ApFormItemProps, 'name' | 'label'>>;
 };
 export type EditableTableExpose<ModelType = any, RecordType = any> = {
     /**

package/lib/src/ap-upload/apUpload.vue.d.ts

@@ -20,7 +20,7 @@ declare const __VLS_component: DefineComponent<{
         default: string;
     };
     value: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ObjectConstructor | ArrayConstructor | StringConstructor)[];
         default: undefined;
     };
     needName: {
@@ -68,7 +68,7 @@ declare const __VLS_component: DefineComponent<{
         default: string;
     };
     value: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ObjectConstructor | ArrayConstructor | StringConstructor)[];
         default: undefined;
     };
     needName: {

package/lib/src/ap-upload/components/Picture.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../../config-provider/index.js");const v=require("../utils/returnData.js"),S=require("@ant-design/icons-vue"),y=require("../hooks/useOss.js"),j=require("../utils/accept.js"),l=require("@aplus-frontend/antdv"),T=require("lodash-unified"),L=require("../../config-provider/hooks/use-locale.js"),M=require("../../config-provider/hooks/use-namespace.js"),G=["accept"],H={class:"picture-context"},J={class:"picture-item-box"},K=["src"],Q={class:"picture-item-shadow"},W=["onClick"],X={key:0,class:"picture-item-uploading"},Y={class:"picture-title"},Z={key:0},F={key:1},ee=e.defineComponent({__name:"Picture",setup(te,{expose:q}){const{t:r}=L.useLocale(),{b:_}=M.useNamespace("ap-upload-picture"),{put:V}=y.useOss(),P=e.inject("theme"),b=e.inject("dirName"),h=e.inject("accept")||"image/*",k=e.inject("maxSize")??5,x=e.inject("title"),u=e.inject("maxCount")??10,f=e.inject("uploadingCount"),w=e.inject("beforeUpload"),C=e.inject("customRequest"),N=e.inject("getOssAccess"),m=e.ref(null),i=e.inject("value"),g=e.inject("needName");let o=e.ref([]);const p=[];e.watch(()=>i==null?void 0:i.value,async function(t){var s;!((s=o==null?void 0:o.value)!=null&&s.length)&&t&&U(t)},{immediate:!0});function U(t){if(!t){i.value=void 0,p.splice(0,p.length),o.value=[];return}e.nextTick(async()=>{const s=[];for(let n of t){const a=v.getPath(g,n),c=v.getName(g,n),d=await y.getOssInstance(N),z=await d.getSignatureUrl(a),O={...typeof n=="string"?{}:n,...new File([n],c,{}),uid:`${new Date().getTime()}-${Math.random()}`,thumbUrl:z,status:"success",percent:100,path:a};s.push(O),d.destroy()}if(u&&s.length>u){l.message.warning(r("ap.apUpload.fileInitializationException",{maxCount:u}));return}s.forEach(n=>{o.value.push(n),p.push({uid:n.uid,path:n.path})}),i.value=t})}q({setValue:U});function A(){var t;(t=m.value)==null||t.click()}function I(t){const s=t.target;D(s==null?void 0:s.files)}function D(t){if(t!=null&&t.length)for(let s=0;s<t.length;s++)R(t[s]);m.value&&(m.value.value="")}let E;function R(t){if(u&&u>1&&o.value.length>=u)return clearTimeout(E),E=setTimeout(()=>{l.message.warning(r("ap.apUpload.maxUploadPicture",{maxCount:u}))}),!1;if(typeof w=="function"){if(w(t)===!1)return!1}else{if(t.size>k*1024*1024)return l.message.warning(r("ap.apUpload.maxUploadFileSize",{maxSize:k})),!1;if(!/image\/\w+/.test(t.type)||!j.fileMatchesAccept(t,h))return l.message.warning(r("ap.apUpload.pictureFormatNotSupported")),!1}const s=new FileReader;s.readAsDataURL(t),s.onload=function(){const n={...t,uid:`${new Date().getTime()}-${Math.random()}`,thumbUrl:this.result,status:"uploading",percent:0};$(n,t)},s.onerror=function(){l.message.warning(r("ap.apUpload.imageParsingFailed"))}}async function $(t,s){if(f.value++,typeof C=="function"){C({onProgress:n=>{const a=o.value.find(c=>c.uid===t.uid);a&&(a.percent=n)},onError:n=>{l.message.warning(n||r("ap.apUpload.networkAnomaly"));const a=o.value.findIndex(c=>c.uid===t.uid);a>-1&&o.value.splice(a,1),f.value--},onSuccess:n=>{const a=o.value.find(c=>c.uid===t.uid);a&&(a.status="success",a.path=n),i.value=[...i.value||[],v.getReturnData(g,n,s.name)],p.push({uid:t.uid,path:n}),f.value--},file:s});return}try{const n=await y.getOssInstance(N);t.oss=n,o.value.push(t),V({file:s,dirName:b,oss:n,successCallBack(a){const c=o.value.find(d=>d.uid===t.uid);c&&(c.status="success",c.path=a),i.value=[...i.value||[],v.getReturnData(g,a,s.name)],p.push({uid:t.uid,path:a}),f.value--},errorCallBack(a){l.message.warning(a||r("ap.apUpload.networkAnomaly"));const c=o.value.findIndex(d=>d.uid===t.uid);c>-1&&o.value.splice(c,1),f.value--},progressCallBack(a){const c=o.value.find(d=>d.uid===t.uid);c&&(c.percent=a)}})}catch(n){l.message.warning(typeof(n==null?void 0:n.message)=="string"?n.message:r("ap.apUpload.networkAnomaly"));const a=o.value.findIndex(c=>c.uid===t.uid);a>-1&&o.value.splice(a,1),f.value--}}function B(t){var n;if(t.path){if(Array.isArray(i.value)){const a=p.findIndex(c=>c.uid===t.uid);a>=0&&(i==null||i.value.splice(a,1),p.splice(a,1)),i.value.length===0&&(i.value=void 0)}}else(n=t==null?void 0:t.oss)==null||n.pauseUpload();const s=o.value.findIndex(a=>a.uid===t.uid);return o.value.splice(s,1),Promise.resolve(!0)}return(t,s)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass({[e.unref(_)()]:!0,[e.unref(_)("admin")]:e.unref(P)==="admin"})},[e.createElementVNode("input",{style:{display:"none"},type:"file",ref_key:"fileRef",ref:m,accept:e.unref(h),onChange:I},null,40,G),e.createElementVNode("div",H,[e.renderSlot(t.$slots,"pictureContext",{fileList:e.unref(o).map(n=>{var a;return{...e.unref(T.omit)(n,"oss"),oss:{pauseUpload:(a=n==null?void 0:n.oss)==null?void 0:a.pauseUpload}}}),remove:B},()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(o),n=>(e.openBlock(),e.createElementBlock("div",{key:n.uid,class:"picture-item"},[e.createElementVNode("div",J,[e.createElementVNode("img",{src:n.thumbUrl,alt:""},null,8,K),e.withDirectives(e.createElementVNode("div",Q,[e.createElementVNode("div",{class:"picture-item-close",onClick:a=>B(n)},[e.createVNode(e.unref(S.CloseOutlined))],8,W),n.status==="uploading"?(e.openBlock(),e.createElementBlock("div",X,[e.createVNode(e.unref(l.Progress),{percent:n.percent,strokeColor:"#ffffff",trailColor:"rgba(255, 255, 255, 0.3)",size:4,showInfo:!1},null,8,["percent"])])):e.createCommentVNode("",!0)],512),[[e.vShow,n.status==="uploading"]])])]))),128))]),e.unref(u)===void 0||e.unref(o).length<e.unref(u)?(e.openBlock(),e.createElementBlock("div",{key:0,class:"picture-upload",onClick:A},[e.createVNode(e.unref(S.PlusOutlined)),e.createElementVNode("div",null,e.toDisplayString(e.unref(r)("ap.apUpload.update")),1)])):e.createCommentVNode("",!0)]),e.createElementVNode("div",Y,[e.unref(x)?(e.openBlock(),e.createElementBlock("div",Z,e.toDisplayString(e.unref(x)),1)):(e.openBlock(),e.createElementBlock("div",F,e.toDisplayString(`${e.unref(r)("ap.apUpload.supportExtension")}：${e.unref(j.getAcceptText)(e.unref(h))}，${e.unref(r)("ap.apUpload.maxUploadPictureSize",{maxSize:e.unref(k)})}`),1))])],2))}});exports.default=ee;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../../config-provider/index.js");const v=require("../utils/returnData.js"),S=require("@ant-design/icons-vue"),y=require("../hooks/useOss.js"),j=require("../utils/accept.js"),l=require("@aplus-frontend/antdv"),T=require("lodash-unified"),L=require("../../config-provider/hooks/use-locale.js"),M=require("../../config-provider/hooks/use-namespace.js"),G=["accept"],H={class:"picture-context"},J={class:"picture-item-box"},K=["src"],Q={class:"picture-item-shadow"},W=["onClick"],X={key:0,class:"picture-item-uploading"},Y={class:"picture-title"},Z={key:0},F={key:1},ee=e.defineComponent({__name:"Picture",setup(te,{expose:q}){const{t:r}=L.useLocale(),{b:_}=M.useNamespace("ap-upload-picture"),{put:V}=y.useOss(),P=e.inject("theme"),b=e.inject("dirName"),h=e.inject("accept")||"image/*",k=e.inject("maxSize")??5,x=e.inject("title"),u=e.inject("maxCount")??10,f=e.inject("uploadingCount"),w=e.inject("beforeUpload"),C=e.inject("customRequest"),N=e.inject("getOssAccess"),m=e.ref(null),i=e.inject("value"),g=e.inject("needName");let o=e.ref([]);const p=[];e.watch(()=>i==null?void 0:i.value,async function(t){var s;!((s=o==null?void 0:o.value)!=null&&s.length)&&t&&U(t)},{immediate:!0});function U(t){if(!t){i.value=void 0,p.splice(0,p.length),o.value=[];return}e.nextTick(async()=>{const s=[];for(let n of t){const a=v.getPath(g,n),c=v.getName(g,n),d=await y.getOssInstance(N),z=await d.getSignatureUrl(a),O={...typeof n=="string"?{}:n,...new File([n],c,{}),uid:`${new Date().getTime()}-${Math.random()}`,thumbUrl:z,status:"success",percent:100,path:a};s.push(O),d.destroy()}if(u&&s.length>u){l.message.warning(r("ap.apUpload.fileInitializationException",{maxCount:u}));return}s.forEach(n=>{o.value.push(n),p.push({uid:n.uid,path:n.path})}),i.value=t})}q({setValue:U});function A(){var t;(t=m.value)==null||t.click()}function I(t){const s=t.target;D(s==null?void 0:s.files)}function D(t){if(t!=null&&t.length)for(let s=0;s<t.length;s++)R(t[s]);m.value&&(m.value.value="")}let E;function R(t){if(u&&u>1&&o.value.length>=u)return clearTimeout(E),E=setTimeout(()=>{l.message.warning(r("ap.apUpload.maxUploadPicture",{maxCount:u}))}),!1;if(typeof w=="function"){if(w(t)===!1)return!1}else{if(t.size>k*1024*1024)return l.message.warning(r("ap.apUpload.maxUploadFileSize",{maxSize:k})),!1;if(!/image\/\w+/.test(t.type)||!j.fileMatchesAccept(t,h))return l.message.warning(r("ap.apUpload.pictureFormatNotSupported")),!1}const s=new FileReader;s.readAsDataURL(t),s.onload=function(){const n={...t,uid:`${new Date().getTime()}-${Math.random()}`,thumbUrl:this.result,status:"uploading",percent:0};$(n,t)},s.onerror=function(){l.message.warning(r("ap.apUpload.imageParsingFailed"))}}async function $(t,s){if(f.value++,typeof C=="function"){C({onProgress:n=>{const a=o.value.find(c=>c.uid===t.uid);a&&(a.percent=n)},onError:n=>{l.message.warning(n||r("ap.apUpload.networkAnomaly"));const a=o.value.findIndex(c=>c.uid===t.uid);a>-1&&o.value.splice(a,1),f.value--},onSuccess:n=>{const a=o.value.find(c=>c.uid===t.uid);a&&(a.status="success",a.path=n),i.value=[...i.value||[],v.getReturnData(g,n,s.name)],p.push({uid:t.uid,path:n}),f.value--},file:s});return}try{const n=await y.getOssInstance(N);t.oss=n,o.value.push(t),V({file:s,dirName:b,oss:n,successCallBack(a){const c=o.value.find(d=>d.uid===t.uid);c&&(c.status="success",c.path=a),i.value=[...i.value||[],v.getReturnData(g,a,s.name)],p.push({uid:t.uid,path:a}),f.value--},errorCallBack(a){l.message.warning(a||r("ap.apUpload.networkAnomaly"));const c=o.value.findIndex(d=>d.uid===t.uid);c>-1&&o.value.splice(c,1),f.value--},progressCallBack(a){const c=o.value.find(d=>d.uid===t.uid);c&&(c.percent=a)}})}catch(n){l.message.warning(typeof(n==null?void 0:n.message)=="string"?n.message:r("ap.apUpload.networkAnomaly"));const a=o.value.findIndex(c=>c.uid===t.uid);a>-1&&o.value.splice(a,1),f.value--}}function B(t){var n;if(t.path&&i){if(Array.isArray(i.value)){const a=p.findIndex(c=>c.uid===t.uid);a>=0&&(i.value=i==null?void 0:i.value.toSpliced(a,1),p.splice(a,1)),i.value.length===0&&(i.value=void 0)}}else(n=t==null?void 0:t.oss)==null||n.pauseUpload();const s=o.value.findIndex(a=>a.uid===t.uid);return o.value.splice(s,1),Promise.resolve(!0)}return(t,s)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass({[e.unref(_)()]:!0,[e.unref(_)("admin")]:e.unref(P)==="admin"})},[e.createElementVNode("input",{style:{display:"none"},type:"file",ref_key:"fileRef",ref:m,accept:e.unref(h),onChange:I},null,40,G),e.createElementVNode("div",H,[e.renderSlot(t.$slots,"pictureContext",{fileList:e.unref(o).map(n=>{var a;return{...e.unref(T.omit)(n,"oss"),oss:{pauseUpload:(a=n==null?void 0:n.oss)==null?void 0:a.pauseUpload}}}),remove:B},()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(o),n=>(e.openBlock(),e.createElementBlock("div",{key:n.uid,class:"picture-item"},[e.createElementVNode("div",J,[e.createElementVNode("img",{src:n.thumbUrl,alt:""},null,8,K),e.withDirectives(e.createElementVNode("div",Q,[e.createElementVNode("div",{class:"picture-item-close",onClick:a=>B(n)},[e.createVNode(e.unref(S.CloseOutlined))],8,W),n.status==="uploading"?(e.openBlock(),e.createElementBlock("div",X,[e.createVNode(e.unref(l.Progress),{percent:n.percent,strokeColor:"#ffffff",trailColor:"rgba(255, 255, 255, 0.3)",size:4,showInfo:!1},null,8,["percent"])])):e.createCommentVNode("",!0)],512),[[e.vShow,n.status==="uploading"]])])]))),128))]),e.unref(u)===void 0||e.unref(o).length<e.unref(u)?(e.openBlock(),e.createElementBlock("div",{key:0,class:"picture-upload",onClick:A},[e.createVNode(e.unref(S.PlusOutlined)),e.createElementVNode("div",null,e.toDisplayString(e.unref(r)("ap.apUpload.update")),1)])):e.createCommentVNode("",!0)]),e.createElementVNode("div",Y,[e.unref(x)?(e.openBlock(),e.createElementBlock("div",Z,e.toDisplayString(e.unref(x)),1)):(e.openBlock(),e.createElementBlock("div",F,e.toDisplayString(`${e.unref(r)("ap.apUpload.supportExtension")}：${e.unref(j.getAcceptText)(e.unref(h))}，${e.unref(r)("ap.apUpload.maxUploadPictureSize",{maxSize:e.unref(k)})}`),1))])],2))}});exports.default=ee;

package/lib/src/business/ap-summary/style/css.js

@@ -1 +1 @@
-import '@aplus-frontend/ui-theme/dist/ap-summary/ap-summary.css';
+import '@aplus-frontend/ui-theme/dist/ap-summary/index.css';

package/lib/src/business/ap-table-modal/table-modal.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const o=require("vue"),v=require("@aplus-frontend/antdv");require("../../index.js");const y=require("lodash-unified"),L=require("@aplus-frontend/utils");require("./modal-title.vue.js");const b=require("./interface.js");require("./table-layout/index.vue.js");const N=require("../../config-provider/hooks/use-global-config.js"),D=require("../../config-provider/hooks/use-locale.js"),E=require("./modal-title.vue2.js"),G=require("./table-layout/index.vue2.js"),U=require("../../ap-table/index.js"),F=o.defineComponent({__name:"table-modal",props:{columns:{},getRowKey:{},api:{type:Function,default:async()=>({records:[],total:0})},apTableProps:{},maxCount:{default:1/0},isRenderModalTitleSuffix:{type:Boolean,default:!0},renderModalTitleSuffix:{},disabledCheckbox:{type:[Boolean,Function]},rowSelection:{},tableLayoutConfig:{},prefixCls:{},confirmLoading:{type:Boolean,default:void 0},title:{},closable:{type:Boolean,default:void 0},closeIcon:{},onCancel:{},"onUpdate:visible":{},"onUpdate:open":{},onChange:{},afterClose:{},centered:{type:Boolean,default:void 0},width:{},footer:{},okText:{},okType:{},cancelText:{},icon:{},maskClosable:{type:Boolean,default:void 0},forceRender:{type:Boolean,default:void 0},okButtonProps:{},cancelButtonProps:{},destroyOnClose:{type:Boolean,default:void 0},wrapClassName:{},maskTransitionName:{},transitionName:{},getContainer:{type:[String,Boolean,Function],default:void 0},zIndex:{},bodyStyle:{},maskStyle:{},mask:{type:Boolean,default:void 0},keyboard:{type:Boolean,default:void 0},wrapProps:{},focusTriggerAfterClose:{type:Boolean,default:void 0},modalRender:{},mousePosition:{}},emits:["finish"],setup(k,{expose:T,emit:h}){const e=k,S=h,i=o.ref(!1),x=o.ref({}),d=o.ref(null),l=o.ref([]),g=o.ref();let c=null,r=null;const _=N.useGlobalConfig("uiMode","admin"),{t:C}=D.useLocale(),R=async(a=[],t={})=>{var n,u,s;switch(l.value=[...a],i.value=!0,x.value=t==null?void 0:t.extraParams,g.value=t.apTableDataSources||((n=e.apTableProps)==null?void 0:n.dataSource),t.refreshMode||"reset"){case"reset":(u=d.value)==null||u.reset();break;case"submit":(s=d.value)==null||s.submit();break;case"none":break}return new Promise((p,f)=>{c=p,r=f})},w=()=>{i.value=!1,c=null,r==null||r(b.AsyncOpenResultError.ModalCancel),r=null},M=async a=>{a=L.transformTableParams({...a,...x.value});const t=e.api,{records:n,total:u}=await t(a);return console.log("records",n),{data:n,total:u}},P=()=>{if(l.value.length>e.maxCount){r==null||r(b.AsyncOpenResultError.ExceedMaxCount);return}if(e.getRowKey){const a=y.cloneDeep(o.unref(l)),t=a.map(e.getRowKey);S("finish",t,a),c==null||c({keys:t,rows:a})}else{r==null||r(b.AsyncOpenResultError.NotFineGetRowKey);return}i.value=!1},B=o.computed(()=>{if(!e.getRowKey)return;const a=e.getRowKey;return{fixed:!0,selectedRowKeys:l.value.map(a),columnWidth:50,preserveSelectedRowKeys:!0,onSelectAll(t,n){var s,p;if(n.length>e.maxCount){v.message.warning(C("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}const u=(s=d.value)==null?void 0:s.dataSource;if(t){const f=o.unref(u).filter(m=>!l.value.some(A=>a(A)===a(m)));l.value=l.value.concat(f)}else l.value=(p=l.value)==null?void 0:p.filter(f=>!u.some(m=>a(m)===a(f)))},onSelect(t,n){if(n){if(l.value.length>=e.maxCount){v.message.warning(C("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}l.value.push(t)}else{const u=l.value.findIndex(s=>a(t)===a(s));l.value.splice(u,1)}},getCheckboxProps:t=>({disabled:typeof e.disabledCheckbox=="function"?e.disabledCheckbox(t,l.value):e.disabledCheckbox}),...e.rowSelection||{}}}),q=()=>e.isRenderModalTitleSuffix?o.h(E.default,{title:e.title,count:l.value.length||0,maxCount:e.maxCount},{default:e.renderModalTitleSuffix??void 0}):e.title,K=()=>d.value,I=()=>{l.value=[]},O=a=>{const t=e.getRowKey;if(!t)return;const n=l.value.findIndex(u=>t(a)===t(u));l.value.splice(n,1)};return T({open:R,close:w,getApTableInstance:K}),(a,t)=>(o.openBlock(),o.createBlock(o.unref(v.Modal),o.mergeProps({onOk:P,onCancel:w,open:i.value,"onUpdate:open":t[0]||(t[0]=n=>i.value=n)},o.unref(y.omit)(e,["api","getRowKey","centered","apTableProps","onOk","maxCount","title","renderModalTitleSuffix","isRenderModalTitleSuffix","rowSelection","disabledCheckbox","tableLayoutConfig"]),{title:q(),"body-style":{maxHeight:"calc(100vh - 205px)",overflowY:"scroll"},centered:e.centered??!0}),{default:o.withCtx(()=>[o.createVNode(G.default,o.mergeProps(e.tableLayoutConfig||{},{onClear:I,"selected-list":l.value,onDeleteItem:O}),{default:o.withCtx(()=>[o.createVNode(o.unref(U.ApTable),o.mergeProps({scroll:{y:"100%"},style:{padding:"0px"},columns:a.columns,request:M,"row-key":a.getRowKey,"row-selection":B.value,bordered:o.unref(_)==="admin"},o.unref(y.omit)(e.apTableProps,"dataSource"),{ref_key:"apTableRef",ref:d,"data-source":g.value}),null,16,["columns","row-key","row-selection","bordered","data-source"])]),_:1},16,["selected-list"])]),_:1},16,["open","title","centered"]))}});exports.default=F;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const o=require("vue"),v=require("@aplus-frontend/antdv");require("../../index.js");const y=require("lodash-unified"),L=require("@aplus-frontend/utils");require("./modal-title.vue.js");const b=require("./interface.js");require("./table-layout/index.vue.js");const N=require("../../config-provider/hooks/use-global-config.js"),D=require("../../config-provider/hooks/use-locale.js"),E=require("./modal-title.vue2.js"),G=require("./table-layout/index.vue2.js"),U=require("../../ap-table/index.js"),F=o.defineComponent({__name:"table-modal",props:{columns:{},getRowKey:{},api:{type:Function,default:async()=>({records:[],total:0})},apTableProps:{},maxCount:{default:1/0},isRenderModalTitleSuffix:{type:Boolean,default:!0},renderModalTitleSuffix:{},disabledCheckbox:{type:[Boolean,Function]},rowSelection:{},tableLayoutConfig:{},prefixCls:{},confirmLoading:{type:Boolean,default:void 0},title:{},closable:{type:Boolean,default:void 0},closeIcon:{},onCancel:{},"onUpdate:visible":{},"onUpdate:open":{},onChange:{},afterClose:{},centered:{type:Boolean,default:void 0},width:{},footer:{},okText:{},okType:{},cancelText:{},icon:{},maskClosable:{type:Boolean,default:void 0},forceRender:{type:Boolean,default:void 0},okButtonProps:{},cancelButtonProps:{},destroyOnClose:{type:Boolean,default:void 0},wrapClassName:{},maskTransitionName:{},transitionName:{},getContainer:{type:[String,Boolean,Function],default:void 0},zIndex:{},bodyStyle:{},maskStyle:{},mask:{type:Boolean,default:void 0},keyboard:{type:Boolean,default:void 0},wrapProps:{},focusTriggerAfterClose:{type:Boolean,default:void 0},modalRender:{},mousePosition:{}},emits:["finish"],setup(k,{expose:T,emit:h}){const e=k,S=h,i=o.ref(!1),x=o.ref({}),d=o.ref(null),n=o.ref([]),g=o.ref();let c=null,r=null;const _=N.useGlobalConfig("uiMode","admin"),{t:C}=D.useLocale(),R=async(a=[],t={})=>{var l,u,s;switch(n.value=[...a],i.value=!0,x.value=t==null?void 0:t.extraParams,g.value=t.apTableDataSources||((l=e.apTableProps)==null?void 0:l.dataSource),t.refreshMode||"reset"){case"reset":(u=d.value)==null||u.reset();break;case"submit":(s=d.value)==null||s.submit();break;case"none":break}return new Promise((p,f)=>{c=p,r=f})},w=()=>{i.value=!1,c=null,r==null||r(b.AsyncOpenResultError.ModalCancel),r=null},M=async a=>{a=L.transformTableParams({...a,...x.value});const t=e.api,{records:l,total:u}=await t(a);return{data:l,total:u}},P=()=>{if(n.value.length>e.maxCount){r==null||r(b.AsyncOpenResultError.ExceedMaxCount);return}if(e.getRowKey){const a=y.cloneDeep(o.unref(n)),t=a.map(e.getRowKey);S("finish",t,a),c==null||c({keys:t,rows:a})}else{r==null||r(b.AsyncOpenResultError.NotFineGetRowKey);return}i.value=!1},B=o.computed(()=>{if(!e.getRowKey)return;const a=e.getRowKey;return{fixed:!0,selectedRowKeys:n.value.map(a),columnWidth:50,preserveSelectedRowKeys:!0,onSelectAll(t,l){var s,p;if(l.length>e.maxCount){v.message.warning(C("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}const u=(s=d.value)==null?void 0:s.dataSource;if(t){const f=o.unref(u).filter(m=>!n.value.some(A=>a(A)===a(m)));n.value=n.value.concat(f)}else n.value=(p=n.value)==null?void 0:p.filter(f=>!u.some(m=>a(m)===a(f)))},onSelect(t,l){if(l){if(n.value.length>=e.maxCount){v.message.warning(C("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}n.value.push(t)}else{const u=n.value.findIndex(s=>a(t)===a(s));n.value.splice(u,1)}},getCheckboxProps:t=>({disabled:typeof e.disabledCheckbox=="function"?e.disabledCheckbox(t,n.value):e.disabledCheckbox}),...e.rowSelection||{}}}),q=()=>e.isRenderModalTitleSuffix?o.h(E.default,{title:e.title,count:n.value.length||0,maxCount:e.maxCount},{default:e.renderModalTitleSuffix??void 0}):e.title,K=()=>d.value,I=()=>{n.value=[]},O=a=>{const t=e.getRowKey;if(!t)return;const l=n.value.findIndex(u=>t(a)===t(u));n.value.splice(l,1)};return T({open:R,close:w,getApTableInstance:K}),(a,t)=>(o.openBlock(),o.createBlock(o.unref(v.Modal),o.mergeProps({onOk:P,onCancel:w,open:i.value,"onUpdate:open":t[0]||(t[0]=l=>i.value=l)},o.unref(y.omit)(e,["api","getRowKey","centered","apTableProps","onOk","maxCount","title","renderModalTitleSuffix","isRenderModalTitleSuffix","rowSelection","disabledCheckbox","tableLayoutConfig"]),{title:q(),"body-style":{maxHeight:"calc(100vh - 205px)",overflowY:"scroll"},centered:e.centered??!0}),{default:o.withCtx(()=>[o.createVNode(G.default,o.mergeProps(e.tableLayoutConfig||{},{onClear:I,"selected-list":n.value,onDeleteItem:O}),{default:o.withCtx(()=>[o.createVNode(o.unref(U.ApTable),o.mergeProps({scroll:{y:"100%"},style:{padding:"0px"},columns:a.columns,request:M,"row-key":a.getRowKey,"row-selection":B.value,bordered:o.unref(_)==="admin"},o.unref(y.omit)(e.apTableProps,"dataSource"),{ref_key:"apTableRef",ref:d,"data-source":g.value}),null,16,["columns","row-key","row-selection","bordered","data-source"])]),_:1},16,["selected-list"])]),_:1},16,["open","title","centered"]))}});exports.default=F;

package/lib/src/editable-table/interface.d.ts

@@ -2,11 +2,11 @@ import { ColumnType, TableProps } from '@aplus-frontend/antdv/es/table';
 import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType, ValueEnum } from '../ap-table';
 import { NamePath, ValidateOptions } from '@aplus-frontend/antdv/es/form/interface';
 import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
-import { FormItemProps } from '@aplus-frontend/antdv';
 import { VNode } from 'vue';
 import { EllipsisConfig } from '@aplus-frontend/antdv/es/typography/Base';
 import { StandardBehaviorOptions } from '../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../type';
+import { ApFormItemProps } from '../ap-form';
 export type EditableColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ColumnType<RecordType>, 'children' | 'customRender' | 'ellipsis'> & {
     children?: EditableColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**
@@ -100,7 +100,7 @@ export type EditableTableFormItemProps<RecordType = any> = Omit<EditableTablePro
     /**
      * 额外的表单项配置属性
      */
-    formItem?: Partial<Omit<FormItemProps, 'name' | 'label'>>;
+    formItem?: Partial<Omit<ApFormItemProps, 'name' | 'label'>>;
 };
 export type EditableTableExpose<ModelType = any, RecordType = any> = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [