@aplus-frontend/ui 7.11.1 → 7.11.2

package/es/src/business/ap-view/ap-view.vue2.mjs

@@ -36,7 +36,8 @@ const De = /* @__PURE__ */ U({
       type: Boolean,
       default: !1
     },
-    emptyData: {}
+    emptyData: {},
+    extraParams: {}
   },
   setup(I, {
     expose: N
@@ -49,15 +50,15 @@ const De = /* @__PURE__ */ U({
       viewKey: c,
       viewName: O("ap.apView.systemView")
     })), {
-      getSearchFormValues: L,
-      setSearchFormValues: x,
+      getSearchFormValues: x,
+      setSearchFormValues: L,
       submit: B,
-      reset: E,
-      submitWith: k,
-      getSearchFormSorterItems: A,
-      setSearchFormSorterItems: P,
+      reset: P,
+      submitWith: E,
+      getSearchFormSorterItems: k,
+      setSearchFormSorterItems: A,
       resetSearchFormSorterItems: T
-    } = X(), W = y(!1), S = y(!1), v = y("");
+    } = X(), W = y(!1), S = y(!1), p = y("");
     let f = !1, g = !1;
     const j = {
       dropdownType: "dropdown",
@@ -70,26 +71,28 @@ const De = /* @__PURE__ */ U({
         view: t
       }, null)
     }))), r = {
-      getSearchFormValues: L,
-      setSearchFormValues: x,
+      getSearchFormValues: x,
+      setSearchFormValues: L,
       submit: B,
-      reset: E,
-      submitWith: k,
-      getSearchFormSorterItems: A,
-      setSearchFormSorterItems: P,
+      reset: P,
+      submitWith: E,
+      getSearchFormSorterItems: k,
+      setSearchFormSorterItems: A,
       resetSearchFormSorterItems: T,
       ...s.saveDataSource
-    }, p = {
+    }, v = {
       ..._.value,
       ...s.viewCacheOption
-    }, D = () => s.isDefaultSystemView ? c : (s.isFirstDefaultSystemView || g) && f ? c : i.value.find((a) => a.isDefault)?.viewKey ?? c, l = (t) => {
-      v.value = t;
-      const a = i.value.find((e) => e.viewKey === v.value);
+    }, D = () => s.isDefaultSystemView ? c : (s.isFirstDefaultSystemView || g) && f ? c : i.value.find((a) => a.isDefault)?.viewKey ?? c, m = (t) => {
+      p.value = t;
+      const a = i.value.find((e) => e.viewKey === p.value);
       a && setTimeout(() => {
         a.viewKey === c ? f ? s.manual || r?.submitWith?.() : s.manual || (r?.resetSearchFormSorterItems?.(), r?.reset?.()) : (r?.setSearchFormValues?.({
           ...Object.fromEntries(Object.keys(r?.getSearchFormValues?.() ?? {}).map((e) => [e, void 0])) ?? {},
           ...s?.emptyData ?? {},
-          ...r?.getSearchFormSorterItems?.()?.reduce((e, o) => (a.viewConfig?.searchForm?.[o.name] && (e[o.name] = a.viewConfig?.searchForm?.[o.name]), e), {}) ?? {}
+          ...[...r?.getSearchFormSorterItems?.() ?? [], ...s?.extraParams?.map((e) => ({
+            name: e
+          })) ?? []].reduce((e, o) => (a.viewConfig?.searchForm?.[o.name] && (e[o.name] = a.viewConfig?.searchForm?.[o.name]), e), {}) ?? {}
         }), r?.setSearchFormSorterItems?.(a.viewConfig?.sorterItems ?? []), f ? s.manual || r?.submitWith?.() : r?.submit?.()), f = !1;
       });
     }, C = {
@@ -97,12 +100,12 @@ const De = /* @__PURE__ */ U({
         try {
           const {
             tableKey: a
-          } = t, e = await p?.getViewList?.({
+          } = t, e = await v?.getViewList?.({
             tableKey: a
           });
-          return i.value = [V.value, ...e ?? []], l(D()), i.value;
+          return i.value = [V.value, ...e ?? []], m(D()), i.value;
         } catch {
-          return i.value = [V.value], l(c), i.value;
+          return i.value = [V.value], m(c), i.value;
         }
       },
       addView: async (t) => {
@@ -113,21 +116,21 @@ const De = /* @__PURE__ */ U({
           isDefault: n,
           viewConfig: w
         } = t;
-        await p?.addView?.({
+        await v?.addView?.({
           tableKey: a,
           viewKey: e,
           viewName: o,
           isDefault: n,
           viewConfig: w
-        }), n && (i.value = i.value.map((m) => ({
-          ...m,
+        }), n && (i.value = i.value.map((l) => ({
+          ...l,
           isDefault: !1
         }))), i.value = [...i.value, {
           viewKey: e,
           viewName: o,
           isDefault: n,
           viewConfig: w
-        }], l(e);
+        }], m(e);
       },
       changeView: async (t) => {
         const {
@@ -137,7 +140,7 @@ const De = /* @__PURE__ */ U({
           isDefault: n,
           viewConfig: w
         } = t;
-        await p?.changeView?.({
+        await v?.changeView?.({
           tableKey: a,
           viewKey: e,
           viewName: o,
@@ -147,23 +150,23 @@ const De = /* @__PURE__ */ U({
           ...h,
           isDefault: !1
         })));
-        const m = i.value.find((h) => h.viewKey === e);
-        m && (m.viewName = o, m.isDefault = n, m.viewConfig = w), l(e);
+        const l = i.value.find((h) => h.viewKey === e);
+        l && (l.viewName = o, l.isDefault = n, l.viewConfig = w), m(e);
       },
       removeView: async (t) => {
         const {
           tableKey: a,
           viewKey: e
         } = t;
-        await p?.removeView?.({
+        await v?.removeView?.({
           tableKey: a,
           viewKey: e
-        }), i.value = i.value.filter((o) => o.viewKey !== e), e === v.value && l(D());
+        }), i.value = i.value.filter((o) => o.viewKey !== e), e === p.value && m(D());
       }
     }, $ = {
       tableKey: s.tableKey,
-      currentViewKey: v,
-      changeCurrentViewKey: l,
+      currentViewKey: p,
+      changeCurrentViewKey: m,
       popoverOpen: W,
       menuOpen: S,
       viewList: i,

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

@@ -86,6 +86,10 @@ export interface ApViewProps {
      * 表单项为空时的状态数据,适用于为空时其值不为undefined的情况
      */
     emptyData?: Recordable;
+    /**
+     * 视图额外需要被设置的参数Key
+     */
+    extraParams?: string[];
 }
 export interface ApViewExpose {
     setFirstDefaultSystemView: (value: boolean) => void;

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "7.11.1";
+declare const _default: "7.11.2";
 export default _default;

package/es/src/version.mjs

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

package/lib/src/business/ap-view/ap-view.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),P=require("@aplus-frontend/utils"),j=require("../../ap-table/context.js");require("../../config-provider/index.js");const k=require("../ap-batch-action-group/index.js");require("./components/main-button-content.vue.js");require("./components/menu-list-content.vue.js");const A=require("./hooks/use-view-provide.js"),G=require("./icons/line-down.vue.js"),U=require("./style/index.js"),m=require("./utils/enum.js"),$=require("../../config-provider/hooks/use-global-config.js"),z=require("../../config-provider/hooks/use-namespace.js"),R=require("../../config-provider/hooks/use-locale.js"),H=require("./components/main-button-content.vue2.js"),J=require("./components/menu-list-content.vue2.js"),Q=e.defineComponent({name:"ApView",__name:"ap-view",props:{tableKey:{},saveDataSource:{},viewCacheOption:{},maxViewNum:{default:20},isDefaultSystemView:{type:Boolean,default:!1},isFirstDefaultSystemView:{type:Boolean,default:!1},manual:{type:Boolean,default:!1},emptyData:{}},setup(g,{expose:C}){const r=g,D=$.useGlobalConfig("viewCacheOption"),{b:y}=z.useNamespace("ap-view"),{t:E}=R.useLocale(),_=U.default("ap-view"),d=e.computed(()=>({viewKey:m.SYSTEM_VIEW_KEY,viewName:E("ap.apView.systemView")})),{getSearchFormValues:q,setSearchFormValues:F,submit:I,reset:N,submitWith:Y,getSearchFormSorterItems:O,setSearchFormSorterItems:T,resetSearchFormSorterItems:L}=j.useInjectApTable(),W=e.ref(!1),V=e.ref(!1),w=e.ref("");let f=!1,K=!1;const x={dropdownType:"dropdown",content:e.createVNode(H.default,{maxViewNum:r.maxViewNum},null)},s=e.ref([d.value]),M=e.computed(()=>s.value.map(a=>({id:a.viewKey,content:e.createVNode(J.default,{view:a},null)}))),o={getSearchFormValues:q,setSearchFormValues:F,submit:I,reset:N,submitWith:Y,getSearchFormSorterItems:O,setSearchFormSorterItems:T,resetSearchFormSorterItems:L,...r.saveDataSource},p={...D.value,...r.viewCacheOption},h=()=>r.isDefaultSystemView||(r.isFirstDefaultSystemView||K)&&f?m.SYSTEM_VIEW_KEY:s.value.find(i=>i.isDefault)?.viewKey??m.SYSTEM_VIEW_KEY,l=a=>{w.value=a;const i=s.value.find(t=>t.viewKey===w.value);i&&setTimeout(()=>{i.viewKey===m.SYSTEM_VIEW_KEY?f?r.manual||o?.submitWith?.():r.manual||(o?.resetSearchFormSorterItems?.(),o?.reset?.()):(o?.setSearchFormValues?.({...Object.fromEntries(Object.keys(o?.getSearchFormValues?.()??{}).map(t=>[t,void 0]))??{},...r?.emptyData??{},...o?.getSearchFormSorterItems?.()?.reduce((t,n)=>(i.viewConfig?.searchForm?.[n.name]&&(t[n.name]=i.viewConfig?.searchForm?.[n.name]),t),{})??{}}),o?.setSearchFormSorterItems?.(i.viewConfig?.sorterItems??[]),f?r.manual||o?.submitWith?.():o?.submit?.()),f=!1})},b={getViewList:async a=>{try{const{tableKey:i}=a,t=await p?.getViewList?.({tableKey:i});return s.value=[d.value,...t??[]],l(h()),s.value}catch{return s.value=[d.value],l(m.SYSTEM_VIEW_KEY),s.value}},addView:async a=>{const{tableKey:i,viewKey:t,viewName:n,isDefault:u,viewConfig:v}=a;await p?.addView?.({tableKey:i,viewKey:t,viewName:n,isDefault:u,viewConfig:v}),u&&(s.value=s.value.map(c=>({...c,isDefault:!1}))),s.value=[...s.value,{viewKey:t,viewName:n,isDefault:u,viewConfig:v}],l(t)},changeView:async a=>{const{tableKey:i,viewKey:t,viewName:n,isDefault:u,viewConfig:v}=a;await p?.changeView?.({tableKey:i,viewKey:t,viewName:n,isDefault:u,viewConfig:v}),u&&(s.value=s.value.map(S=>({...S,isDefault:!1})));const c=s.value.find(S=>S.viewKey===t);c&&(c.viewName=n,c.isDefault=u,c.viewConfig=v),l(t)},removeView:async a=>{const{tableKey:i,viewKey:t}=a;await p?.removeView?.({tableKey:i,viewKey:t}),s.value=s.value.filter(n=>n.viewKey!==t),t===w.value&&l(h())}},B={tableKey:r.tableKey,currentViewKey:w,changeCurrentViewKey:l,popoverOpen:W,menuOpen:V,viewList:s,viewListCRUD:b,saveDataSource:o};return A.useViewProvide(B),e.watch(()=>r.tableKey,a=>{P.isValid(a)&&(f=!0,b?.getViewList?.({tableKey:a}))},{immediate:!0}),C({setFirstDefaultSystemView:a=>{K=a}}),(a,i)=>(e.openBlock(),e.createBlock(e.unref(k.ApBatchActionGroup),e.mergeProps({...a.$attrs},{open:V.value,"onUpdate:open":i[0]||(i[0]=t=>V.value=t),class:[e.unref(y)(),e.unref(_)],"button-props":x,"menu-list":M.value,"overlay-class-name":[e.unref(y)("overlay"),e.unref(_)],trigger:"click",placement:"bottom"}),{icon:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(y)("icon")])},[e.createVNode(G.default)],2)]),_:1},16,["open","class","menu-list","overlay-class-name"]))}});exports.default=Q;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),B=require("@aplus-frontend/utils"),j=require("../../ap-table/context.js");require("../../config-provider/index.js");const k=require("../ap-batch-action-group/index.js");require("./components/main-button-content.vue.js");require("./components/menu-list-content.vue.js");const A=require("./hooks/use-view-provide.js"),G=require("./icons/line-down.vue.js"),U=require("./style/index.js"),m=require("./utils/enum.js"),$=require("../../config-provider/hooks/use-global-config.js"),z=require("../../config-provider/hooks/use-namespace.js"),R=require("../../config-provider/hooks/use-locale.js"),H=require("./components/main-button-content.vue2.js"),J=require("./components/menu-list-content.vue2.js"),Q=t.defineComponent({name:"ApView",__name:"ap-view",props:{tableKey:{},saveDataSource:{},viewCacheOption:{},maxViewNum:{default:20},isDefaultSystemView:{type:Boolean,default:!1},isFirstDefaultSystemView:{type:Boolean,default:!1},manual:{type:Boolean,default:!1},emptyData:{},extraParams:{}},setup(g,{expose:C}){const r=g,D=$.useGlobalConfig("viewCacheOption"),{b:y}=z.useNamespace("ap-view"),{t:E}=R.useLocale(),_=U.default("ap-view"),d=t.computed(()=>({viewKey:m.SYSTEM_VIEW_KEY,viewName:E("ap.apView.systemView")})),{getSearchFormValues:q,setSearchFormValues:F,submit:I,reset:N,submitWith:Y,getSearchFormSorterItems:x,setSearchFormSorterItems:O,resetSearchFormSorterItems:T}=j.useInjectApTable(),L=t.ref(!1),V=t.ref(!1),w=t.ref("");let f=!1,K=!1;const W={dropdownType:"dropdown",content:t.createVNode(H.default,{maxViewNum:r.maxViewNum},null)},s=t.ref([d.value]),M=t.computed(()=>s.value.map(a=>({id:a.viewKey,content:t.createVNode(J.default,{view:a},null)}))),o={getSearchFormValues:q,setSearchFormValues:F,submit:I,reset:N,submitWith:Y,getSearchFormSorterItems:x,setSearchFormSorterItems:O,resetSearchFormSorterItems:T,...r.saveDataSource},p={...D.value,...r.viewCacheOption},h=()=>r.isDefaultSystemView||(r.isFirstDefaultSystemView||K)&&f?m.SYSTEM_VIEW_KEY:s.value.find(i=>i.isDefault)?.viewKey??m.SYSTEM_VIEW_KEY,l=a=>{w.value=a;const i=s.value.find(e=>e.viewKey===w.value);i&&setTimeout(()=>{i.viewKey===m.SYSTEM_VIEW_KEY?f?r.manual||o?.submitWith?.():r.manual||(o?.resetSearchFormSorterItems?.(),o?.reset?.()):(o?.setSearchFormValues?.({...Object.fromEntries(Object.keys(o?.getSearchFormValues?.()??{}).map(e=>[e,void 0]))??{},...r?.emptyData??{},...[...o?.getSearchFormSorterItems?.()??[],...r?.extraParams?.map(e=>({name:e}))??[]].reduce((e,n)=>(i.viewConfig?.searchForm?.[n.name]&&(e[n.name]=i.viewConfig?.searchForm?.[n.name]),e),{})??{}}),o?.setSearchFormSorterItems?.(i.viewConfig?.sorterItems??[]),f?r.manual||o?.submitWith?.():o?.submit?.()),f=!1})},b={getViewList:async a=>{try{const{tableKey:i}=a,e=await p?.getViewList?.({tableKey:i});return s.value=[d.value,...e??[]],l(h()),s.value}catch{return s.value=[d.value],l(m.SYSTEM_VIEW_KEY),s.value}},addView:async a=>{const{tableKey:i,viewKey:e,viewName:n,isDefault:u,viewConfig:v}=a;await p?.addView?.({tableKey:i,viewKey:e,viewName:n,isDefault:u,viewConfig:v}),u&&(s.value=s.value.map(c=>({...c,isDefault:!1}))),s.value=[...s.value,{viewKey:e,viewName:n,isDefault:u,viewConfig:v}],l(e)},changeView:async a=>{const{tableKey:i,viewKey:e,viewName:n,isDefault:u,viewConfig:v}=a;await p?.changeView?.({tableKey:i,viewKey:e,viewName:n,isDefault:u,viewConfig:v}),u&&(s.value=s.value.map(S=>({...S,isDefault:!1})));const c=s.value.find(S=>S.viewKey===e);c&&(c.viewName=n,c.isDefault=u,c.viewConfig=v),l(e)},removeView:async a=>{const{tableKey:i,viewKey:e}=a;await p?.removeView?.({tableKey:i,viewKey:e}),s.value=s.value.filter(n=>n.viewKey!==e),e===w.value&&l(h())}},P={tableKey:r.tableKey,currentViewKey:w,changeCurrentViewKey:l,popoverOpen:L,menuOpen:V,viewList:s,viewListCRUD:b,saveDataSource:o};return A.useViewProvide(P),t.watch(()=>r.tableKey,a=>{B.isValid(a)&&(f=!0,b?.getViewList?.({tableKey:a}))},{immediate:!0}),C({setFirstDefaultSystemView:a=>{K=a}}),(a,i)=>(t.openBlock(),t.createBlock(t.unref(k.ApBatchActionGroup),t.mergeProps({...a.$attrs},{open:V.value,"onUpdate:open":i[0]||(i[0]=e=>V.value=e),class:[t.unref(y)(),t.unref(_)],"button-props":W,"menu-list":M.value,"overlay-class-name":[t.unref(y)("overlay"),t.unref(_)],trigger:"click",placement:"bottom"}),{icon:t.withCtx(()=>[t.createElementVNode("div",{class:t.normalizeClass([t.unref(y)("icon")])},[t.createVNode(G.default)],2)]),_:1},16,["open","class","menu-list","overlay-class-name"]))}});exports.default=Q;

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

@@ -86,6 +86,10 @@ export interface ApViewProps {
      * 表单项为空时的状态数据,适用于为空时其值不为undefined的情况
      */
     emptyData?: Recordable;
+    /**
+     * 视图额外需要被设置的参数Key
+     */
+    extraParams?: string[];
 }
 export interface ApViewExpose {
     setFirstDefaultSystemView: (value: boolean) => void;

package/lib/src/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "7.11.1",
+  "version": "7.11.2",
   "main": "./lib/index.js",
   "type": "module",
   "files": [