@ibiz-template/vue3-util 0.0.4-beta.3 → 0.0.4-beta.5

package/dist/index.esm.js

@@ -5,16 +5,18 @@ function useNamespace(block) {
 }
 
 // src/use/route/route.ts
-import { useRoute } from "vue-router";
-import { ref, watch as watch2 } from "vue";
+import { useRoute as useRoute2 } from "vue-router";
+import { ref, watch as watch3 } from "vue";
 
 // src/util/route/route.ts
 import { notNilEmpty } from "qx-util";
 import { RuntimeError } from "@ibiz-template/core";
 import qs from "qs";
+import { useRoute } from "vue-router";
+import { watch } from "vue";
 function getOwnRouteContext(context) {
   const ownContext = context.getOwnContext();
-  const excludeKeys = ["srfsessionid"];
+  const excludeKeys = ["srfsessionid", "srfappid"];
   Object.keys(ownContext).forEach((key) => {
     if (excludeKeys.includes(key)) {
       delete ownContext[key];
@@ -24,12 +26,12 @@ function getOwnRouteContext(context) {
 }
 function generateRoutePath(appView, route, context, params) {
   const routePath = route2routePath(route);
-  let level = 2;
-  if (context.toRouteLevel) {
-    level = context.toRouteLevel;
-    delete context.toRouteLevel;
+  let depth = 2;
+  if (context.toRouteDepth) {
+    depth = context.toRouteDepth;
+    delete context.toRouteDepth;
   }
-  routePath.pathNodes.splice(level - 1, routePath.pathNodes.length - level + 1);
+  routePath.pathNodes.splice(depth - 1, routePath.pathNodes.length - depth + 1);
   if (context.currentSrfNav) {
     const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
     currentNode.params = currentNode.params || {};
@@ -51,21 +53,12 @@ function generateRoutePath(appView, route, context, params) {
   });
   return { path: routePath2string(routePath) };
 }
-function getViewName(model) {
-  return model.codeName.toLowerCase();
-}
-function findViewByName(_appModel, _viewCodeName) {
-  return void 0;
-}
-function findView(_appModel, _viewCodeName) {
-  return void 0;
-}
-async function parseRouteViewData(route, level) {
+async function parseRouteViewData(route, depth) {
   var _a;
   const routePath = route2routePath(route);
-  let viewCodeName = routePath.pathNodes[level - 1].viewName;
+  let viewCodeName = routePath.pathNodes[depth - 1].viewName;
   if (!viewCodeName) {
-    throw new RuntimeError(`\u7B2C${level}\u7EA7\u8DEF\u7531\u4E0D\u5B58\u5728\u89C6\u56FE\u6807\u8BC6`);
+    throw new RuntimeError(`\u7B2C${depth}\u7EA7\u8DEF\u7531\u4E0D\u5B58\u5728\u89C6\u56FE\u6807\u8BC6`);
   }
   if (viewCodeName === "index") {
     viewCodeName = ibiz.hub.defaultAppIndexViewName;
@@ -81,13 +74,13 @@ async function parseRouteViewData(route, level) {
   if (routePath.appContext) {
     Object.assign(context, routePath.appContext);
   }
-  for (let index = 0; index < level; index++) {
+  for (let index = 0; index < depth; index++) {
     const pathNode = routePath.pathNodes[index];
     if (notNilEmpty(pathNode.context)) {
       Object.assign(context, pathNode.context);
     }
   }
-  const { params, srfnav } = routePath.pathNodes[level - 1];
+  const { params, srfnav } = routePath.pathNodes[depth - 1];
   return {
     viewModel,
     context,
@@ -96,9 +89,9 @@ async function parseRouteViewData(route, level) {
   };
 }
 function route2routePath(route) {
-  const level = route.matched.length;
+  const depth = route.matched.length;
   const pathNodes = [];
-  for (let index = 1; index <= level; index++) {
+  for (let index = 1; index <= depth; index++) {
     const viewName = route.params[`view${index}`];
     const paramsStr = route.params[`params${index}`];
     let params;
@@ -168,9 +161,26 @@ function routePath2string(routePath) {
   });
   return pathStr;
 }
+function onRouteChange(callback, depth) {
+  const route = useRoute();
+  watch(
+    () => route.path,
+    () => {
+      const routePath = route2routePath(route);
+      let currentKey = "";
+      if (routePath.pathNodes.length >= depth) {
+        routePath.pathNodes = routePath.pathNodes.slice(0, depth);
+        delete routePath.pathNodes[depth - 1].srfnav;
+        currentKey = routePath2string(routePath);
+      }
+      callback({ currentKey, fullPath: route.fullPath });
+    },
+    { immediate: true }
+  );
+}
 
 // src/util/route/route-listener.ts
-import { watch } from "vue";
+import { watch as watch2 } from "vue";
 var RouteListener = class {
   constructor(route, wait) {
     /**
@@ -198,7 +208,7 @@ var RouteListener = class {
     if (wait) {
       this.wait = wait;
     }
-    watch(
+    watch2(
       () => route.path,
       (newVal, oldVal) => {
         if (newVal !== oldVal) {
@@ -240,9 +250,17 @@ var RouteListener = class {
   }
 };
 
+// src/util/install.ts
+var withInstall = (main, install) => {
+  main.install = (app) => {
+    install(app);
+  };
+  return main;
+};
+
 // src/use/route/route.ts
 function useRouterQuery() {
-  const route = useRoute();
+  const route = useRoute2();
   const { query } = route;
   return query;
 }
@@ -252,7 +270,7 @@ function useRouteKey(originKey, route, routeKey) {
   }
   routeKey.value = originKey.value;
   const routeListener = new RouteListener(route);
-  watch2(originKey, (newVal, oldVal) => {
+  watch3(originKey, (newVal, oldVal) => {
     if (newVal !== oldVal) {
       routeListener.nextChange(() => {
         routeKey.value = newVal;
@@ -269,7 +287,7 @@ import {
   getCurrentInstance,
   isReactive,
   toRaw,
-  watch as watch3
+  watch as watch4
 } from "vue";
 function useProps() {
   const vue = getCurrentInstance().proxy;
@@ -281,7 +299,7 @@ function getOrigin(val) {
 function usePropsWatch(key, callback, options) {
   const props = useProps();
   if (Object.prototype.hasOwnProperty.call(props, key)) {
-    watch3(
+    watch4(
       () => props[key],
       (newVal, oldVal) => {
         callback(getOrigin(newVal), getOrigin(oldVal));
@@ -327,7 +345,7 @@ import {
   onClickOutside
 } from "@ibiz-template/core";
 import { isNil } from "ramda";
-import { onBeforeUnmount, watch as watch4 } from "vue";
+import { onBeforeUnmount, watch as watch5 } from "vue";
 function useClickOutside(elRef, handler, options = {}) {
   let stop = NOOP;
   let pause = NOOP;
@@ -338,7 +356,7 @@ function useClickOutside(elRef, handler, options = {}) {
     pause = NOOP;
     proceed = NOOP;
   };
-  watch4(
+  watch5(
     elRef,
     (newVal, oldVal) => {
       if (newVal !== oldVal) {
@@ -373,10 +391,10 @@ function useClickOutside(elRef, handler, options = {}) {
 // src/use/event/event.ts
 import { listenJSEvent, NOOP as NOOP2 } from "@ibiz-template/core";
 import { isNil as isNil2 } from "ramda";
-import { onBeforeUnmount as onBeforeUnmount2, watch as watch5 } from "vue";
+import { onBeforeUnmount as onBeforeUnmount2, watch as watch6 } from "vue";
 function useEventListener(elRef, eventName, listener, options = {}) {
   let cleanup = NOOP2;
-  watch5(
+  watch6(
     elRef,
     (newVal, oldVal) => {
       if (newVal !== oldVal) {
@@ -406,7 +424,13 @@ function useEventListener(elRef, eventName, listener, options = {}) {
 }
 
 // src/use/view/use-view-controller/use-view-controller.ts
-import { inject, onBeforeUnmount as onBeforeUnmount3, provide, reactive } from "vue";
+import {
+  getCurrentInstance as getCurrentInstance2,
+  inject,
+  onBeforeUnmount as onBeforeUnmount3,
+  provide,
+  reactive
+} from "vue";
 function useViewController(fn) {
   const props = useProps();
   const ctx = inject("ctx", void 0);
@@ -417,14 +441,18 @@ function useViewController(fn) {
   if (props.modal) {
     c.modal = props.modal;
   }
+  const vue = getCurrentInstance2().proxy;
   c.force = useForce();
+  c.evt.onAll((eventName, event) => {
+    vue.$emit(eventName.slice(2), event);
+  });
   c.created();
   onBeforeUnmount3(() => c.destroyed());
   return c;
 }
 
 // src/use/widgets/use-control-controller/use-control-controller.ts
-import { inject as inject2, onBeforeUnmount as onBeforeUnmount4, reactive as reactive2 } from "vue";
+import { getCurrentInstance as getCurrentInstance3, inject as inject2, onBeforeUnmount as onBeforeUnmount4, reactive as reactive2 } from "vue";
 function useControlController(fn) {
   const ctx = inject2("ctx");
   const props = useProps();
@@ -432,6 +460,10 @@ function useControlController(fn) {
   const c = fn(props.modelData, props.context, props.params, ctx);
   c.state = reactive2(c.state);
   c.force = useForce();
+  const vue = getCurrentInstance3().proxy;
+  c.evt.onAll((eventName, event) => {
+    vue.$emit(eventName, event);
+  });
   c.created();
   onBeforeUnmount4(() => c.destroyed());
   return c;
@@ -517,8 +549,6 @@ export {
   EmptyVNode,
   RequiredProp,
   RouteListener,
-  findView,
-  findViewByName,
   generateRoutePath,
   getEditorEmits,
   getEditorProps,
@@ -532,8 +562,8 @@ export {
   getInputProps,
   getOrigin,
   getOwnRouteContext,
-  getViewName,
   isEmptyVNode,
+  onRouteChange,
   parseRouteViewData,
   route2routePath,
   routePath2string,
@@ -548,5 +578,6 @@ export {
   usePropsWatch,
   useRouteKey,
   useRouterQuery,
-  useViewController
+  useViewController,
+  withInstall
 };

package/dist/index.system.min.js

@@ -1 +1 @@
-System.register(["@ibiz-template/core","vue-router","vue","qx-util","qs","ramda"],(function(e){"use strict";var t,n,r,o,a,i,s,c,u,l,p,d,f,m,h,v,g,x,N,w;return{setters:[function(e){t=e.Namespace,n=e.RuntimeError,r=e.onClickOutside,o=e.NOOP,a=e.listenJSEvent},function(e){i=e.useRoute},function(e){s=e.createCommentVNode,c=e.watch,u=e.ref,l=e.getCurrentInstance,p=e.isReactive,d=e.toRaw,f=e.onBeforeUnmount,m=e.inject,h=e.provide,v=e.reactive},function(e){g=e.notNilEmpty,x=e.isFunc},function(e){N=e.default},function(e){w=e.isNil}],execute:function(){function b(e){const t=e.getOwnContext(),n=["srfsessionid"];return Object.keys(t).forEach((e=>{n.includes(e)&&delete t[e]})),t}function y(e){const t=e.matched.length,n=[];for(let r=1;r<=t;r++){const t=e.params[`view${r}`],o=e.params[`params${r}`];let a,i,s;a=o&&o!==ibiz.env.routePlaceholder?N.parse(o,{strictNullHandling:!0,delimiter:";"}):void 0,a&&(1===r?(i=a,a=void 0):(a.srfnavctx&&(i=JSON.parse(decodeURIComponent(a.srfnavctx)),delete a.srfnavctx),a.srfnav&&(s=a.srfnav,delete a.srfnav))),n.push({viewName:t,context:i,params:a,srfnav:s})}let r;return e.params.appContext&&e.params.appContext!==ibiz.env.routePlaceholder&&(r=N.parse(e.params.appContext,{strictNullHandling:!0,delimiter:";"})),{appContext:r,pathNodes:n}}function C(e){let t="";return e.appContext?t+=`/${N.stringify(e.appContext,{delimiter:";",strictNullHandling:!0})}`:t+=`/${ibiz.env.routePlaceholder}`,e.pathNodes.forEach(((e,n)=>{let r;if(t+=`/${e.viewName}/`,0===n)g(e.context)&&(r=e.context);else if(r=g(e.params)?e.params:{},g(e.context)){const t=JSON.stringify(e.context);"{}"!==t&&(r.srfnavctx=encodeURIComponent(t))}t+=N.stringify(r,{delimiter:";",strictNullHandling:!0})||ibiz.env.routePlaceholder})),t}e({findView:function(e,t){return},findViewByName:function(e,t){return},generateRoutePath:function(e,t,n,r){const o=y(t);let a=2;n.toRouteLevel&&(a=n.toRouteLevel,delete n.toRouteLevel);if(o.pathNodes.splice(a-1,o.pathNodes.length-a+1),n.currentSrfNav){const e=o.pathNodes[o.pathNodes.length-1];e.params=e.params||{},e.params.srfnav=n.currentSrfNav,delete n.currentSrfNav}t.fullPath.startsWith("/appredirectview")&&((null==r?void 0:r.srfindexname)?(o.pathNodes[0].viewName=r.srfindexname,delete r.srfindexname):o.pathNodes[0].viewName="index");return o.pathNodes.push({viewName:e.codeName.toLowerCase(),context:b(n),params:r}),{path:C(o)}},getEditorEmits:function(){return{change:(e,t)=>!0,operate:e=>!0}},getEditorProps:$,getGridEditorCommonProps:S,getGridEditorEmits:function(){return{change:(e,t)=>!0,rowSave:()=>!0}},getGridInputIpProps:function(){return{...j(),...S()}},getGridInputNumberProps:function(){return{...z(),...S()}},getGridInputProps:function(){return{...V(),...S()}},getInputIpProps:j,getInputNumberProps:z,getInputProps:V,getOrigin:E,getOwnRouteContext:b,getViewName:function(e){return e.codeName.toLowerCase()},isEmptyVNode:function(e){if(!Array.isArray(e))return e===I;return 1===e.length&&e[0]===I},parseRouteViewData:async function(e,t){var r;const o=y(e);let a=o.pathNodes[t-1].viewName;if(!a)throw new n(`第${t}级路由不存在视图标识`);"index"===a&&(a=ibiz.hub.defaultAppIndexViewName);const i=await ibiz.hub.getAppView(a);if(!i)throw new n(`找不到视图${a}`);const s={};(null==(r=ibiz.appData)?void 0:r.context)&&Object.assign(s,ibiz.appData.context);o.appContext&&Object.assign(s,o.appContext);for(let e=0;e<t;e++){const t=o.pathNodes[e];g(t.context)&&Object.assign(s,t.context)}const{params:c,srfnav:u}=o.pathNodes[t-1];return{viewModel:i,context:s,params:c,srfnav:u}},route2routePath:y,routePath2string:C,useClickOutside:function(e,t,n={}){let a=o,i=o,s=o;const u=()=>{a(),a=o,i=o,s=o};return c(e,((e,o)=>{if(e!==o)if(w(e))u();else{const o=r((null==e?void 0:e.$el)||e,t,n);a=o.stop,i=o.pause,s=o.proceed}}),{immediate:!0}),f((()=>{a!==o&&u()})),{stop:()=>a(),pause:()=>i(),proceed:()=>s()}},useControlController:function(e){const t=m("ctx"),n=O();t.evt.emit("forecast",n.modelData.name);const r=e(n.modelData,n.context,n.params,t);return r.state=v(r.state),r.force=R(),r.created(),f((()=>r.destroyed())),r},useController:function(e){e.force=R()},useEventListener:function(e,t,n,r={}){let i=o;return c(e,((e,s)=>{e!==s&&(w(e)?(i(),i=o):i=a((null==e?void 0:e.$el)||e,t,n,r))}),{immediate:!0}),f((()=>{i!==o&&i()})),()=>{i()}},useForce:R,useForceTogether:function(e,t){const n=t.force,r=R();t.force=e=>{n(e),r()}},useNamespace:function(e){return new t(e,ibiz.env.namespace)},useProps:O,usePropsWatch:function(e,t,n){const r=O();Object.prototype.hasOwnProperty.call(r,e)&&(c((()=>r[e]),((e,n)=>{t(E(e),E(n))}),n),t(E(r[e]),void 0))},useRouteKey:function(e,t,n){n||(n=u(""));n.value=e.value;const r=new P(t);return c(e,((e,t)=>{e!==t&&r.nextChange((()=>{n.value=e}))})),n},useRouterQuery:function(){const e=i(),{query:t}=e;return t},useViewController:function(e){const t=O(),n=m("ctx",void 0);null==n||n.evt.emit("forecast",t.modelData.name);const r=e(t.modelData,t.context,t.params,n);h("ctx",r.ctx),r.state=v(r.state),t.modal&&(r.modal=t.modal);return r.force=R(),r.created(),f((()=>r.destroyed())),r}});var P=e("RouteListener",class{constructor(e,t){this.callbacks=[],this.timers=[],this.wait=500,t&&(this.wait=t),c((()=>e.path),((e,t)=>{if(e!==t){if(this.callbacks.length)for(let e=0;e<this.callbacks.length;e++){(0,this.callbacks[e])()}if(this.callbacks=[],this.timers.length)for(let e=0;e<this.timers.length;e++){const t=this.timers[e];clearTimeout(t)}this.timers=[]}}))}nextChange(e){e&&(this.timers.push(setTimeout((()=>{e();const t=this.callbacks.findIndex((t=>t===e));this.callbacks.splice(t,1)}),this.wait)),this.callbacks.push(e))}});function O(){return l().proxy.$props}function E(e){return p(e)?d(e):e}function R(){const e=l().proxy;return t=>{e.$forceUpdate(),t&&x(t)&&e.$nextTick((()=>{t()}))}}var I=e("EmptyVNode",s("EmptyVNode"));var k=e("RequiredProp",class{constructor(e,t,n){this.required=!0,t&&(this.default=t),n&&(this.validator=n),this.type=e}});function $(){return{value:String,controller:new k(Object),data:new k(Object),disabled:{type:Boolean},readonly:{type:Boolean,default:!1},autoFocus:{type:Boolean,default:!1}}}function S(){return{hasError:{type:Boolean}}}function V(){return{...$(),value:String}}function z(){return{...$(),value:Number}}function j(){return{...$(),value:String}}}}}));
+System.register(["@ibiz-template/core","vue-router","vue","qx-util","qs","ramda"],(function(t){"use strict";var e,n,o,r,a,s,i,c,u,l,p,d,f,h,m,v,g,x,N,w;return{setters:[function(t){e=t.Namespace,n=t.RuntimeError,o=t.onClickOutside,r=t.NOOP,a=t.listenJSEvent},function(t){s=t.useRoute},function(t){i=t.createCommentVNode,c=t.watch,u=t.ref,l=t.getCurrentInstance,p=t.isReactive,d=t.toRaw,f=t.onBeforeUnmount,h=t.inject,m=t.provide,v=t.reactive},function(t){g=t.notNilEmpty,x=t.isFunc},function(t){N=t.default},function(t){w=t.isNil}],execute:function(){function b(t){const e=t.getOwnContext(),n=["srfsessionid","srfappid"];return Object.keys(e).forEach((t=>{n.includes(t)&&delete e[t]})),e}function y(t){const e=t.matched.length,n=[];for(let o=1;o<=e;o++){const e=t.params[`view${o}`],r=t.params[`params${o}`];let a,s,i;a=r&&r!==ibiz.env.routePlaceholder?N.parse(r,{strictNullHandling:!0,delimiter:";"}):void 0,a&&(1===o?(s=a,a=void 0):(a.srfnavctx&&(s=JSON.parse(decodeURIComponent(a.srfnavctx)),delete a.srfnavctx),a.srfnav&&(i=a.srfnav,delete a.srfnav))),n.push({viewName:e,context:s,params:a,srfnav:i})}let o;return t.params.appContext&&t.params.appContext!==ibiz.env.routePlaceholder&&(o=N.parse(t.params.appContext,{strictNullHandling:!0,delimiter:";"})),{appContext:o,pathNodes:n}}function C(t){let e="";return t.appContext?e+=`/${N.stringify(t.appContext,{delimiter:";",strictNullHandling:!0})}`:e+=`/${ibiz.env.routePlaceholder}`,t.pathNodes.forEach(((t,n)=>{let o;if(e+=`/${t.viewName}/`,0===n)g(t.context)&&(o=t.context);else if(o=g(t.params)?t.params:{},g(t.context)){const e=JSON.stringify(t.context);"{}"!==e&&(o.srfnavctx=encodeURIComponent(e))}e+=N.stringify(o,{delimiter:";",strictNullHandling:!0})||ibiz.env.routePlaceholder})),e}t({generateRoutePath:function(t,e,n,o){const r=y(e);let a=2;n.toRouteDepth&&(a=n.toRouteDepth,delete n.toRouteDepth);if(r.pathNodes.splice(a-1,r.pathNodes.length-a+1),n.currentSrfNav){const t=r.pathNodes[r.pathNodes.length-1];t.params=t.params||{},t.params.srfnav=n.currentSrfNav,delete n.currentSrfNav}e.fullPath.startsWith("/appredirectview")&&((null==o?void 0:o.srfindexname)?(r.pathNodes[0].viewName=o.srfindexname,delete o.srfindexname):r.pathNodes[0].viewName="index");return r.pathNodes.push({viewName:t.codeName.toLowerCase(),context:b(n),params:o}),{path:C(r)}},getEditorEmits:function(){return{change:(t,e)=>!0,operate:t=>!0}},getEditorProps:k,getGridEditorCommonProps:S,getGridEditorEmits:function(){return{change:(t,e)=>!0,rowSave:()=>!0}},getGridInputIpProps:function(){return{...j(),...S()}},getGridInputNumberProps:function(){return{...D(),...S()}},getGridInputProps:function(){return{...z(),...S()}},getInputIpProps:j,getInputNumberProps:D,getInputProps:z,getOrigin:R,getOwnRouteContext:b,isEmptyVNode:function(t){if(!Array.isArray(t))return t===I;return 1===t.length&&t[0]===I},onRouteChange:function(t,e){const n=s();c((()=>n.path),(()=>{const o=y(n);let r="";o.pathNodes.length>=e&&(o.pathNodes=o.pathNodes.slice(0,e),delete o.pathNodes[e-1].srfnav,r=C(o)),t({currentKey:r,fullPath:n.fullPath})}),{immediate:!0})},parseRouteViewData:async function(t,e){var o;const r=y(t);let a=r.pathNodes[e-1].viewName;if(!a)throw new n(`第${e}级路由不存在视图标识`);"index"===a&&(a=ibiz.hub.defaultAppIndexViewName);const s=await ibiz.hub.getAppView(a);if(!s)throw new n(`找不到视图${a}`);const i={};(null==(o=ibiz.appData)?void 0:o.context)&&Object.assign(i,ibiz.appData.context);r.appContext&&Object.assign(i,r.appContext);for(let t=0;t<e;t++){const e=r.pathNodes[t];g(e.context)&&Object.assign(i,e.context)}const{params:c,srfnav:u}=r.pathNodes[e-1];return{viewModel:s,context:i,params:c,srfnav:u}},route2routePath:y,routePath2string:C,useClickOutside:function(t,e,n={}){let a=r,s=r,i=r;const u=()=>{a(),a=r,s=r,i=r};return c(t,((t,r)=>{if(t!==r)if(w(t))u();else{const r=o((null==t?void 0:t.$el)||t,e,n);a=r.stop,s=r.pause,i=r.proceed}}),{immediate:!0}),f((()=>{a!==r&&u()})),{stop:()=>a(),pause:()=>s(),proceed:()=>i()}},useControlController:function(t){const e=h("ctx"),n=O();e.evt.emit("forecast",n.modelData.name);const o=t(n.modelData,n.context,n.params,e);o.state=v(o.state),o.force=E();const r=l().proxy;return o.evt.onAll(((t,e)=>{r.$emit(t,e)})),o.created(),f((()=>o.destroyed())),o},useController:function(t){t.force=E()},useEventListener:function(t,e,n,o={}){let s=r;return c(t,((t,i)=>{t!==i&&(w(t)?(s(),s=r):s=a((null==t?void 0:t.$el)||t,e,n,o))}),{immediate:!0}),f((()=>{s!==r&&s()})),()=>{s()}},useForce:E,useForceTogether:function(t,e){const n=e.force,o=E();e.force=t=>{n(t),o()}},useNamespace:function(t){return new e(t,ibiz.env.namespace)},useProps:O,usePropsWatch:function(t,e,n){const o=O();Object.prototype.hasOwnProperty.call(o,t)&&(c((()=>o[t]),((t,n)=>{e(R(t),R(n))}),n),e(R(o[t]),void 0))},useRouteKey:function(t,e,n){n||(n=u(""));n.value=t.value;const o=new P(e);return c(t,((t,e)=>{t!==e&&o.nextChange((()=>{n.value=t}))})),n},useRouterQuery:function(){const t=s(),{query:e}=t;return e},useViewController:function(t){const e=O(),n=h("ctx",void 0);null==n||n.evt.emit("forecast",e.modelData.name);const o=t(e.modelData,e.context,e.params,n);m("ctx",o.ctx),o.state=v(o.state),e.modal&&(o.modal=e.modal);const r=l().proxy;return o.force=E(),o.evt.onAll(((t,e)=>{r.$emit(t.slice(2),e)})),o.created(),f((()=>o.destroyed())),o}});var P=t("RouteListener",class{constructor(t,e){this.callbacks=[],this.timers=[],this.wait=500,e&&(this.wait=e),c((()=>t.path),((t,e)=>{if(t!==e){if(this.callbacks.length)for(let t=0;t<this.callbacks.length;t++){(0,this.callbacks[t])()}if(this.callbacks=[],this.timers.length)for(let t=0;t<this.timers.length;t++){const e=this.timers[t];clearTimeout(e)}this.timers=[]}}))}nextChange(t){t&&(this.timers.push(setTimeout((()=>{t();const e=this.callbacks.findIndex((e=>e===t));this.callbacks.splice(e,1)}),this.wait)),this.callbacks.push(t))}});t("withInstall",((t,e)=>(t.install=t=>{e(t)},t)));function O(){return l().proxy.$props}function R(t){return p(t)?d(t):t}function E(){const t=l().proxy;return e=>{t.$forceUpdate(),e&&x(e)&&t.$nextTick((()=>{e()}))}}var I=t("EmptyVNode",i("EmptyVNode"));var $=t("RequiredProp",class{constructor(t,e,n){this.required=!0,e&&(this.default=e),n&&(this.validator=n),this.type=t}});function k(){return{value:String,controller:new $(Object),data:new $(Object),disabled:{type:Boolean},readonly:{type:Boolean,default:!1},autoFocus:{type:Boolean,default:!1}}}function S(){return{hasError:{type:Boolean}}}function z(){return{...k(),value:String}}function D(){return{...k(),value:Number}}function j(){return{...k(),value:String}}}}}));

package/out/use/view/use-view-controller/use-view-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-view-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/view/use-view-controller/use-view-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAI7D;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,cAAc,EACxD,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,cAAc,CAAC,KAAK,CAAC,GAC/D,CAAC,CAyBH"}
+{"version":3,"file":"use-view-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/view/use-view-controller/use-view-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAU7D;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,cAAc,EACxD,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,cAAc,CAAC,KAAK,CAAC,GAC/D,CAAC,CA8BH"}

package/out/use/view/use-view-controller/use-view-controller.js

@@ -1,4 +1,4 @@
-import { inject, onBeforeUnmount, provide, reactive } from 'vue';
+import { getCurrentInstance, inject, onBeforeUnmount, provide, reactive, } from 'vue';
 import { useForce, useProps } from '../../vue/vue';
 /**
  * 初始化视图控制器
@@ -20,15 +20,18 @@ export function useViewController(fn) {
     ctx === null || ctx === void 0 ? void 0 : ctx.evt.emit('forecast', props.modelData.name);
     const c = fn(props.modelData, props.context, props.params, ctx);
     // 提供自身的ctx给下层组件
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     provide('ctx', c.ctx);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // 让state 响应式
     c.state = reactive(c.state);
     // 从props赋值modal,如果存在的话。
     if (props.modal) {
         c.modal = props.modal;
     }
+    const vue = getCurrentInstance().proxy;
     c.force = useForce();
+    c.evt.onAll((eventName, event) => {
+        vue.$emit(eventName.slice(2), event);
+    });
     c.created();
     // 卸载时销毁
     onBeforeUnmount(() => c.destroyed());

package/out/use/widgets/use-control-controller/use-control-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-control-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/widgets/use-control-controller/use-control-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAO,MAAM,wBAAwB,CAAC;AAIhE;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,EAC9D,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,GAClE,CAAC,CAkBH"}
+{"version":3,"file":"use-control-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/widgets/use-control-controller/use-control-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAO,MAAM,wBAAwB,CAAC;AAIhE;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,EAC9D,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,GAClE,CAAC,CAwBH"}

package/out/use/widgets/use-control-controller/use-control-controller.js

@@ -1,4 +1,4 @@
-import { inject, onBeforeUnmount, reactive } from 'vue';
+import { getCurrentInstance, inject, onBeforeUnmount, reactive } from 'vue';
 import { useForce, useProps } from '../../vue/vue';
 /**
  * 初始化部件控制器
@@ -20,6 +20,10 @@ export function useControlController(fn) {
     const c = fn(props.modelData, props.context, props.params, ctx);
     c.state = reactive(c.state);
     c.force = useForce();
+    const vue = getCurrentInstance().proxy;
+    c.evt.onAll((eventName, event) => {
+        vue.$emit(eventName, event);
+    });
     c.created();
     // 挂载强制更新方法
     // 卸载时销毁

package/out/util/index.d.ts

@@ -1,3 +1,4 @@
 export * from './route/route';
 export * from './route/route-listener';
+export * from './install';
 //# sourceMappingURL=index.d.ts.map

package/out/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,WAAW,CAAC"}

package/out/util/index.js

@@ -1,2 +1,3 @@
 export * from './route/route';
 export * from './route/route-listener';
+export * from './install';

package/out/util/install.d.ts

@@ -0,0 +1,4 @@
+import type { App, Plugin } from 'vue';
+export type TypeWithInstall<T> = T & Plugin;
+export declare const withInstall: <T>(main: T, install: (_v: App) => void) => TypeWithInstall<T>;
+//# sourceMappingURL=install.d.ts.map

package/out/util/install.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/util/install.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAEvC,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;AAE5C,eAAO,MAAM,WAAW,6BAA8B,GAAG,KAAK,IAAI,uBAKjE,CAAC"}

package/out/util/install.js

@@ -0,0 +1,6 @@
+export const withInstall = (main, install) => {
+    main.install = (app) => {
+        install(app);
+    };
+    return main;
+};

package/out/util/route/route.d.ts

@@ -1,4 +1,4 @@
-import { IApplication, IAppView } from '@ibiz/model-core';
+import { IAppView } from '@ibiz/model-core';
 import { RouteLocationNormalizedLoaded as Route } from 'vue-router';
 import { IRoutePath, IRouteViewData } from '../../interface';
 /**
@@ -26,32 +26,6 @@ export declare function getOwnRouteContext(context: IContext): IParams;
 export declare function generateRoutePath(appView: IAppView, route: Route, context: IContext, params?: IParams | undefined): {
     path: string;
 };
-/**
- * 获取视图模型的codeName(小写)
- *
- * @export
- * @param {IAppView} model
- * @returns {*}
- */
-export declare function getViewName(model: IAppView): string;
-/**
- * 在单个应用里
- * 通过视图的codeName找到视图模型
- *
- * @param {(IApplication | ISubAppRef)} appModel 主应用或子应用
- * @param {string} viewCodeName 视图名称小写
- * @returns {*}
- */
-export declare function findViewByName(_appModel: IApplication, _viewCodeName: string): undefined;
-/**
- * 从子应用和主应用里
- * 通过视图的codeName找视图模型
- *
- * @param {IApplication} appModel 主应用
- * @param {string} viewCodeName 视图名称小写
- * @returns {*}
- */
-export declare function findView(_appModel: IApplication, _viewCodeName: string): undefined;
 /**
  * 解析路由获取对应视图数据
  *
@@ -60,10 +34,10 @@ export declare function findView(_appModel: IApplication, _viewCodeName: string)
  * @export
  * @param {IApplication} appModel 视图模型
  * @param {Route} route 路由对象
- * @param {number} level 层级
+ * @param {number} depth 层级
  * @returns {*}  {IRouteViewData}
  */
-export declare function parseRouteViewData(route: Route, level: number): Promise<IRouteViewData>;
+export declare function parseRouteViewData(route: Route, depth: number): Promise<IRouteViewData>;
 /**
  * 路径字符串转换成路由路径对象
  *
@@ -84,4 +58,16 @@ export declare function route2routePath(route: Route): IRoutePath;
  * @returns {*}  {string}
  */
 export declare function routePath2string(routePath: IRoutePath): string;
+/**
+ * 监听路由的变更，每次变更后都会触发回调
+ * 回调函数提供根据视图层级计算好的唯一标识currentKey，只有变了视图才需要刷新
+ * @author lxm
+ * @date 2023-05-09 12:52:36
+ * @param {(args: { currentKey: string; fullPath: string }) => void} callback
+ * @param {number} depth
+ */
+export declare function onRouteChange(callback: (args: {
+    currentKey: string;
+    fullPath: string;
+}) => void, depth: number): void;
 //# sourceMappingURL=route.d.ts.map

package/out/util/route/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/util/route/route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,6BAA6B,IAAI,KAAK,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAS7D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAiElB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,UAE1C;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,MAAM,GACpB,SAAS,CAKX;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CACtB,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,MAAM,GACpB,SAAS,CAwBX;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAkDzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CA+DxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAyC9D"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/util/route/route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,6BAA6B,IAAI,KAAK,EAAY,MAAM,YAAY,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAS7D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAiElB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAkDzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CA+DxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAyC9D;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,EAClE,KAAK,EAAE,MAAM,QAmBd"}

package/out/util/route/route.js

@@ -1,6 +1,8 @@
 import { notNilEmpty } from 'qx-util';
 import { RuntimeError } from '@ibiz-template/core';
 import qs from 'qs';
+import { useRoute } from 'vue-router';
+import { watch } from 'vue';
 /**
  * 获取自身的路由上下文，排除了部分不需要路由携带的参数
  *
@@ -12,7 +14,7 @@ import qs from 'qs';
  */
 export function getOwnRouteContext(context) {
     const ownContext = context.getOwnContext();
-    const excludeKeys = ['srfsessionid'];
+    const excludeKeys = ['srfsessionid', 'srfappid'];
     Object.keys(ownContext).forEach(key => {
         if (excludeKeys.includes(key)) {
             delete ownContext[key];
@@ -34,15 +36,15 @@ export function getOwnRouteContext(context) {
  */
 export function generateRoutePath(appView, route, context, params) {
     const routePath = route2routePath(route);
-    // 如果上下文存在toRouteLevel时，使用上下文的层级，否则是第二级路由
-    let level = 2;
-    if (context.toRouteLevel) {
-        level = context.toRouteLevel;
+    // 如果上下文存在toRouteDepth时，使用上下文的层级，否则是第二级路由
+    let depth = 2;
+    if (context.toRouteDepth) {
+        depth = context.toRouteDepth;
         // 使用完后删除，避免添加到首页上下文里
-        delete context.toRouteLevel;
+        delete context.toRouteDepth;
     }
     // 删除目标层级和之后的路由，保留之前层级的路由
-    routePath.pathNodes.splice(level - 1, routePath.pathNodes.length - level + 1);
+    routePath.pathNodes.splice(depth - 1, routePath.pathNodes.length - depth + 1);
     // 导航视图的导航参数,加在目标层级之前的一个层级的视图参数里
     if (context.currentSrfNav) {
         const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
@@ -69,7 +71,7 @@ export function generateRoutePath(appView, route, context, params) {
     });
     // 计算二级视图的资源路径加到index后面
     // const codeName = appView.getPSAppDataEntity()?.codeName;
-    // if (level === 2 && codeName) {
+    // if (depth === 2 && codeName) {
     //   const app = ibiz.hub.getApp(appView.getPSModelService().app);
     //   const paths = app.resourcePathUtil.calcPaths(codeName);
     //   const resContext = calcRouteContext(context, paths);
@@ -77,7 +79,7 @@ export function generateRoutePath(appView, route, context, params) {
     //     // 资源路径不为空,二级视图的上下文删掉多余的资源上下文
     //     routePath.pathNodes[0].context = resContext;
     //     Object.keys(resContext).forEach(key => {
-    //       const currentNode = routePath.pathNodes[level - 1];
+    //       const currentNode = routePath.pathNodes[depth - 1];
     //       if (
     //         currentNode.context &&
     //         Object.prototype.hasOwnProperty.call(currentNode.context, key)
@@ -92,63 +94,6 @@ export function generateRoutePath(appView, route, context, params) {
     // 视图参数通过query传递
     return { path: routePath2string(routePath) };
 }
-/**
- * 获取视图模型的codeName(小写)
- *
- * @export
- * @param {IAppView} model
- * @returns {*}
- */
-export function getViewName(model) {
-    return model.codeName.toLowerCase();
-}
-/**
- * 在单个应用里
- * 通过视图的codeName找到视图模型
- *
- * @param {(IApplication | ISubAppRef)} appModel 主应用或子应用
- * @param {string} viewCodeName 视图名称小写
- * @returns {*}
- */
-export function findViewByName(_appModel, _viewCodeName) {
-    // return appModel.getAllPSAppViews()?.find((model: IAppView) => {
-    //   return getViewName(model) === viewCodeName;
-    // });
-    return undefined;
-}
-/**
- * 从子应用和主应用里
- * 通过视图的codeName找视图模型
- *
- * @param {IApplication} appModel 主应用
- * @param {string} viewCodeName 视图名称小写
- * @returns {*}
- */
-export function findView(_appModel, _viewCodeName) {
-    // let viewModel: IAppView | null | undefined;
-    // viewCodeName = viewCodeName.toLowerCase();
-    // // index找默认首页视图，其他匹配codeName
-    // if (viewCodeName === 'index') {
-    //   viewModel = appModel.getDefaultPSAppIndexView();
-    // } else {
-    //   // 先查找子应用，找到则不继续找了,优先从最后面的子应用找起
-    //   if (appModel.getAllPSSubAppRefs()?.length) {
-    //     appModel
-    //       .getAllPSSubAppRefs()!
-    //       .reverse()
-    //       .find(sub => {
-    //         viewModel = findViewByName(sub, viewCodeName);
-    //         return !!viewModel;
-    //       });
-    //   }
-    //   // 子应用里没有就在主应用里找。
-    //   if (!viewModel) {
-    //     viewModel = findViewByName(appModel, viewCodeName);
-    //   }
-    // }
-    // return viewModel;
-    return undefined;
-}
 /**
  * 解析路由获取对应视图数据
  *
@@ -157,17 +102,17 @@ export function findView(_appModel, _viewCodeName) {
  * @export
  * @param {IApplication} appModel 视图模型
  * @param {Route} route 路由对象
- * @param {number} level 层级
+ * @param {number} depth 层级
  * @returns {*}  {IRouteViewData}
  */
-export async function parseRouteViewData(route, level) {
+export async function parseRouteViewData(route, depth) {
     var _a;
     // 解析路由的视图参数
     const routePath = route2routePath(route);
     // 获取对应层级的视图名称参数
-    let viewCodeName = routePath.pathNodes[level - 1].viewName;
+    let viewCodeName = routePath.pathNodes[depth - 1].viewName;
     if (!viewCodeName) {
-        throw new RuntimeError(`第${level}级路由不存在视图标识`);
+        throw new RuntimeError(`第${depth}级路由不存在视图标识`);
     }
     if (viewCodeName === 'index') {
         viewCodeName = ibiz.hub.defaultAppIndexViewName;
@@ -190,14 +135,14 @@ export async function parseRouteViewData(route, level) {
         Object.assign(context, routePath.appContext);
     }
     // 逐层合并视图上下文
-    for (let index = 0; index < level; index++) {
+    for (let index = 0; index < depth; index++) {
         const pathNode = routePath.pathNodes[index];
         if (notNilEmpty(pathNode.context)) {
             Object.assign(context, pathNode.context);
         }
     }
     // 最后一级路由对应的视图才会解析视图参数
-    const { params, srfnav } = routePath.pathNodes[level - 1];
+    const { params, srfnav } = routePath.pathNodes[depth - 1];
     return {
         viewModel,
         context,
@@ -216,10 +161,10 @@ export async function parseRouteViewData(route, level) {
  */
 export function route2routePath(route) {
     // 一共匹配了几级路由
-    const level = route.matched.length;
+    const depth = route.matched.length;
     // 解析路径节点
     const pathNodes = [];
-    for (let index = 1; index <= level; index++) {
+    for (let index = 1; index <= depth; index++) {
         const viewName = route.params[`view${index}`];
         const paramsStr = route.params[`params${index}`];
         /** 路由参数，默认是视图参数 */
@@ -321,3 +266,26 @@ export function routePath2string(routePath) {
     });
     return pathStr;
 }
+/**
+ * 监听路由的变更，每次变更后都会触发回调
+ * 回调函数提供根据视图层级计算好的唯一标识currentKey，只有变了视图才需要刷新
+ * @author lxm
+ * @date 2023-05-09 12:52:36
+ * @param {(args: { currentKey: string; fullPath: string }) => void} callback
+ * @param {number} depth
+ */
+export function onRouteChange(callback, depth) {
+    const route = useRoute();
+    watch(() => route.path, () => {
+        const routePath = route2routePath(route);
+        let currentKey = '';
+        if (routePath.pathNodes.length >= depth) {
+            // 删除depth后面的节点
+            routePath.pathNodes = routePath.pathNodes.slice(0, depth);
+            // 删除自身的srfnav
+            delete routePath.pathNodes[depth - 1].srfnav;
+            currentKey = routePath2string(routePath);
+        }
+        callback({ currentKey, fullPath: route.fullPath });
+    }, { immediate: true });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.0.4-beta.3",
+  "version": "0.0.4-beta.5",
   "description": "vue3 工具包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.0.4-beta.3",
-    "@ibiz-template/runtime": "^0.0.4-beta.3",
+    "@ibiz-template/core": "^0.0.4-beta.5",
+    "@ibiz-template/runtime": "^0.0.4-beta.5",
     "@ibiz/model-core": "^0.0.6",
     "@types/qs": "^6.9.7",
     "qs": "^6.11.1",
@@ -49,5 +49,5 @@
     "vue": "^3.2.47",
     "vue-router": "^4.1.6"
   },
-  "gitHead": "78d7e7c4cf7521133c32205593fbfa0b5adac9e6"
+  "gitHead": "899c34a41e55998a64d331fcf8ea28c94d1fdbce"
 }

package/src/use/view/use-view-controller/use-view-controller.ts

@@ -1,5 +1,12 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { CTX, ViewController } from '@ibiz-template/runtime';
-import { inject, onBeforeUnmount, provide, reactive } from 'vue';
+import {
+  getCurrentInstance,
+  inject,
+  onBeforeUnmount,
+  provide,
+  reactive,
+} from 'vue';
 import { useForce, useProps } from '../../vue/vue';
 
 /**
@@ -24,17 +31,22 @@ export function useViewController<T extends ViewController>(
   ctx?.evt.emit('forecast', props.modelData.name!);
   const c = fn(props.modelData, props.context, props.params, ctx);
   // 提供自身的ctx给下层组件
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   provide('ctx', (c as any).ctx);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // 让state 响应式
   c.state = reactive(c.state) as any;
   // 从props赋值modal,如果存在的话。
   if (props.modal) {
     c.modal = props.modal;
   }
 
+  const vue = getCurrentInstance()!.proxy!;
+
   c.force = useForce();
 
+  c.evt.onAll((eventName, event) => {
+    vue.$emit(eventName.slice(2), event);
+  });
+
   c.created();
 
   // 卸载时销毁

package/src/use/widgets/use-control-controller/use-control-controller.ts

@@ -1,5 +1,5 @@
 import { ControlController, CTX } from '@ibiz-template/runtime';
-import { inject, onBeforeUnmount, reactive } from 'vue';
+import { getCurrentInstance, inject, onBeforeUnmount, reactive } from 'vue';
 import { useForce, useProps } from '../../vue/vue';
 
 /**
@@ -26,6 +26,12 @@ export function useControlController<T extends ControlController>(
 
   c.force = useForce();
 
+  const vue = getCurrentInstance()!.proxy!;
+
+  c.evt.onAll((eventName, event) => {
+    vue.$emit(eventName, event);
+  });
+
   c.created();
 
   // 挂载强制更新方法

package/src/util/index.ts

@@ -1,2 +1,3 @@
 export * from './route/route';
 export * from './route/route-listener';
+export * from './install';

package/src/util/install.ts

@@ -0,0 +1,11 @@
+/* eslint-disable no-param-reassign */
+import type { App, Plugin } from 'vue';
+
+export type TypeWithInstall<T> = T & Plugin;
+
+export const withInstall = <T>(main: T, install: (_v: App) => void) => {
+  (main as TypeWithInstall<T>).install = (app): void => {
+    install(app);
+  };
+  return main as TypeWithInstall<T>;
+};

package/src/util/route/route.ts

@@ -1,8 +1,9 @@
 import { notNilEmpty } from 'qx-util';
 import { RuntimeError } from '@ibiz-template/core';
-import { IApplication, IAppView } from '@ibiz/model-core';
+import { IAppView } from '@ibiz/model-core';
 import qs from 'qs';
-import { RouteLocationNormalizedLoaded as Route } from 'vue-router';
+import { RouteLocationNormalizedLoaded as Route, useRoute } from 'vue-router';
+import { watch } from 'vue';
 import { IRoutePath, IRoutePathNode, IRouteViewData } from '../../interface';
 
 /**
@@ -16,7 +17,7 @@ import { IRoutePath, IRoutePathNode, IRouteViewData } from '../../interface';
  */
 export function getOwnRouteContext(context: IContext): IParams {
   const ownContext = context.getOwnContext();
-  const excludeKeys = ['srfsessionid'];
+  const excludeKeys = ['srfsessionid', 'srfappid'];
   Object.keys(ownContext).forEach(key => {
     if (excludeKeys.includes(key)) {
       delete ownContext[key];
@@ -44,16 +45,16 @@ export function generateRoutePath(
   params?: IParams | undefined,
 ): { path: string } {
   const routePath = route2routePath(route);
-  // 如果上下文存在toRouteLevel时，使用上下文的层级，否则是第二级路由
-  let level = 2;
-  if (context.toRouteLevel) {
-    level = context.toRouteLevel;
+  // 如果上下文存在toRouteDepth时，使用上下文的层级，否则是第二级路由
+  let depth = 2;
+  if (context.toRouteDepth) {
+    depth = context.toRouteDepth;
     // 使用完后删除，避免添加到首页上下文里
-    delete context.toRouteLevel;
+    delete context.toRouteDepth;
   }
 
   // 删除目标层级和之后的路由，保留之前层级的路由
-  routePath.pathNodes.splice(level - 1, routePath.pathNodes.length - level + 1);
+  routePath.pathNodes.splice(depth - 1, routePath.pathNodes.length - depth + 1);
 
   // 导航视图的导航参数,加在目标层级之前的一个层级的视图参数里
   if (context.currentSrfNav) {
@@ -83,7 +84,7 @@ export function generateRoutePath(
 
   // 计算二级视图的资源路径加到index后面
   // const codeName = appView.getPSAppDataEntity()?.codeName;
-  // if (level === 2 && codeName) {
+  // if (depth === 2 && codeName) {
   //   const app = ibiz.hub.getApp(appView.getPSModelService().app);
   //   const paths = app.resourcePathUtil.calcPaths(codeName);
   //   const resContext = calcRouteContext(context, paths);
@@ -91,7 +92,7 @@ export function generateRoutePath(
   //     // 资源路径不为空,二级视图的上下文删掉多余的资源上下文
   //     routePath.pathNodes[0].context = resContext;
   //     Object.keys(resContext).forEach(key => {
-  //       const currentNode = routePath.pathNodes[level - 1];
+  //       const currentNode = routePath.pathNodes[depth - 1];
   //       if (
   //         currentNode.context &&
   //         Object.prototype.hasOwnProperty.call(currentNode.context, key)
@@ -109,72 +110,6 @@ export function generateRoutePath(
   return { path: routePath2string(routePath) };
 }
 
-/**
- * 获取视图模型的codeName(小写)
- *
- * @export
- * @param {IAppView} model
- * @returns {*}
- */
-export function getViewName(model: IAppView) {
-  return model.codeName!.toLowerCase();
-}
-
-/**
- * 在单个应用里
- * 通过视图的codeName找到视图模型
- *
- * @param {(IApplication | ISubAppRef)} appModel 主应用或子应用
- * @param {string} viewCodeName 视图名称小写
- * @returns {*}
- */
-export function findViewByName(
-  _appModel: IApplication,
-  _viewCodeName: string,
-): undefined {
-  // return appModel.getAllPSAppViews()?.find((model: IAppView) => {
-  //   return getViewName(model) === viewCodeName;
-  // });
-  return undefined;
-}
-
-/**
- * 从子应用和主应用里
- * 通过视图的codeName找视图模型
- *
- * @param {IApplication} appModel 主应用
- * @param {string} viewCodeName 视图名称小写
- * @returns {*}
- */
-export function findView(
-  _appModel: IApplication,
-  _viewCodeName: string,
-): undefined {
-  // let viewModel: IAppView | null | undefined;
-  // viewCodeName = viewCodeName.toLowerCase();
-  // // index找默认首页视图，其他匹配codeName
-  // if (viewCodeName === 'index') {
-  //   viewModel = appModel.getDefaultPSAppIndexView();
-  // } else {
-  //   // 先查找子应用，找到则不继续找了,优先从最后面的子应用找起
-  //   if (appModel.getAllPSSubAppRefs()?.length) {
-  //     appModel
-  //       .getAllPSSubAppRefs()!
-  //       .reverse()
-  //       .find(sub => {
-  //         viewModel = findViewByName(sub, viewCodeName);
-  //         return !!viewModel;
-  //       });
-  //   }
-  //   // 子应用里没有就在主应用里找。
-  //   if (!viewModel) {
-  //     viewModel = findViewByName(appModel, viewCodeName);
-  //   }
-  // }
-  // return viewModel;
-  return undefined;
-}
-
 /**
  * 解析路由获取对应视图数据
  *
@@ -183,20 +118,20 @@ export function findView(
  * @export
  * @param {IApplication} appModel 视图模型
  * @param {Route} route 路由对象
- * @param {number} level 层级
+ * @param {number} depth 层级
  * @returns {*}  {IRouteViewData}
  */
 export async function parseRouteViewData(
   route: Route,
-  level: number,
+  depth: number,
 ): Promise<IRouteViewData> {
   // 解析路由的视图参数
   const routePath = route2routePath(route);
 
   // 获取对应层级的视图名称参数
-  let viewCodeName = routePath.pathNodes[level - 1].viewName;
+  let viewCodeName = routePath.pathNodes[depth - 1].viewName;
   if (!viewCodeName) {
-    throw new RuntimeError(`第${level}级路由不存在视图标识`);
+    throw new RuntimeError(`第${depth}级路由不存在视图标识`);
   }
   if (viewCodeName === 'index') {
     viewCodeName = ibiz.hub.defaultAppIndexViewName;
@@ -223,7 +158,7 @@ export async function parseRouteViewData(
     Object.assign(context, routePath.appContext);
   }
   // 逐层合并视图上下文
-  for (let index = 0; index < level; index++) {
+  for (let index = 0; index < depth; index++) {
     const pathNode = routePath.pathNodes[index];
     if (notNilEmpty(pathNode.context)) {
       Object.assign(context, pathNode.context);
@@ -231,7 +166,7 @@ export async function parseRouteViewData(
   }
 
   // 最后一级路由对应的视图才会解析视图参数
-  const { params, srfnav } = routePath.pathNodes[level - 1];
+  const { params, srfnav } = routePath.pathNodes[depth - 1];
 
   return {
     viewModel,
@@ -252,11 +187,11 @@ export async function parseRouteViewData(
  */
 export function route2routePath(route: Route): IRoutePath {
   // 一共匹配了几级路由
-  const level = route.matched.length;
+  const depth = route.matched.length;
 
   // 解析路径节点
   const pathNodes: IRoutePathNode[] = [];
-  for (let index = 1; index <= level; index++) {
+  for (let index = 1; index <= depth; index++) {
     const viewName = route.params[`view${index}`] as string;
     const paramsStr = route.params[`params${index}`] as string;
 
@@ -366,3 +301,34 @@ export function routePath2string(routePath: IRoutePath): string {
 
   return pathStr;
 }
+
+/**
+ * 监听路由的变更，每次变更后都会触发回调
+ * 回调函数提供根据视图层级计算好的唯一标识currentKey，只有变了视图才需要刷新
+ * @author lxm
+ * @date 2023-05-09 12:52:36
+ * @param {(args: { currentKey: string; fullPath: string }) => void} callback
+ * @param {number} depth
+ */
+export function onRouteChange(
+  callback: (args: { currentKey: string; fullPath: string }) => void,
+  depth: number,
+) {
+  const route = useRoute();
+  watch(
+    () => route.path,
+    () => {
+      const routePath = route2routePath(route);
+      let currentKey = '';
+      if (routePath.pathNodes.length >= depth) {
+        // 删除depth后面的节点
+        routePath.pathNodes = routePath.pathNodes.slice(0, depth);
+        // 删除自身的srfnav
+        delete routePath.pathNodes[depth - 1].srfnav;
+        currentKey = routePath2string(routePath);
+      }
+      callback({ currentKey, fullPath: route.fullPath });
+    },
+    { immediate: true },
+  );
+}