@ibiz-template/vue3-components 0.7.38-alpha.12 → 0.7.38-alpha.31

package/lib/web-app/guard/auth-guard/auth-guard.cjs

@@ -36,40 +36,44 @@ class AuthGuard {
   }
   /**
    * 总的入口校验
-   * @author lxm
-   * @date 2024-02-21 10:43:55
-   * @param {boolean} notLogin
+   *
+   * @author tony001
+   * @date 2024-11-12 14:11:32
+   * @param {IParams} context
+   * @param {boolean} [notLogin=true]
    * @return {*}  {Promise<boolean>}
    */
-  async verify(notLogin = true) {
+  async verify(context, notLogin = true) {
     if (notLogin) {
       let result = true;
       try {
         if (ibiz.env.enableAnonymous) {
-          await this.anonymousValidate();
+          await this.anonymousValidate(context);
         }
-        await this.appInit();
+        await this.appInit(context);
       } catch (error) {
         result = false;
         ibiz.util.error.handle(error);
       }
       return result;
     }
-    await this.initModel(false);
+    await this.initModel(context, false);
     return true;
   }
   /**
    * 匿名登录相关校验逻辑，不通过会抛异常
-   * @author lxm
-   * @date 2024-01-03 07:29:30
+   *
+   * @author tony001
+   * @date 2024-11-12 14:11:27
+   * @param {IParams} context
    * @return {*}  {Promise<void>}
    */
-  async anonymousValidate() {
+  async anonymousValidate(context) {
     const authInfo = ibiz.auth.getAuthInfo();
     if (authInfo && !authInfo.isAnonymous) {
       return;
     }
-    await this.initModel(false);
+    await this.initModel(context, false);
     const urlPaths = window.location.hash.split("/");
     const viewName = urlPaths[urlPaths.length - 2];
     let viewModel;
@@ -102,11 +106,12 @@ class AuthGuard {
   /**
    * 应用参数初始化
    *
-   * @author chitanda
-   * @date 2022-07-20 19:07:54
+   * @author tony001
+   * @date 2024-11-12 14:11:06
+   * @param {IParams} context
    * @return {*}  {Promise<void>}
    */
-  async appInit() {
+  async appInit(context) {
     try {
       if (ibiz.env.isSaaSMode === true) {
         await this.loadOrgData();
@@ -130,19 +135,21 @@ class AuthGuard {
         throw error;
       }
     }
-    await this.initModel();
+    await this.initModel(context);
     await ibiz.auth.extendLogin();
     await ibiz.hub.notice.init();
     await ibiz.util.theme.initCustomTheme();
   }
   /**
    * 初始化模型
-   * @author lxm
-   * @date 2024-02-21 10:48:36
-   * @param {boolean} [permission=true]
+   *
+   * @author tony001
+   * @date 2024-11-12 14:11:43
+   * @param {IParams} context
+   * @param {boolean} [_permission=true]
    * @return {*}  {Promise<void>}
    */
-  async initModel(_permission = true) {
+  async initModel(context, _permission = true) {
   }
   /**
    * 加载应用数据

package/lib/web-app/guard/auth-guard/dyna-auth-guard.cjs

@@ -18,7 +18,7 @@ class DynaAuthGuard extends authGuard.AuthGuard {
     __publicField(this, "hasModelInit", false);
     __publicField(this, "noPermissionModel", false);
   }
-  async initModel(permission = true) {
+  async initModel(context, permission = true) {
     if (!this.hasModelInit || this.hasModelInit && this.noPermissionModel !== permission) {
       ibiz.hub.reset();
       const helper = new modelHelper.ModelHelper(
@@ -31,6 +31,7 @@ class DynaAuthGuard extends authGuard.AuthGuard {
           return res.data;
         },
         ibiz.env.appId,
+        context,
         permission
       );
       const tempApp = await helper.getAppModel();

package/lib/web-app/main.cjs

@@ -64,7 +64,9 @@ async function runApp(plugins, opts) {
   } else {
     authGuard = new dynaAuthGuard.DynaAuthGuard();
   }
-  index.AppRouter.setAuthGuard((notLogin) => authGuard.verify(notLogin));
+  index.AppRouter.setAuthGuard(
+    (context, notLogin) => authGuard.verify(context, notLogin)
+  );
   app.use(index.AppRouter.getRouter());
   ibiz.appUtil = new appUtil.AppUtil(index.AppRouter.getRouter());
   ibiz.openView = new openViewUtil.OpenViewUtil(index.AppRouter.getRouter());

package/lib/web-app/router/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var vueRouter = require('vue-router');
+var qs = require('qs');
 var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 var nprogress = require('../../node_modules/.pnpm/nprogress@0.2.0/node_modules/nprogress/nprogress.cjs');
@@ -24,6 +25,16 @@ class AppRouter {
   static setAuthGuard(authGuard) {
     this.authGuard = authGuard;
   }
+  static getAppContext(route) {
+    let appContext = {};
+    if (route.params.appContext && route.params.appContext !== ibiz.env.routePlaceholder) {
+      appContext = qs.parse(route.params.appContext, {
+        strictNullHandling: true,
+        delimiter: ";"
+      });
+    }
+    return appContext;
+  }
   static getRouter() {
     const placeholder = ibiz.env.routePlaceholder;
     const paramReg = "[^/]+=[^/]+|".concat(placeholder);
@@ -41,7 +52,7 @@ class AppRouter {
             path: "/login",
             name: "loginView",
             beforeEnter: async (_to, _from, next) => {
-              await this.authGuard(false);
+              await this.authGuard(this.getAppContext(_to), false);
               next();
             },
             component: loginView.LoginView
@@ -50,7 +61,7 @@ class AppRouter {
             path: "/share",
             name: "shareView",
             beforeEnter: async (_to, _from, next) => {
-              const authority = await this.authGuard();
+              const authority = await this.authGuard(this.getAppContext(_to));
               if (authority) {
                 next();
               } else {
@@ -68,7 +79,7 @@ class AppRouter {
             path: "/appredirectview",
             name: "appRedirectView",
             beforeEnter: async (_to, _from, next) => {
-              const authority = await this.authGuard();
+              const authority = await this.authGuard(this.getAppContext(_to));
               if (authority) {
                 next();
               } else {
@@ -80,7 +91,7 @@ class AppRouter {
           {
             path: "/:appContext(".concat(paramReg, ")/:view1(").concat(viewReg, ")/:params1(").concat(paramReg, ")"),
             beforeEnter: async (_to, _from, next) => {
-              const authority = await this.authGuard();
+              const authority = await this.authGuard(this.getAppContext(_to));
               if (authority) {
                 next();
               } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.38-alpha.12",
+  "version": "0.7.38-alpha.31",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -30,17 +30,17 @@
   "dependencies": {
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.5",
-    "@ibiz-template-plugin/gantt": "0.1.8-alpha.7",
-    "@ibiz-template-plugin/bi-report": "0.0.24",
+    "@ibiz-template-plugin/gantt": "0.1.8-alpha.92",
+    "@ibiz-template-plugin/bi-report": "0.0.25",
     "@ibiz-template-plugin/data-view": "0.0.3",
-    "@ibiz-template/core": "0.7.35-alpha.1",
-    "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.7.38-alpha.12",
-    "@ibiz-template/runtime": "0.7.38-alpha.12",
+    "@ibiz-template/core": "0.7.38-alpha.32",
+    "@ibiz-template/devtool": "0.0.2",
+    "@ibiz-template/model-helper": "0.7.38-alpha.33",
+    "@ibiz-template/runtime": "0.7.38-alpha.33",
     "@ibiz-template/theme": "^0.7.0",
-    "@ibiz-template/vue3-util": "0.7.38-alpha.12",
-    "@ibiz-template/web-theme": "^1.1.21",
-    "@ibiz/model-core": "^0.1.56",
+    "@ibiz-template/vue3-util": "0.7.38-alpha.33",
+    "@ibiz-template/web-theme": "^1.1.25",
+    "@ibiz/model-core": "^0.1.59",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -105,7 +105,7 @@
     "@ibiz-template/runtime": "^0.7.0",
     "@ibiz-template/theme": "^0.7.0",
     "@ibiz-template/vue3-util": "^0.7.0",
-    "@ibiz/model-core": "^0.1.56",
+    "@ibiz/model-core": "^0.1.59",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",

package/dist/ibiz-markdown-editor-B4c6yGAW.js

@@ -1 +0,0 @@
-System.register(["vue","@ibiz-template/vue3-util","qx-util","cherry-markdown","@ibiz-template/core"],(function(e){"use strict";var t,a,l,o,n,i,r,s,u,c,d,h,v,m,b;return{setters:[function(e){t=e.defineComponent,a=e.ref,l=e.watch,o=e.onMounted,n=e.onUnmounted,i=e.createVNode,r=e.nextTick},function(e){s=e.getMarkDownProps,u=e.getEditorEmits,c=e.useNamespace,d=e.useUIStore},function(e){h=e.createUUID,v=e.getCookie},function(e){m=e.default},function(e){b=e.CoreConst}],execute:function(){e("default",t({name:"IBizMarkDown",props:s(),emits:u(),setup(e,{emit:t}){const i=c("markdown"),s=e.controller,u=a(""),f=a(null),p=h(),g=a({Authorization:"Bearer ".concat(v(b.TOKEN))}),w=a(""),k=a(""),{UIStore:y}=d(),U=a(y.theme),x=a("editOnly");let C=null,z=0;const M=a({});l((()=>e.data),(e=>{if(e&&s){const t=ibiz.util.file.calcFileUpDownUrl(s.context,s.params,e,s.editorParams);w.value=t.uploadUrl,k.value=t.downloadUrl}}),{immediate:!0,deep:!0});const O=a(),B=async(e,t)=>{const a=await ibiz.util.file.fileUpload(w.value,e,g.value);t(k.value.replace("%fileId%",a.fileid))},D=()=>{var e;return null==(e=f.value)?void 0:e.getMarkdown()},I=e=>{var t;null==(t=f.value)||t.setMarkdown(e,!1)};l((()=>e.value),((e,t)=>{e!==t&&(u.value=e||"")}),{immediate:!0}),l(u,((e,t)=>{const a=D();e!==t&&a!==e&&I(e)}));const V=e=>{t("change",D())},R=(e,t)=>({[e]:t});l((()=>y.theme),(e=>{var t;U.value=e,null==(t=f.value)||t.setTheme(U.value)}));return o((()=>{e.disabled&&(x.value="previewOnly"),r((()=>{f.value=new m({id:p,value:u.value,theme:U.value,fileUpload:B,emoji:{useUnicode:!0},header:{anchorStyle:"autonumber"},editor:{height:"100%",defaultModel:x.value,codemirror:{autofocus:!1}},toolbars:{theme:U.value,toolbar:["bold","italic","underline","strikethrough","|","color","header","|","list","image",{insert:["link","hr","br","code","formula","toc","table","line-table","bar-table"]},"settings","togglePreview"],bubble:["bold","italic","underline","strikethrough","sub","sup","|","size","color"],float:["h1","h2","h3","|","checklist","quote","quickTable","code"],customMenu:[],sidebar:[]},callback:{afterChange:V,beforeImageMounted:R}})})),(()=>{if(window.ResizeObserver&&O.value){const e={width:"".concat(O.value.offsetWidth,"px")};s&&"number"==typeof s.parent.model.height&&Object.assign(e,{height:"".concat(s.parent.model.height,"px")}),M.value=i.cssVarBlock(e),C=new ResizeObserver((e=>{const t=e[0].contentRect.width;if(t!==z){const a={width:"".concat(e[0].contentRect.width,"px")};s&&"number"==typeof s.parent.model.height&&Object.assign(a,{height:"".concat(s.parent.model.height,"px")}),M.value=i.cssVarBlock(a),z=t}})),C.observe(O.value)}})()})),n((()=>{f.value=null,C&&C.disconnect()})),{ns:i,currentVal:u,id:p,editor:f,markDownBox:O,headers:g,theme:U,defaultModel:x,cssVars:M,getCherryHtml:()=>{var e;return null==(e=f.value)?void 0:e.getHtml()},getCherryContent:D,setCherryContent:I}},render(){return i("div",{ref:"markDownBox",class:[this.ns.b(),this.ns.is("disabled",this.disabled)]},[i("div",{id:this.id,style:this.cssVars,class:this.ns.b("cherry")},null)])}}))}}}));