@ibiz-template/mob-vue3-components 0.0.13 → 0.0.14

package/es/mob-app/components/router-shell/router-shell.mjs

@@ -61,15 +61,15 @@ const RouterShell = /* @__PURE__ */ defineComponent({
       context,
       params,
       srfnav,
-      viewModel
+      viewConfig
     } = this.viewData;
     const props = mergeDeepLeft({
       ...this.$props,
       ...this.$attrs,
       context,
       params,
-      modelData: viewModel,
-      key: viewModel.codeName
+      viewId: viewConfig.id,
+      key: viewConfig.codeName
     }, {
       state: {
         srfnav

package/es/mob-app/main.mjs

@@ -7,6 +7,7 @@ import { createVueApp } from './create-vue-app.mjs';
 import { AppRouter } from './router/index.mjs';
 import './util/index.mjs';
 import '../util/index.mjs';
+import { UnauthorizedHandler } from './util/unauthorized-handler/unauthorized-handler.mjs';
 import { OpenViewUtil } from '../util/open-view-util/open-view-util.mjs';
 import { MessageUtil } from '../util/message-util/message-util.mjs';
 import { ModalUtil } from '../util/modal-util/modal-util.mjs';
@@ -14,7 +15,6 @@ import { ConfirmUtil } from '../util/confirm-util/confirm-util.mjs';
 import { NotificationUtil } from '../util/notification-util/notification-util.mjs';
 import { LoadingUtil } from '../util/loading-util/loading-util.mjs';
 import { OverlayController } from '../util/overlay-controller/overlay-controller.mjs';
-import { UnauthorizedHandler } from './util/unauthorized-handler/unauthorized-handler.mjs';
 
 "use strict";
 async function runApp(plugins) {
@@ -28,6 +28,7 @@ async function runApp(plugins) {
   install();
   install$1();
   ibiz.plugin = new PluginFactory();
+  ibiz.util.error.register(new UnauthorizedHandler());
   const app = createVueApp(App);
   OverlayContainer.createVueApp = createVueApp;
   window.onerror = function(_event, _source, _lineno, _colno, error) {
@@ -51,7 +52,6 @@ async function runApp(plugins) {
   ibiz.notification = new NotificationUtil();
   ibiz.loading = new LoadingUtil();
   ibiz.overlay = new OverlayController();
-  ibiz.util.error.register(new UnauthorizedHandler());
   ibiz.platform = getPlatformProvider();
   await ibiz.i18n.init();
   app.mount("#app");

package/es/mob-app/router/index.mjs

@@ -42,12 +42,16 @@ class AppRouter {
    * @return {*}
    */
   static createRouter() {
-    const beforeEnter = async () => {
+    const beforeEnter = async (_to, _from, next) => {
       if (!isNilOrEmpty(ibiz.appData)) {
-        return true;
+        next();
       }
       const authority = await AuthGuard();
-      return authority;
+      if (authority) {
+        next();
+      } else {
+        next(false);
+      }
     };
     const placeholder = ibiz.env.routePlaceholder;
     const paramReg = `[^/]+=[^/]+|${placeholder}`;

package/es/panel-component/panel-button/index.d.ts

@@ -12,7 +12,7 @@ export declare const IBizPanelButton: import("@ibiz-template/vue3-util").TypeWit
 }, {
     ns: import("@ibiz-template/core").Namespace;
     captionText: import("vue").ComputedRef<any>;
-    buttonType: import("vue").ComputedRef<"default" | "text" | "success" | "primary" | "danger" | "warning">;
+    buttonType: import("vue").ComputedRef<"text" | "success" | "primary" | "danger" | "warning" | "default">;
     showCaption: boolean | undefined;
     sysImage: import("@ibiz/model-core").ISysImage | undefined;
     codeName: string | undefined;

package/es/panel-component/panel-button/panel-button.d.ts

@@ -14,7 +14,7 @@ export declare const PanelButton: import("vue").DefineComponent<{
 }, {
     ns: import("@ibiz-template/core").Namespace;
     captionText: import("vue").ComputedRef<any>;
-    buttonType: import("vue").ComputedRef<"default" | "text" | "success" | "primary" | "danger" | "warning">;
+    buttonType: import("vue").ComputedRef<"text" | "success" | "primary" | "danger" | "warning" | "default">;
     showCaption: boolean | undefined;
     sysImage: import("@ibiz/model-core").ISysImage | undefined;
     codeName: string | undefined;

package/es/util/app-modal/app-modal-component.d.ts

@@ -15,6 +15,7 @@ export declare const AppModalComponent: import("vue").DefineComponent<{
         footerHide?: boolean | undefined;
         placement?: "center" | undefined;
         modalClass?: string | undefined;
+        isRouteModal?: boolean | undefined;
     }>;
     modalZIndex: number;
     customStyle: IData;

package/es/util/notification-util/notification-util.d.ts

@@ -9,6 +9,7 @@ import { INotificationUtil, NotificationParams } from '@ibiz-template/runtime';
  * @implements {INotificationUtil}
  */
 export declare class NotificationUtil implements INotificationUtil {
+    default(_params: NotificationParams): void;
     info(params: NotificationParams): void;
     success(params: NotificationParams): void;
     warning(params: NotificationParams): void;

package/es/util/notification-util/notification-util.mjs

@@ -2,6 +2,9 @@ import { showNotify } from 'vant';
 
 "use strict";
 class NotificationUtil {
+  default(_params) {
+    throw new Error("\u672A\u5B9E\u73B0");
+  }
   info(params) {
     const duration = params.duration ? params.duration * 1e3 : 4500;
     showNotify({

package/es/util/store/view-stack/view-stack.mjs

@@ -1,5 +1,6 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { getNestedRoutePath } from '@ibiz-template/vue3-util';
+import { isNavigationFailure } from 'vue-router';
 import { defineStore } from 'pinia';
 import { reactive } from 'vue';
 import { QXEvent } from 'qx-util';
@@ -51,7 +52,10 @@ const useViewStack = defineStore("viewStack", () => {
   };
   const init = (_router) => {
     router = _router;
-    _router.afterEach((to) => {
+    _router.afterEach((to, _form, failure) => {
+      if (isNavigationFailure(failure)) {
+        return;
+      }
       const { key, isCache } = calcUniqueKey(to);
       if (isCache) {
         if (key === viewStack.currentKey) {

package/lib/mob-app/components/router-shell/router-shell.cjs

@@ -63,15 +63,15 @@ const RouterShell = /* @__PURE__ */ vue.defineComponent({
       context,
       params,
       srfnav,
-      viewModel
+      viewConfig
     } = this.viewData;
     const props = ramda.mergeDeepLeft({
       ...this.$props,
       ...this.$attrs,
       context,
       params,
-      modelData: viewModel,
-      key: viewModel.codeName
+      viewId: viewConfig.id,
+      key: viewConfig.codeName
     }, {
       state: {
         srfnav

package/lib/mob-app/main.cjs

@@ -9,6 +9,7 @@ var createVueApp = require('./create-vue-app.cjs');
 var index = require('./router/index.cjs');
 require('./util/index.cjs');
 require('../util/index.cjs');
+var unauthorizedHandler = require('./util/unauthorized-handler/unauthorized-handler.cjs');
 var openViewUtil = require('../util/open-view-util/open-view-util.cjs');
 var messageUtil = require('../util/message-util/message-util.cjs');
 var modalUtil = require('../util/modal-util/modal-util.cjs');
@@ -16,7 +17,6 @@ var confirmUtil = require('../util/confirm-util/confirm-util.cjs');
 var notificationUtil = require('../util/notification-util/notification-util.cjs');
 var loadingUtil = require('../util/loading-util/loading-util.cjs');
 var overlayController = require('../util/overlay-controller/overlay-controller.cjs');
-var unauthorizedHandler = require('./util/unauthorized-handler/unauthorized-handler.cjs');
 
 "use strict";
 async function runApp(plugins) {
@@ -30,6 +30,7 @@ async function runApp(plugins) {
   core.install();
   runtime.install();
   ibiz.plugin = new vue3Util.PluginFactory();
+  ibiz.util.error.register(new unauthorizedHandler.UnauthorizedHandler());
   const app = createVueApp.createVueApp(App.default);
   vue3Util.OverlayContainer.createVueApp = createVueApp.createVueApp;
   window.onerror = function(_event, _source, _lineno, _colno, error) {
@@ -53,7 +54,6 @@ async function runApp(plugins) {
   ibiz.notification = new notificationUtil.NotificationUtil();
   ibiz.loading = new loadingUtil.LoadingUtil();
   ibiz.overlay = new overlayController.OverlayController();
-  ibiz.util.error.register(new unauthorizedHandler.UnauthorizedHandler());
   ibiz.platform = runtime.getPlatformProvider();
   await ibiz.i18n.init();
   app.mount("#app");

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

@@ -44,12 +44,16 @@ class AppRouter {
    * @return {*}
    */
   static createRouter() {
-    const beforeEnter = async () => {
+    const beforeEnter = async (_to, _from, next) => {
       if (!qxUtil.isNilOrEmpty(ibiz.appData)) {
-        return true;
+        next();
       }
       const authority = await authGuard.AuthGuard();
-      return authority;
+      if (authority) {
+        next();
+      } else {
+        next(false);
+      }
     };
     const placeholder = ibiz.env.routePlaceholder;
     const paramReg = `[^/]+=[^/]+|${placeholder}`;

package/lib/util/notification-util/notification-util.cjs

@@ -4,6 +4,9 @@ var Vant = require('vant');
 
 "use strict";
 class NotificationUtil {
+  default(_params) {
+    throw new Error("\u672A\u5B9E\u73B0");
+  }
   info(params) {
     const duration = params.duration ? params.duration * 1e3 : 4500;
     Vant.showNotify({

package/lib/util/store/view-stack/view-stack.cjs

@@ -2,6 +2,7 @@
 
 var core = require('@ibiz-template/core');
 var vue3Util = require('@ibiz-template/vue3-util');
+var vueRouter = require('vue-router');
 var pinia = require('pinia');
 var vue = require('vue');
 var qxUtil = require('qx-util');
@@ -53,7 +54,10 @@ const useViewStack = pinia.defineStore("viewStack", () => {
   };
   const init = (_router) => {
     router = _router;
-    _router.afterEach((to) => {
+    _router.afterEach((to, _form, failure) => {
+      if (vueRouter.isNavigationFailure(failure)) {
+        return;
+      }
       const { key, isCache } = calcUniqueKey(to);
       if (isCache) {
         if (key === viewStack.currentKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/mob-vue3-components",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -24,12 +24,12 @@
   },
   "dependencies": {
     "@ibiz-template-package/vs-tree-ex": "^0.1.1",
-    "@ibiz-template/core": "^0.6.0",
-    "@ibiz-template/model-helper": "0.6.1-alpha.0",
-    "@ibiz-template/runtime": "0.6.1-alpha.0",
+    "@ibiz-template/core": "^0.6.3",
+    "@ibiz-template/model-helper": "^0.6.3",
+    "@ibiz-template/runtime": "^0.6.3",
     "@ibiz-template/theme": "^0.6.0",
-    "@ibiz-template/vue3-util": "0.6.1-alpha.0",
-    "@ibiz/model-core": "^0.1.11",
+    "@ibiz-template/vue3-util": "^0.6.3",
+    "@ibiz/model-core": "^0.1.14",
     "@ibiz-template/mob-theme": "^0.2.12",
     "async-validator": "^4.2.5",
     "cherry-markdown": "^0.8.26",