@ibiz-template/vue3-components 0.7.38-alpha.21 → 0.7.38-alpha.43

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,16 +106,17 @@ 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();
       }
-      await this.loadAppData();
+      await this.loadAppData(context);
     } catch (error) {
       const responseStatus = error.status;
       const remember = qxUtil.getCookie(core.CoreConst.TOKEN_REMEMBER);
@@ -122,7 +127,7 @@ class AuthGuard {
           if (ibiz.env.isSaaSMode === true) {
             await this.loadOrgData();
           }
-          await this.loadAppData();
+          await this.loadAppData(context);
         } catch (refreshTokenError) {
           throw error;
         }
@@ -130,29 +135,37 @@ 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) {
   }
   /**
    * 加载应用数据
    *
-   * @author chitanda
-   * @date 2022-07-20 20:07:50
+   * @author tony001
+   * @date 2024-12-19 20:12:01
+   * @param {IParams} [context]
    * @return {*}  {Promise<void>}
    */
-  async loadAppData() {
-    const res = await ibiz.net.get("/appdata");
+  async loadAppData(context) {
+    let res;
+    if (context && Object.keys(context).length > 0) {
+      res = await ibiz.net.get("/appdata", context);
+    } else {
+      res = await ibiz.net.get("/appdata");
+    }
     if (res.ok) {
       ibiz.appData = res.data;
     }
@@ -194,8 +207,20 @@ class AuthGuard {
     const app = ibiz.hub.getApp();
     const uiThemes = app.model.appUIThemes || [];
     if (uiThemes.length > 0) {
-      const theme = uiThemes[0];
-      await ibiz.util.theme.loadTheme(theme);
+      const colorThemes = uiThemes.filter((uiTheme) => {
+        return uiTheme.themeParams && uiTheme.themeParams["icon-theme"] !== "true";
+      });
+      if (colorThemes.length > 0) {
+        const colorTheme = colorThemes[0];
+        await ibiz.util.theme.loadTheme(colorTheme);
+      }
+      const iconThemes = uiThemes.filter((uiTheme) => {
+        return uiTheme.themeParams && uiTheme.themeParams["icon-theme"] === "true";
+      });
+      if (iconThemes.length > 0) {
+        const iconTheme = iconThemes[0];
+        await ibiz.util.theme.loadTheme(iconTheme, "ICON");
+      }
     }
   }
   /**

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/lib/web-app/util/unauthorized-handler/unauthorized-handler.cjs

@@ -8,6 +8,25 @@ class UnauthorizedHandler {
   match(error) {
     return error instanceof core.HttpError && (error.status === 401 || error.status === 403);
   }
+  /**
+   * oauth登录处理
+   *
+   * @author tony001
+   * @date 2024-12-22 10:12:48
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async oauthLogin() {
+    if (window.location.href.indexOf("srfthird_auth_success=false") >= 0) {
+      ibiz.log.debug("\u83B7\u53D6OAUTH\u7684token\u5931\u8D25\uFF0C\u8DF3\u8F6C\u6B63\u5E38\u767B\u5F55\u9875");
+      this.normalLogin();
+    }
+    const res = await ibiz.thirdAuth.auth("OAUTH", "THIRD");
+    if (!res.ok) {
+      ibiz.log.debug("\u83B7\u53D6OAUTH\u91CD\u5B9A\u5411\u5730\u5740\u5931\u8D25\uFF0C\u8DF3\u8F6C\u6B63\u5E38\u767B\u5F55\u9875");
+      this.normalLogin();
+    }
+  }
   /**
    * cas登录处理
    *
@@ -86,6 +105,8 @@ class UnauthorizedHandler {
           });
         } else if (ibiz.env.loginMode === core.LoginMode.CAS) {
           this.casLogin();
+        } else if (ibiz.env.loginMode === core.LoginMode.OAUTH) {
+          this.oauthLogin();
         } else {
           this.normalLogin();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.38-alpha.21",
+  "version": "0.7.38-alpha.43",
   "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.83",
-    "@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.38-alpha.16",
+    "@ibiz-template/core": "0.7.38-alpha.43",
     "@ibiz-template/devtool": "0.0.2",
-    "@ibiz-template/model-helper": "0.7.38-alpha.23",
-    "@ibiz-template/runtime": "0.7.38-alpha.23",
+    "@ibiz-template/model-helper": "0.7.38-alpha.45",
+    "@ibiz-template/runtime": "0.7.38-alpha.45",
     "@ibiz-template/theme": "^0.7.0",
-    "@ibiz-template/vue3-util": "0.7.38-alpha.23",
-    "@ibiz-template/web-theme": "^1.1.24",
-    "@ibiz/model-core": "^0.1.58",
+    "@ibiz-template/vue3-util": "0.7.38-alpha.45",
+    "@ibiz-template/web-theme": "1.1.28-alpha.1",
+    "@ibiz/model-core": "^0.1.64",
     "@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.58",
+    "@ibiz/model-core": "^0.1.64",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",

package/dist/chart-DPS_XpZp.js

@@ -1 +0,0 @@
-System.register(["vue","@ibiz-template/vue3-util","echarts","qx-util","@ibiz-template/runtime"],(function(e){"use strict";var t,i,l,a,s,n,o,r,d,c,h,u,m,p,v;return{setters:[function(e){t=e.defineComponent,i=e.ref,l=e.watch,a=e.onMounted,s=e.onBeforeUnmount,n=e.createVNode,o=e.resolveComponent,r=e.nextTick,d=e.isVNode},function(e){c=e.useControlController,h=e.useNamespace},function(e){u=e.init},function(e){m=e.createUUID},function(e){p=e.ChartController,v=e.ControlVO}],execute:function(){e("default",t({name:"IBizChartControl",props:{modelData:{type:Object,required:!0},context:{type:Object,required:!0},params:{type:Object,default:()=>({})},provider:{type:Object},mdctrlActiveMode:{type:Number,default:void 0},loadDefault:{type:Boolean,default:!0},isSimple:{type:Boolean,required:!1},data:{type:Array,required:!1}},emits:["drillDetail"],setup(e,{emit:t}){const f=c(((...e)=>new p(...e))),w=h("control-".concat(f.model.controlType.toLowerCase())),g=i(),b=i(0),D=m(),y=i(!1),z=i({}),C=i();let L;const x=()=>{e.data&&(f.state.items=e.data.map((e=>new v(e))),f.afterLoad({},f.state.items))};f.evt.on("onCreated",(async()=>{e.isSimple&&(x(),f.state.isSimple=!0,f.state.isLoaded=!0)})),l((()=>e.data),(()=>{e.isSimple&&x()}),{deep:!0});const P=async()=>{await r();const e=document.getElementById(D);e&&("bottom"===f.state.gridPosition||"top"===f.state.gridPosition?b.value=e.offsetHeight/2-8:b.value=e.offsetHeight-16)},S=()=>{y.value=!1},E=()=>{y.value||f.changeTooltipState(!0)};let B;a((()=>{var t,i;const l=u(g.value);f.initChart(l),window.addEventListener("resize",P),window.addEventListener("pointerdown",S),window.addEventListener("click",E),g.value&&ResizeObserver&&(B=new ResizeObserver((()=>{f.resizeChart()})),B.observe(g.value)),P();const a=null==(i=null==(t=e.modelData.controlParam)?void 0:t.ctrlParams)?void 0:i.ENABLEDRILLDETAIL;(null==a?void 0:a.length)&&l.on("click",(e=>{const t=f.computedClickSerieModel(e);if(!t||ibiz.fullscreenUtil.isFullScreen)return;const i=a.find((e=>e.name===t.valueField));i&&i.isDrill&&(L=e,(e=>{if(e.event){const t=e.event.event,{offsetX:i,offsetY:l}=e.event,{clientWidth:a}=t.target;z.value=i+160>a?{top:"".concat(l-20,"px"),left:"".concat(i-160,"px")}:{top:"".concat(l,"px"),left:"".concat(i+16,"px")}}})(e),l.dispatchAction({type:"hideTip"}),f.changeTooltipState(!1),y.value=!0)}))}));l((()=>f.state.showGrid),(()=>{P()}),{immediate:!0});return s((()=>{window.removeEventListener("resize",P),window.removeEventListener("pointerdown",S),window.removeEventListener("click",E),null==B||B.disconnect()})),{c:f,ns:w,chartRef:g,uuid:D,showCheck:y,drillDetailPos:z,drillDetailRef:C,openDrillDetail:e=>{e.stopPropagation(),e.preventDefault(),y.value=!1,f.changeTooltipState(!0);const i=f.computedDrillDetailParam(L);t("drillDetail",i)},renderGrid:()=>{let e;return n(o("el-table"),{ref:"tableRef",data:f.state.gridData||[],border:!0,style:{width:"100%"},"max-height":b.value,"header-row-class-name":w.e("grid-header")},"function"==typeof(t=e=f.state.gridHeaders.map((e=>n(o("el-table-column"),{prop:e.id,align:"center",label:e.name},null))))||"[object Object]"===Object.prototype.toString.call(t)&&!d(t)?e:{default:()=>[e]});var t}}},render(){return n(o("iBizControlBase"),{controller:this.c},{default:()=>[n("div",{id:this.uuid,class:this.ns.b("chart-container")},[n(o("el-empty"),{class:[this.ns.e("empty"),this.ns.is("no-data",0===this.c.state.items.length)],description:ibiz.i18n.t("control.common.currentNoData")},null),n("div",{class:[this.ns.e("chart-grid"),this.ns.is("no-data",0===this.c.state.items.length),this.ns.is("show-grid",this.c.state.showGrid),{[this.ns.em("chart-grid",this.c.state.gridPosition)]:this.c.state.showGrid}]},[n("div",{class:[this.ns.e("chart-grid-container"),this.ns.is(this.c.state.gridPosition,this.c.state.showGrid),this.ns.is("no-grid",!this.c.state.showGrid)]},[n("div",{ref:"chartRef",class:[this.ns.e("chart")]},[ibiz.i18n.t("control.chart.chartPlaceholder")]),this.showCheck?n("div",{ref:"drillDetailRef",class:this.ns.e("drill-detail"),style:this.drillDetailPos,onPointerdown:this.openDrillDetail},[n("div",{class:this.ns.em("drill-detail","item")},[n("svg",{viewBox:"0 0 16 16",xmlns:"http://www.w3.org/2000/svg",height:"1em",width:"1em",focusable:"false",fill:"currentColor"},[n("g",{id:"aspnormal/preview","stroke-width":"1","fill-rule":"evenodd"},[n("path",{d:"M11.626 0c1.057 0 1.923.818 2 1.855l.005.15v3.411a.6.6 0 0 1-1.192.097l-.008-.097.001-1.348V2.005c0-.41-.31-.749-.705-.799l-.101-.006h-9.62c-.41 0-.75.308-.8.704l-.006.101v11.989c0 .41.308.75.705.8l.101.006h5.906l.017-.004.016-.003h2.074a.598.598 0 1 1 .107 1.187l-.095.01V16H2.006a2.006 2.006 0 0 1-2-1.856L0 13.994V2.005C0 .948.818.082 1.856.005L2.006 0h9.62zm-1.595 6.328a3.669 3.669 0 0 1 3.665 3.665c0 .79-.251 1.523-.678 2.123l2.412 2.412a.6.6 0 1 1-.848.85l-2.41-2.412a3.646 3.646 0 0 1-2.14.692 3.67 3.67 0 0 1-3.667-3.665 3.67 3.67 0 0 1 3.666-3.665zm-5.106 5.29a.6.6 0 0 1 .097 1.191l-.097.008H2.85a.6.6 0 0 1-.097-1.192l.097-.008h2.074zm5.106-4.09a2.468 2.468 0 0 0-2.466 2.465 2.468 2.468 0 0 0 2.466 2.466 2.47 2.47 0 0 0 2.466-2.466 2.469 2.469 0 0 0-2.466-2.465zm-4.815-.126a.6.6 0 0 1 .097 1.193l-.097.007h-2.35A.6.6 0 0 1 2.77 7.41l.098-.008h2.349zm5.58-4a.6.6 0 0 1 .097 1.192l-.097.008H2.867A.6.6 0 0 1 2.77 3.41l.097-.008h7.929z",id:"asp合并形状"},null)])]),n("div",{class:this.ns.em("drill-detail","item-text")},[ibiz.i18n.t("control.chart.drillDetail")])])]):null]),this.c.state.showGrid?n("div",{class:this.ns.e("grid")},[this.renderGrid()]):null])])]})}}))}}}));

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)])}}))}}}));