@yoooloo42/joker 1.0.202 → 1.0.205

package/dist/index.cjs.js

@@ -21969,7 +21969,7 @@ const upload_carplate = '/ly0/upload-req/carplate';
 // 后端请求
 async function request$1(_ref) {
   let {
-    domain = '',
+    domain = domainPara,
     url = '',
     // 路由
     data = null // 请求数据
@@ -21991,12 +21991,12 @@ async function request$1(_ref) {
 // ly0后端请求，需要处理session异常
 async function ly0request(_ref2) {
   let {
-    domain = '',
+    domain = domainPara,
     url = '',
     // 路由
     data = null,
     // 请求数据
-    router = null // 页面路由，用于处理session异常
+    routerInstance = null // 路由实例
   } = _ref2;
   try {
     const response = await request$1({
@@ -22014,7 +22014,9 @@ async function ly0request(_ref2) {
           usertbl: ly0session && ly0session.session && ly0session.session.usertbl ? ly0session.session.usertbl : 'ly0d0user'
         }
       });
-      ly0sessionLose(router);
+      ly0sessionLose({
+        routerInstance
+      });
       return {
         code: 1,
         message: 'session 异常',
@@ -22037,7 +22039,7 @@ async function storpro(_ref3) {
     domain = domainPara,
     noSession = false,
     // 不进行session验证
-    router = null // 页面路由，用于处理session异常
+    routerInstance = null // 路由实例
   } = _ref3;
   try {
     if (!storproName) {
@@ -22054,7 +22056,7 @@ async function storpro(_ref3) {
         noSession,
         ly0session: ly0sessionLoad()
       },
-      router
+      routerInstance
     });
     return result;
   } catch (err) {
@@ -22081,7 +22083,7 @@ function ly0sessionClear() {
 // session丢失
 function ly0sessionLose(_ref4) {
   let {
-    router = null
+    routerInstance
   } = _ref4;
   let ly0session = ly0sessionLoad(),
     lose = false,
@@ -22097,10 +22099,10 @@ function ly0sessionLose(_ref4) {
         break;
     }
   }
-  if (router && lose) {
-    router.replace({
-      path: route
-    });
+  if (lose) {
+    if (routerInstance) {
+      routerInstance.replace(route);
+    }
   }
   return lose;
 }
@@ -22108,7 +22110,7 @@ function ly0sessionLose(_ref4) {
 // session丢失
 function ly0sessionLoseWithUsertbl(_ref5) {
   let {
-    router = null,
+    routerInstance,
     usertbl
   } = _ref5;
   let ly0session = ly0sessionLoad(),
@@ -22125,13 +22127,38 @@ function ly0sessionLoseWithUsertbl(_ref5) {
         break;
     }
   }
-  if (router && lose) {
-    router.replace({
-      path: route
-    });
+  if (lose) {
+    if (routerInstance) {
+      routerInstance.replace(route);
+    }
   }
   return lose;
 }
+
+// 导航
+function navigate(_ref6) {
+  let {
+    code = '1',
+    // 页面跳转类型
+    path,
+    // 跳转路径
+    routerInstance // 路由实例
+  } = _ref6;
+  if (code === '0') {
+    // 页面跳转
+    window.location.href = path;
+  } else if (code === '1') {
+    // VUE路由
+    if (routerInstance) {
+      routerInstance.push(path);
+    }
+  } else {
+    // 默认VUE路由
+    if (routerInstance) {
+      routerInstance.push(path);
+    }
+  }
+}
 var ly0request$1 = {
   domain: domainPara,
   upload: upload$1,
@@ -22144,7 +22171,8 @@ var ly0request$1 = {
   ly0sessionLoad,
   ly0sessionClear,
   ly0sessionLose,
-  ly0sessionLoseWithUsertbl
+  ly0sessionLoseWithUsertbl,
+  navigate
 };
 
 var request = {
@@ -24321,6 +24349,7 @@ script$i.__file = "src/form/Form.vue";
 var ly0default$3 = {
   myProps: {
     popup: {
+      switch: false,
       visible: false,
       title: '',
       width: '800px',
@@ -24386,7 +24415,7 @@ const scopeThis_box = vue.reactive(props.scopeThis);
 return (_ctx, _cache) => {
   const _component_el_dialog = vue.resolveComponent("el-dialog");
 
-  return (formProps_box.popup)
+  return (formProps_box.popup.switch)
     ? (vue.openBlock(), vue.createBlock(_component_el_dialog, {
         key: 0,
         modelValue: formProps_box.popup.visible,
@@ -42386,6 +42415,7 @@ script$d.__file = "src/table/Table.vue";
 var ly0default$1 = {
   myProps: {
     popup: {
+      switch: false,
       visible: false,
       title: '',
       width: "1024px",
@@ -42495,12 +42525,12 @@ const scopeThis_box = vue.reactive(props.scopeThis);
 return (_ctx, _cache) => {
   const _component_el_dialog = vue.resolveComponent("el-dialog");
 
-  return (tableProps_box.popup)
+  return (tableProps_box.popup.switch)
     ? (vue.openBlock(), vue.createBlock(_component_el_dialog, {
         key: 0,
         modelValue: tableProps_box.popup.visible,
         "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ((tableProps_box.popup.visible) = $event)),
-        "custom-class": 'code-template-dialog',
+        "custom-class": "code-template-dialog",
         "close-on-press-escape": true,
         "append-to-body": "",
         title: tableProps_box.popup.title,