@aplus-frontend/ui 7.10.2 → 7.10.3

package/es/src/ag-grid/editable/index.vue.mjs

@@ -1,18 +1,18 @@
-import { defineComponent as G, useSlots as U, ref as y, watch as W, unref as n, createBlock as M, openBlock as $, withCtx as d, createVNode as w, mergeProps as q, createSlots as J, renderList as Q, renderSlot as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
-import { isEqual as ee, isArray as g, omit as oe } from "lodash-unified";
-import { ApForm as u } from "../../ap-form/index.mjs";
+import { defineComponent as $, useSlots as q, ref as b, watch as J, unref as n, createBlock as Q, openBlock as X, withCtx as c, createVNode as R, mergeProps as Y, createSlots as Z, renderList as ee, renderSlot as oe, normalizeProps as ae, guardReactiveProps as te } from "vue";
+import { isEqual as ne, isArray as v, omit as le } from "lodash-unified";
+import { ApForm as f } from "../../ap-form/index.mjs";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
-import { useEditableApi as ae } from "../hooks/use-editable-api.mjs";
-import { useGetEditableColumns as te } from "../hooks/use-editable-columns.mjs";
+import { useEditableApi as re } from "../hooks/use-editable-api.mjs";
+import { useGetEditableColumns as se } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import ne from "../style/editable.mjs";
-import { arrayToObject as p } from "./utils.mjs";
-import { useNamespace as le } from "../../config-provider/hooks/use-namespace.mjs";
-import { useControllableValue as re } from "../../hooks/useControllableValue.mjs";
-import { useGlobalConfig as se } from "../../config-provider/hooks/use-global-config.mjs";
-import ie from "../index.vue.mjs";
-const xe = /* @__PURE__ */ G({
+import ie from "../style/editable.mjs";
+import { arrayToObject as y, getRowKey as de } from "./utils.mjs";
+import { useNamespace as ue } from "../../config-provider/hooks/use-namespace.mjs";
+import { useControllableValue as pe } from "../../hooks/useControllableValue.mjs";
+import { useGlobalConfig as me } from "../../config-provider/hooks/use-global-config.mjs";
+import ce from "../index.vue.mjs";
+const Fe = /* @__PURE__ */ $({
   name: "EditableGrid",
   __name: "index",
   props: {
@@ -131,107 +131,113 @@ const xe = /* @__PURE__ */ G({
     onFieldChange: {}
   },
   emits: ["update:value"],
-  setup(h, {
-    expose: b,
-    emit: v
+  setup(C, {
+    expose: x,
+    emit: B
   }) {
-    const C = U(), o = h, {
-      b: R
-    } = le("editable-aggrid"), x = ne("editable-aggrid"), B = v, s = y(), {
+    const S = q(), o = C, {
+      b: T
+    } = ue("editable-aggrid"), _ = ie("editable-aggrid"), F = B, d = b(), {
       value: r,
-      updateValue: m
-    } = re(o, B), l = y(), S = u.useWatch(o.name, l);
-    W(r, (e) => {
-      const a = p(e, o.rowKey);
-      ee(a, n(S)) || l.value?.setFieldValue(o.name, a);
+      updateValue: w
+    } = pe(o, F), l = b(), E = f.useWatch(o.name, l);
+    J(r, (e) => {
+      const a = y(e, o.rowKey);
+      ne(a, n(E)) || l.value?.setFieldValue(o.name, a);
     }, {
       deep: !0
     });
-    const T = se("valueTypeMap"), _ = te(o, T), {
-      add: F,
-      addMultiple: E,
-      remove: N,
-      removeByKey: A,
-      getRowData: V,
-      getRowsData: j,
-      setRowData: k,
-      clear: D,
-      refreshRowIds: i
-    } = ae(o, l, r, m);
-    function K() {
-      const e = s.value?._internalGridApi;
-      if (!i.value?.length || !e)
+    const K = me("valueTypeMap"), k = se(o, K), {
+      add: N,
+      addMultiple: j,
+      remove: A,
+      removeByKey: D,
+      getRowData: I,
+      getRowsData: V,
+      setRowData: H,
+      clear: O,
+      refreshRowIds: p
+    } = re(o, l, r, w);
+    function z() {
+      const e = d.value?._internalGridApi;
+      if (!p.value?.length || !e)
         return;
-      const a = i.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
+      const a = p.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
       e.refreshCells({
         rowNodes: a,
         force: !0
-      }), i.value = [];
+      }), p.value = [];
     }
-    function H() {
+    function L() {
       l.value?.resetFields();
     }
-    function I(e) {
-      return e ? (g(e) ? e : [e]).map((t) => g(t) ? [o.name, ...t] : [o.name, t]) : void 0;
+    function P(e) {
+      return e ? (v(e) ? e : [e]).map((t) => v(t) ? [o.name, ...t] : [o.name, t]) : void 0;
     }
-    async function z(e, a) {
-      return (await l.value?.validateFields(I(e), a))?.[o.name];
+    async function G(e, a) {
+      const s = (await l.value?.validateFields(P(e), a))?.[o.name];
+      try {
+        const u = Object.keys(s), h = r.value.map((i) => de(i, void 0, o.rowKey));
+        return u.sort((i, M) => h.findIndex((m) => String(m) === i) - h.findIndex((m) => String(m) === M)), u.map((i) => s[i]);
+      } catch {
+        return s;
+      }
     }
-    function L(e) {
-      m(e);
-      const a = p(e, o.rowKey);
+    function U(e) {
+      w(e);
+      const a = y(e, o.rowKey);
       l.value?.setFieldValue(o.name, a);
     }
-    function c(e, a) {
+    function g(e, a) {
       const t = e === "end" ? r.value.length - 1 : e;
-      s.value?.scrollToRow(t, a);
+      d.value?.scrollToRow(t, a);
     }
-    function O(e, a) {
-      s.value?.scrollToColumn(e, a);
+    function W(e, a) {
+      d.value?.scrollToColumn(e, a);
     }
-    return b({
-      resetFields: H,
-      validateFields: z,
-      add: F,
-      addMultiple: E,
-      remove: N,
-      removeByKey: A,
-      getRowData: V,
-      getRowsData: j,
-      setRowData: k,
-      clear: D,
-      setTableData: L,
-      scrollTo: c,
-      scrollToRow: c,
-      scrollToColumn: O
-    }), (e, a) => ($(), M(n(u), {
+    return x({
+      resetFields: L,
+      validateFields: G,
+      add: N,
+      addMultiple: j,
+      remove: A,
+      removeByKey: D,
+      getRowData: I,
+      getRowsData: V,
+      setRowData: H,
+      clear: O,
+      setTableData: U,
+      scrollTo: g,
+      scrollToRow: g,
+      scrollToColumn: W
+    }), (e, a) => (X(), Q(n(f), {
       ref_key: "formRef",
       ref: l,
       "initial-values": {
-        [o.name]: n(p)(n(r), o.rowKey)
+        [o.name]: n(y)(n(r), o.rowKey)
       },
       style: {
         height: "100%"
       }
     }, {
-      default: d(() => [w(n(u).FormItem, {
+      default: c(() => [R(n(f).FormItem, {
         name: e.name,
         "no-style": ""
       }, {
-        default: d(() => [w(ie, q(n(oe)(o, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
+        default: c(() => [R(ce, Y(n(le)(o, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
           ref_key: "tableRef",
-          ref: s,
-          class: [n(R)(), n(x)],
+          ref: d,
+          class: [n(T)(), n(_)],
           size: "mini",
-          columns: n(_),
+          columns: n(k),
           "data-source": n(r),
           "search-form": !1,
-          onUpdate: K
-        }), J({
+          onUpdate: z
+        }), Z({
           _: 2
-        }, [Q(C, (t, f) => ({
-          name: f,
-          fn: d((P) => [X(e.$slots, f, Y(Z(P || {})))])
+        }, [ee(S, (t, s) => ({
+          name: s,
+          fn: c((u) => [oe(e.$slots, s, ae(te(u || {})))])
         }))]), 1040, ["class", "columns", "data-source"])]),
         _: 3
       }, 8, ["name"])]),
@@ -240,5 +246,5 @@ const xe = /* @__PURE__ */ G({
   }
 });
 export {
-  xe as default
+  Fe as default
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "7.10.2";
+declare const _default: "7.10.3";
 export default _default;

package/es/src/version.mjs

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

package/lib/src/ag-grid/editable/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),u=require("lodash-unified"),d=require("../../ap-form/index.js");require("../../config-provider/index.js");require("../../hooks/index.js");const I=require("../hooks/use-editable-api.js"),P=require("../hooks/use-editable-columns.js");require("../index.vue2.js");const z=require("../style/editable.js"),c=require("./utils.js"),G=require("../../config-provider/hooks/use-namespace.js"),L=require("../../hooks/useControllableValue.js"),M=require("../../config-provider/hooks/use-global-config.js"),U=require("../index.vue.js"),W=e.defineComponent({name:"EditableGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean},locale:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{},showSorterTooltip:{type:[Boolean,Object]},prefixCls:{},rowKey:{type:[String,Function],default:"key"},tableLayout:{},title:{},id:{},showHeader:{type:Boolean},components:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean]},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean},indentSize:{},expandIconColumnIndex:{},showExpandColumn:{type:Boolean},expandedRowClassName:{},childrenColumnName:{},rowExpandable:{},transformCellText:{},rowHoverable:{type:Boolean},rowSelection:{type:[Boolean,Object]},onLoadingChange:{},onShownColumnsChange:{},pagination:{type:[Boolean,Object],default:!1},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},tableStyle:{},adaptive:{type:Boolean},columnResizable:{type:Boolean,default:!1},loading:{type:Boolean,default:void 0},summary:{},rowHeight:{default:66},getRowHeight:{},advanceRenderer:{type:Boolean},browserTooltips:{type:Boolean},virtual:{type:[Boolean,Object],default:void 0},onRowClicked:{},onScrollEnd:{},rowClassName:{},rowClassRules:{},autoHeight:{type:Boolean},onUpdate:{},customRow:{},theme:{},columns:{},value:{},defaultValue:{},"onUpdate:value":{},onChange:{},maxLength:{},name:{default:"ap-editable-table-inner-name"},onFieldChange:{}},emits:["update:value"],setup(y,{expose:w,emit:b}){const g=e.useSlots(),a=y,{b:h}=G.useNamespace("editable-aggrid"),v=z.default("editable-aggrid"),C=b,s=e.ref(),{value:r,updateValue:p}=L.useControllableValue(a,C),l=e.ref(),R=d.ApForm.useWatch(a.name,l);e.watch(r,o=>{const t=c.arrayToObject(o,a.rowKey);u.isEqual(t,e.unref(R))||l.value?.setFieldValue(a.name,t)},{deep:!0});const x=M.useGlobalConfig("valueTypeMap"),B=P.useGetEditableColumns(a,x),{add:_,addMultiple:S,remove:T,removeByKey:q,getRowData:F,getRowsData:E,setRowData:A,clear:N,refreshRowIds:i}=I.useEditableApi(a,l,r,p);function j(){const o=s.value?._internalGridApi;if(!i.value?.length||!o)return;const t=i.value.map(n=>o.getRowNode(n)).filter(n=>!!n);o.refreshCells({rowNodes:t,force:!0}),i.value=[]}function V(){l.value?.resetFields()}function O(o){return o?(u.isArray(o)?o:[o]).map(n=>u.isArray(n)?[a.name,...n]:[a.name,n]):void 0}async function k(o,t){return(await l.value?.validateFields(O(o),t))?.[a.name]}function D(o){p(o);const t=c.arrayToObject(o,a.rowKey);l.value?.setFieldValue(a.name,t)}function f(o,t){const n=o==="end"?r.value.length-1:o;s.value?.scrollToRow(n,t)}function K(o,t){s.value?.scrollToColumn(o,t)}return w({resetFields:V,validateFields:k,add:_,addMultiple:S,remove:T,removeByKey:q,getRowData:F,getRowsData:E,setRowData:A,clear:N,setTableData:D,scrollTo:f,scrollToRow:f,scrollToColumn:K}),(o,t)=>(e.openBlock(),e.createBlock(e.unref(d.ApForm),{ref_key:"formRef",ref:l,"initial-values":{[a.name]:e.unref(c.arrayToObject)(e.unref(r),a.rowKey)},style:{height:"100%"}},{default:e.withCtx(()=>[e.createVNode(e.unref(d.ApForm).FormItem,{name:o.name,"no-style":""},{default:e.withCtx(()=>[e.createVNode(U.default,e.mergeProps(e.unref(u.omit)(a,["name","value","onUpdate:value","maxLength","onChange","defaultValue"]),{ref_key:"tableRef",ref:s,class:[e.unref(h)(),e.unref(v)],size:"mini",columns:e.unref(B),"data-source":e.unref(r),"search-form":!1,onUpdate:j}),e.createSlots({_:2},[e.renderList(g,(n,m)=>({name:m,fn:e.withCtx(H=>[e.renderSlot(o.$slots,m,e.normalizeProps(e.guardReactiveProps(H||{})))])}))]),1040,["class","columns","data-source"])]),_:3},8,["name"])]),_:3},8,["initial-values"]))}});exports.default=W;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),c=require("lodash-unified"),y=require("../../ap-form/index.js");require("../../config-provider/index.js");require("../../hooks/index.js");const L=require("../hooks/use-editable-api.js"),M=require("../hooks/use-editable-columns.js");require("../index.vue2.js");const U=require("../style/editable.js"),p=require("./utils.js"),W=require("../../config-provider/hooks/use-namespace.js"),$=require("../../hooks/useControllableValue.js"),J=require("../../config-provider/hooks/use-global-config.js"),Q=require("../index.vue.js"),X=e.defineComponent({name:"EditableGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean},locale:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{},showSorterTooltip:{type:[Boolean,Object]},prefixCls:{},rowKey:{type:[String,Function],default:"key"},tableLayout:{},title:{},id:{},showHeader:{type:Boolean},components:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean]},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean},indentSize:{},expandIconColumnIndex:{},showExpandColumn:{type:Boolean},expandedRowClassName:{},childrenColumnName:{},rowExpandable:{},transformCellText:{},rowHoverable:{type:Boolean},rowSelection:{type:[Boolean,Object]},onLoadingChange:{},onShownColumnsChange:{},pagination:{type:[Boolean,Object],default:!1},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},tableStyle:{},adaptive:{type:Boolean},columnResizable:{type:Boolean,default:!1},loading:{type:Boolean,default:void 0},summary:{},rowHeight:{default:66},getRowHeight:{},advanceRenderer:{type:Boolean},browserTooltips:{type:Boolean},virtual:{type:[Boolean,Object],default:void 0},onRowClicked:{},onScrollEnd:{},rowClassName:{},rowClassRules:{},autoHeight:{type:Boolean},onUpdate:{},customRow:{},theme:{},columns:{},value:{},defaultValue:{},"onUpdate:value":{},onChange:{},maxLength:{},name:{default:"ap-editable-table-inner-name"},onFieldChange:{}},emits:["update:value"],setup(h,{expose:v,emit:C}){const R=e.useSlots(),a=h,{b:x}=W.useNamespace("editable-aggrid"),B=U.default("editable-aggrid"),_=C,i=e.ref(),{value:r,updateValue:w}=$.useControllableValue(a,_),l=e.ref(),S=y.ApForm.useWatch(a.name,l);e.watch(r,o=>{const t=p.arrayToObject(o,a.rowKey);c.isEqual(t,e.unref(S))||l.value?.setFieldValue(a.name,t)},{deep:!0});const T=J.useGlobalConfig("valueTypeMap"),q=M.useGetEditableColumns(a,T),{add:F,addMultiple:E,remove:A,removeByKey:j,getRowData:N,getRowsData:K,setRowData:V,clear:k,refreshRowIds:f}=L.useEditableApi(a,l,r,w);function O(){const o=i.value?._internalGridApi;if(!f.value?.length||!o)return;const t=f.value.map(n=>o.getRowNode(n)).filter(n=>!!n);o.refreshCells({rowNodes:t,force:!0}),f.value=[]}function D(){l.value?.resetFields()}function I(o){return o?(c.isArray(o)?o:[o]).map(n=>c.isArray(n)?[a.name,...n]:[a.name,n]):void 0}async function H(o,t){const s=(await l.value?.validateFields(I(o),t))?.[a.name];try{const d=Object.keys(s),g=r.value.map(u=>p.getRowKey(u,void 0,a.rowKey));return d.sort((u,G)=>g.findIndex(m=>String(m)===u)-g.findIndex(m=>String(m)===G)),d.map(u=>s[u])}catch{return s}}function P(o){w(o);const t=p.arrayToObject(o,a.rowKey);l.value?.setFieldValue(a.name,t)}function b(o,t){const n=o==="end"?r.value.length-1:o;i.value?.scrollToRow(n,t)}function z(o,t){i.value?.scrollToColumn(o,t)}return v({resetFields:D,validateFields:H,add:F,addMultiple:E,remove:A,removeByKey:j,getRowData:N,getRowsData:K,setRowData:V,clear:k,setTableData:P,scrollTo:b,scrollToRow:b,scrollToColumn:z}),(o,t)=>(e.openBlock(),e.createBlock(e.unref(y.ApForm),{ref_key:"formRef",ref:l,"initial-values":{[a.name]:e.unref(p.arrayToObject)(e.unref(r),a.rowKey)},style:{height:"100%"}},{default:e.withCtx(()=>[e.createVNode(e.unref(y.ApForm).FormItem,{name:o.name,"no-style":""},{default:e.withCtx(()=>[e.createVNode(Q.default,e.mergeProps(e.unref(c.omit)(a,["name","value","onUpdate:value","maxLength","onChange","defaultValue"]),{ref_key:"tableRef",ref:i,class:[e.unref(x)(),e.unref(B)],size:"mini",columns:e.unref(q),"data-source":e.unref(r),"search-form":!1,onUpdate:O}),e.createSlots({_:2},[e.renderList(R,(n,s)=>({name:s,fn:e.withCtx(d=>[e.renderSlot(o.$slots,s,e.normalizeProps(e.guardReactiveProps(d||{})))])}))]),1040,["class","columns","data-source"])]),_:3},8,["name"])]),_:3},8,["initial-values"]))}});exports.default=X;

package/lib/src/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "7.10.2",
+  "version": "7.10.3",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -46,14 +46,14 @@
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.3.5",
     "@aplus-frontend/icon": "^2.0.4",
-    "@aplus-frontend/oss": "^1.1.9",
+    "@aplus-frontend/oss": "^1.1.10",
     "vue": "^3.5.21",
     "vxe-table": "^4.13.37"
   },
   "devDependencies": {
     "@aplus-frontend/antdv": "^1.3.5",
     "@aplus-frontend/icon": "^2.0.4",
-    "@aplus-frontend/oss": "^1.1.9",
+    "@aplus-frontend/oss": "^1.1.10",
     "@emotion/serialize": "^1.3.3",
     "@types/sortablejs": "^1.15.8",
     "axios": "^1.7.2",