@ibiz-template/vue3-components 0.7.41-alpha.50 → 0.7.41-alpha.52

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

@@ -8,11 +8,13 @@ var nprogress = require('../../node_modules/.pnpm/nprogress@0.2.0/node_modules/n
 require('../../view/index.cjs');
 require('../components/index.cjs');
 var shareView = require('../../view/share-view/share-view.cjs');
+require('../../util/index.cjs');
 require('nprogress/nprogress.css');
 var loginView = require('../../view/login-view/login-view.cjs');
 var errorView = require('../../view/error-view/error-view.cjs');
 var modalRouterShell = require('../components/modal-router-shell/modal-router-shell.cjs');
 var routerShell = require('../components/router-shell/router-shell.cjs');
+var userRouteUtil = require('../../util/user-route-util/user-route-util.cjs');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -35,74 +37,91 @@ class AppRouter {
     }
     return appContext;
   }
-  static getRouter(userRoutes) {
+  static getRoutes() {
     const placeholder = ibiz.env.routePlaceholder;
     const paramReg = "[^/]+=[^/]+|".concat(placeholder);
     const viewReg = "[^=/]+";
-    if (!this.router) {
-      this.router = vueRouter.createRouter({
-        // 4. 内部提供了 history 模式的实现。为了简单起见，我们在这里使用 hash 模式。
-        history: vueRouter.createWebHashHistory(),
-        routes: [
-          {
-            path: "/",
-            redirect: "/".concat(placeholder, "/index/").concat(placeholder)
-          },
-          {
-            path: "/login",
-            name: "loginView",
-            beforeEnter: async (_to, _from, next) => {
-              await this.authGuard(this.getAppContext(_to), false);
-              next();
-            },
-            component: loginView.LoginView
-          },
-          {
-            path: "/share",
-            name: "shareView",
-            beforeEnter: async (_to, _from, next) => {
-              const authority = await this.authGuard(this.getAppContext(_to));
-              if (authority) {
-                next();
-              } else {
-                next(false);
-              }
-            },
-            component: shareView.ShareView
-          },
+    const routes = [
+      {
+        path: "/",
+        redirect: "/".concat(placeholder, "/index/").concat(placeholder)
+      },
+      {
+        path: "/login",
+        name: "loginView",
+        beforeEnter: async (_to, from, next) => {
+          await this.authGuard(this.getAppContext(_to), false);
+          next();
+        },
+        component: loginView.LoginView
+      },
+      {
+        path: "/share",
+        name: "shareView",
+        beforeEnter: async (_to, from, next) => {
+          const authority = await this.authGuard(this.getAppContext(_to));
+          if (authority) {
+            next();
+          } else {
+            next(false);
+          }
+        },
+        component: shareView.ShareView
+      },
+      {
+        path: "/error/:code",
+        name: "errorView1",
+        component: errorView.ErrorView
+      },
+      {
+        path: "/appredirectview",
+        name: "appRedirectView",
+        beforeEnter: async (_to, from, next) => {
+          const authority = await this.authGuard(this.getAppContext(_to));
+          if (authority) {
+            next();
+          } else {
+            next(false);
+          }
+        },
+        component: vue3Util.AppRedirectView
+      },
+      {
+        path: "/:appContext(".concat(paramReg, ")/:view1(").concat(viewReg, ")/:params1(").concat(paramReg, ")"),
+        beforeEnter: async (_to, from, next) => {
+          const authority = await this.authGuard(this.getAppContext(_to));
+          if (authority) {
+            next();
+          } else {
+            next(false);
+          }
+        },
+        component: routerShell.RouterShell,
+        meta: {
+          depth: 1
+        },
+        children: [
           {
-            path: "/error/:code",
-            name: "errorView1",
+            path: "error/:code",
+            name: "errorView2",
             component: errorView.ErrorView
           },
           {
-            path: "/appredirectview",
-            name: "appRedirectView",
-            beforeEnter: async (_to, _from, next) => {
-              const authority = await this.authGuard(this.getAppContext(_to));
-              if (authority) {
-                next();
-              } else {
-                next(false);
-              }
-            },
-            component: vue3Util.AppRedirectView
+            path: "".concat(runtime.RouteConst.ROUTE_MODAL_TAG, "/:modalView(").concat(viewReg, ")/:modalParams(").concat(paramReg, ")"),
+            components: {
+              [runtime.RouteConst.ROUTE_MODAL_TAG]: modalRouterShell.ModalRouterShell
+            }
           },
           {
-            path: "/:appContext(".concat(paramReg, ")/:view1(").concat(viewReg, ")/:params1(").concat(paramReg, ")"),
-            beforeEnter: async (_to, _from, next) => {
-              const authority = await this.authGuard(this.getAppContext(_to));
-              if (authority) {
-                next();
-              } else {
-                next(false);
-              }
-            },
+            path: ":view2(".concat(viewReg, ")/:params2(").concat(paramReg, ")"),
             component: routerShell.RouterShell,
+            meta: {
+              depth: 2
+            },
             children: [
               {
                 path: "error/:code",
-                name: "errorView2",
+                name: "errorView3",
                 component: errorView.ErrorView
               },
               {
@@ -112,12 +131,15 @@ class AppRouter {
                 }
               },
               {
-                path: ":view2(".concat(viewReg, ")/:params2(").concat(paramReg, ")"),
+                path: ":view3(".concat(viewReg, ")/:params3(").concat(paramReg, ")"),
                 component: routerShell.RouterShell,
+                meta: {
+                  depth: 3
+                },
                 children: [
                   {
                     path: "error/:code",
-                    name: "errorView3",
+                    name: "errorView4",
                     component: errorView.ErrorView
                   },
                   {
@@ -127,12 +149,15 @@ class AppRouter {
                     }
                   },
                   {
-                    path: ":view3(".concat(viewReg, ")/:params3(").concat(paramReg, ")"),
+                    path: ":view4(".concat(viewReg, ")/:params4(").concat(paramReg, ")"),
                     component: routerShell.RouterShell,
+                    meta: {
+                      depth: 4
+                    },
                     children: [
                       {
                         path: "error/:code",
-                        name: "errorView4",
+                        name: "errorView5",
                         component: errorView.ErrorView
                       },
                       {
@@ -142,12 +167,15 @@ class AppRouter {
                         }
                       },
                       {
-                        path: ":view4(".concat(viewReg, ")/:params4(").concat(paramReg, ")"),
+                        path: ":view5(".concat(viewReg, ")/:params5(").concat(paramReg, ")"),
                         component: routerShell.RouterShell,
+                        meta: {
+                          depth: 5
+                        },
                         children: [
                           {
                             path: "error/:code",
-                            name: "errorView5",
+                            name: "errorView6",
                             component: errorView.ErrorView
                           },
                           {
@@ -157,12 +185,15 @@ class AppRouter {
                             }
                           },
                           {
-                            path: ":view5(".concat(viewReg, ")/:params5(").concat(paramReg, ")"),
+                            path: ":view6(".concat(viewReg, ")/:params6(").concat(paramReg, ")"),
                             component: routerShell.RouterShell,
+                            meta: {
+                              depth: 6
+                            },
                             children: [
                               {
                                 path: "error/:code",
-                                name: "errorView6",
+                                name: "errorView7",
                                 component: errorView.ErrorView
                               },
                               {
@@ -172,12 +203,15 @@ class AppRouter {
                                 }
                               },
                               {
-                                path: ":view6(".concat(viewReg, ")/:params6(").concat(paramReg, ")"),
+                                path: ":view7(".concat(viewReg, ")/:params7(").concat(paramReg, ")"),
                                 component: routerShell.RouterShell,
+                                meta: {
+                                  depth: 7
+                                },
                                 children: [
                                   {
                                     path: "error/:code",
-                                    name: "errorView7",
+                                    name: "errorView8",
                                     component: errorView.ErrorView
                                   },
                                   {
@@ -187,71 +221,123 @@ class AppRouter {
                                     }
                                   },
                                   {
-                                    path: ":view7(".concat(viewReg, ")/:params7(").concat(paramReg, ")"),
+                                    path: ":view8(".concat(viewReg, ")/:params8(").concat(paramReg, ")"),
                                     component: routerShell.RouterShell,
-                                    children: [
-                                      {
-                                        path: "error/:code",
-                                        name: "errorView8",
-                                        component: errorView.ErrorView
-                                      },
-                                      {
-                                        path: "".concat(runtime.RouteConst.ROUTE_MODAL_TAG, "/:modalView(").concat(viewReg, ")/:modalParams(").concat(paramReg, ")"),
-                                        components: {
-                                          [runtime.RouteConst.ROUTE_MODAL_TAG]: modalRouterShell.ModalRouterShell
-                                        }
-                                      },
-                                      {
-                                        path: ":view8(".concat(viewReg, ")/:params8(").concat(paramReg, ")"),
-                                        component: routerShell.RouterShell
-                                      },
-                                      {
-                                        path: ":pathMatch(.*)*",
-                                        redirect: { name: "errorView8" }
-                                      }
-                                    ]
+                                    meta: {
+                                      depth: 8
+                                    }
                                   },
                                   {
                                     path: ":pathMatch(.*)*",
-                                    redirect: { name: "errorView7" }
+                                    redirect: { name: "errorView8" }
                                   }
                                 ]
                               },
                               {
                                 path: ":pathMatch(.*)*",
-                                redirect: { name: "errorView6" }
+                                redirect: { name: "errorView7" }
                               }
                             ]
                           },
                           {
                             path: ":pathMatch(.*)*",
-                            redirect: { name: "errorView5" }
+                            redirect: { name: "errorView6" }
                           }
                         ]
                       },
                       {
                         path: ":pathMatch(.*)*",
-                        redirect: { name: "errorView4" }
+                        redirect: { name: "errorView5" }
                       }
                     ]
                   },
                   {
                     path: ":pathMatch(.*)*",
-                    redirect: { name: "errorView3" }
+                    redirect: { name: "errorView4" }
                   }
                 ]
               },
               {
                 path: ":pathMatch(.*)*",
-                redirect: { name: "errorView2" }
+                redirect: { name: "errorView3" }
               }
             ]
           },
           {
-            path: "/:pathMatch(.*)*",
-            redirect: { name: "errorView1" }
+            path: ":pathMatch(.*)*",
+            redirect: { name: "errorView2" }
           }
         ]
+      },
+      {
+        path: "/:pathMatch(.*)*",
+        redirect: { name: "errorView1" }
+      }
+    ];
+    return routes;
+  }
+  /**
+   * 添加路由
+   * @param parentDepth 父路由层级
+   * @param userRoute
+   * @param routes
+   * @returns
+   */
+  static addRoute(parentDepth, userRoute, routes) {
+    if (!parentDepth)
+      return;
+    const findAndAdd = (routeList) => {
+      for (const route of routeList) {
+        if (route && route.meta && route.meta.depth === parentDepth) {
+          if (route.children && route.children.length > 0) {
+            route.children.push(userRoute);
+          } else {
+            route.children = [userRoute];
+          }
+          return true;
+        }
+        if (route.children && route.children.length > 0) {
+          if (findAndAdd(route.children)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    };
+    findAndAdd(routes);
+  }
+  /**
+   * 获取路由器
+   * @param userRoutes
+   * @returns
+   */
+  static getRouter(userRoutes = []) {
+    if (!this.router) {
+      const routes = this.getRoutes();
+      if (userRoutes && userRoutes.length > 0) {
+        for (let i = 0; i < userRoutes.length; i++) {
+          const route = userRoutes[i];
+          const paginationathSegments = userRouteUtil.splitPathToSegments(route.path);
+          const validateResult = userRouteUtil.validateRouteSegments(paginationathSegments);
+          if (!validateResult) {
+            ibiz.log.warn(
+              "\u8DEF\u7531\u914D\u7F6E\u9519\u8BEF\uFF1A\u8DEF\u7531\u8DEF\u5F84\u6709\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u8DEF\u7531\u914D\u7F6E\uFF0C\u8BE6\u60C5\u53C2\u89C1\uFF1Ahttps://open.ibizlab.cn/apphub/zh/guide/router.html"
+            );
+            continue;
+          }
+          const pathDeepth = (paginationathSegments.length - 1) / 2;
+          if (pathDeepth > 1) {
+            const segmentLength = paginationathSegments.length;
+            route.path = "".concat(paginationathSegments[segmentLength - 2], "/").concat(paginationathSegments[segmentLength - 1]);
+            this.addRoute(pathDeepth - 1, route, routes);
+          } else {
+            routes.push(route);
+          }
+        }
+      }
+      this.router = vueRouter.createRouter({
+        history: vueRouter.createWebHashHistory(),
+        routes
       });
       this.router.beforeEach((_to, _from, next) => {
         nprogress.default.configure({ showSpinner: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.50",
+  "version": "0.7.41-alpha.52",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -30,16 +30,16 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@floating-ui/dom": "^1.5.3",
-    "@ibiz-template-plugin/ai-chat": "^0.0.41",
+    "@ibiz-template-plugin/ai-chat": "^0.0.43",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.378",
     "@ibiz-template-plugin/bi-report": "0.0.30",
     "@ibiz-template-plugin/data-view": "0.0.6",
-    "@ibiz-template/core": "0.7.41-alpha.52",
+    "@ibiz-template/core": "0.7.41-alpha.53",
     "@ibiz-template/devtool": "0.0.13",
-    "@ibiz-template/model-helper": "0.7.41-alpha.52",
-    "@ibiz-template/runtime": "0.7.41-alpha.52",
+    "@ibiz-template/model-helper": "0.7.41-alpha.54",
+    "@ibiz-template/runtime": "0.7.41-alpha.54",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.52",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.54",
     "@ibiz-template/web-theme": "3.10.0",
     "@ibiz/model-core": "^0.1.84",
     "@imengyu/vue3-context-menu": "^1.3.5",

package/dist/chart-pMMcGXRE.js

@@ -1 +0,0 @@
-System.register(["vue","@ibiz-template/vue3-util","echarts","qx-util","lodash-es","@ibiz-template/runtime"],function(e){"use strict";var t,i,a,l,n,r,o,s,d,c,h,u,m,p,v,f,g,w;return{setters:[function(e){t=e.defineComponent,i=e.createVNode,a=e.resolveComponent,l=e.ref,n=e.watch,r=e.onMounted,o=e.onBeforeUnmount,s=e.nextTick,d=e.isVNode},function(e){c=e.useControlController,h=e.useNamespace,u=e.hasEmptyPanelRenderer,m=e.IBizCustomRender},function(e){p=e.init},function(e){v=e.createUUID},function(e){f=e.isArray},function(e){g=e.ChartController,w=e.ControlVO}],execute:function(){function b(e){return"function"==typeof e||"[object Object]"===Object.prototype.toString.call(e)&&!d(e)}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 d=c((...e)=>new g(...e)),D=h("control-".concat(d.model.controlType.toLowerCase())),y=l(),z=l(0),C=v(),L=l(!1),x=l({}),P=l();let R;const B=()=>{e.data&&(d.state.items=e.data.map(e=>new w(e)),d.afterLoad({},d.state.items))};d.evt.on("onCreated",async()=>{e.isSimple&&(B(),d.state.isSimple=!0,d.state.isLoaded=!0)}),n(()=>e.data,()=>{e.isSimple&&B()},{deep:!0});const N=async()=>{await s();const e=document.getElementById(C);e&&("bottom"===d.state.gridPosition||"top"===d.state.gridPosition?z.value=e.offsetHeight/2-8:z.value=e.offsetHeight-16)},S=()=>{L.value=!1},E=()=>{L.value||d.changeTooltipState(!0)};let O;r(()=>{var t,i;const a=p(y.value);d.initChart(a),window.addEventListener("resize",N),window.addEventListener("pointerdown",S),window.addEventListener("click",E),y.value&&ResizeObserver&&(O=new ResizeObserver(()=>{d.resizeChart()}),O.observe(y.value)),N();let l=(null==(i=null==(t=e.modelData.controlParam)?void 0:t.ctrlParams)?void 0:i.ENABLEDRILLDETAIL)||d.controlParams.enabledrilldetail;if(l&&!f(l))try{l=JSON.parse(l)}catch(e){ibiz.log.error(e),l=void 0}(null==l?void 0:l.length)&&a.on("click",e=>{const t=d.computedClickSerieModel(e);if(!t||ibiz.fullscreenUtil.isFullScreen)return;const i=l.find(e=>e.name===t.valueField);i&&i.isDrill&&(R=e,(e=>{if(e.event){const t=e.event.event,{offsetX:i,offsetY:a}=e.event,{clientWidth:l}=t.target;x.value=i+160>l?{top:"".concat(a-20,"px"),left:"".concat(i-160,"px")}:{top:"".concat(a,"px"),left:"".concat(i+16,"px")}}})(e),a.dispatchAction({type:"hideTip"}),d.changeTooltipState(!1),L.value=!0)})});n(()=>d.state.showGrid,()=>{N()},{immediate:!0});return o(()=>{window.removeEventListener("resize",N),window.removeEventListener("pointerdown",S),window.removeEventListener("click",E),null==O||O.disconnect()}),{c:d,ns:D,chartRef:y,uuid:C,showCheck:L,drillDetailPos:x,drillDetailRef:P,openDrillDetail:e=>{e.stopPropagation(),e.preventDefault(),L.value=!1,d.changeTooltipState(!0);const i=d.computedDrillDetailParam(R);t("drillDetail",i)},renderGrid:()=>{let e;return i(a("el-table"),{ref:"tableRef",data:d.state.gridData||[],border:!0,style:{width:"100%"},"max-height":z.value,"span-method":d.spanMethod.bind(d),"header-row-class-name":D.e("grid-header")},b(e=d.state.gridHeaders.map(e=>i(a("el-table-column"),{prop:e.id,align:"center",label:e.name},null)))?e:{default:()=>[e]})},renderNoData:()=>{if(0===d.state.items.length){const e={};return u(d)&&Object.assign(e,{customRender:()=>i(m,{controller:d},null)}),i(a("iBizNoData"),{text:d.model.emptyText,emptyTextLanguageRes:d.model.emptyTextLanguageRes,hideNoDataImage:d.state.hideNoDataImage},b(e)?e:{default:()=>[e]})}}}},render(){return i(a("iBizControlNavigation"),{controller:this.c},{default:()=>[i(a("iBizControlBase"),{controller:this.c},{default:()=>[i("div",{id:this.uuid,class:this.ns.b("chart-container")},[this.renderNoData(),i("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}]},[i("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)]},[i("div",{ref:"chartRef",class:[this.ns.e("chart")]},[ibiz.i18n.t("control.chart.chartPlaceholder")]),this.showCheck?i("div",{ref:"drillDetailRef",class:this.ns.e("drill-detail"),style:this.drillDetailPos,onPointerdown:this.openDrillDetail},[i("div",{class:this.ns.em("drill-detail","item")},[i("svg",{viewBox:"0 0 16 16",xmlns:"http://www.w3.org/2000/svg",height:"1em",width:"1em",focusable:"false",fill:"currentColor"},[i("g",{id:"aspnormal/preview","stroke-width":"1","fill-rule":"evenodd"},[i("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)])]),i("div",{class:this.ns.em("drill-detail","item-text")},[ibiz.i18n.t("control.chart.drillDetail")])])]):null]),this.c.state.showGrid?i("div",{class:this.ns.e("grid")},[this.renderGrid()]):null])])]})]})}}))}}});