@netang/quasar 0.1.71 → 0.1.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.1.71",
+  "version": "0.1.73",
   "description": "netang-quasar",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/utils/$power.js

@@ -10,6 +10,7 @@ import $n_isNumber from 'lodash/isNumber'
 import $n_cloneDeep from 'lodash/cloneDeep'
 import $n_isFunction from 'lodash/isFunction'
 import $n_pick from 'lodash/pick'
+import $n_omit from 'lodash/omit'
 
 import $n_router from '@netang/utils/vue/router'
 
@@ -50,6 +51,21 @@ const {
     dicts,
 } = configs
 
+/**
+ * 获取来源页面完整地址
+ */
+function getFromPageFullUrl({ path, query }) {
+
+    const {
+        fullPath
+    } = $n_router.resolve({
+        path,
+        query: $n_omit(query, ['n_page_title', 'n_from_page']),
+    })
+
+    return encodeURIComponent(fullPath)
+}
+
 /**
  * 创建权限实例
  */
@@ -845,18 +861,18 @@ function getRequestQuery(o) {
     // 获取列表数据
     if (
         // 如果按钮参数有显示类型
-        $n_has(o.powerBtn.data, 'show')
+        // $n_has(o.powerBtn.data, 'show')
         // 按钮参数的显示类型必须是单选或多选
-        && $n_indexOf(['single', 'multiple'], o.powerBtn.data.show) > -1
+        // && $n_indexOf(['single', 'multiple'], o.powerBtn.data.show) > -1
         // 如果有请求传参的列表设置
-        && $n_has(o.powerBtn.data, 'requestQuery.list')
+        $n_has(o.powerBtn.data, 'requestQuery.list')
         // 如果有表格数据
         && $n_isValidArray(o.tableSelected)
     ) {
         let newQuery = {}
 
         // 如果是单选
-        if (o.powerBtn.data.show === 'single') {
+        if ($n_get(o.powerBtn.data, 'show') === 'single') {
             // 取表格选中第一条数据
             newQuery = o.tableSelected[0]
 
@@ -1030,8 +1046,9 @@ async function request(options) {
 
         // 如果不是禁止添加来源页面参数
         if ($n_get(o.powerBtn.data, 'noFromPageQuery') !== true) {
+
             // 来源页面是当前路由的完整路径
-            query.n_from_page = encodeURIComponent($currentRoute.fullPath)
+            query.n_from_page = getFromPageFullUrl($currentRoute)
         }
 
         // 请求前执行
@@ -1376,10 +1393,10 @@ function routerPush({ path, query, pageTitle, fromPage }) {
     // 来源页面
     if (fromPage) {
         if (fromPage === true) {
-            fromPage = $n_router.getRoute().fullPath
+            fromPage = $n_router.getRoute()
         }
         // 来源页面是指定路由的完整路径
-        query.n_from_page = encodeURIComponent(fromPage)
+        query.n_from_page = getFromPageFullUrl(fromPage)
     }
 
     $n_router.push({