@netang/quasar 0.2.31 → 0.2.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.2.31",
+  "version": "0.2.33",
 
   "description": "netang-quasar",
   "scripts": {

package/utils/$power.js

@@ -1418,7 +1418,7 @@ function getPageData($route) {
         $route = $n_router.getRoute()
     }
 
-    const path = $n_get($route, 'path')
+    let path = $n_get($route, 'path')
     if (! path) {
         return $n_fail('路由参数错误')
     }
@@ -1427,6 +1427,8 @@ function getPageData($route) {
         return $n_fail('没有获取到权限数据')
     }
 
+    path = $n_slash(path, 'start', true)
+
     // 获取角色数据
     const { urls, btns } = $n_cloneDeep(statePower.value)
     if (! $n_has(urls, path)) {

package/utils/$table.js

@@ -378,6 +378,9 @@ function create(options) {
 
         // 获取原始数据
         const r = getRawData(_tableColumns, Object.assign({}, $route.query), o.searchFromQuery)
+
+        console.log('-----r', $n.cloneDeep(r.firstTableSearchValue))
+
         // 原始参数
         rawQuery = r.rawQuery
         // 原始表格搜索参数

package/utils/useSearch.js

@@ -6,15 +6,17 @@ import $n_isFunction from 'lodash/isFunction'
 import $n_findIndex from 'lodash/findIndex'
 
 import $n_forEach from '@netang/utils/forEach'
-import $n_isValidArray from '@netang/utils/isValidArray'
 import $n_join from '@netang/utils/join'
 import $n_split from '@netang/utils/split'
+import $n_isJson from '@netang/utils/isJson'
+import $n_json from '@netang/utils/json'
 import $n_indexOf from '@netang/utils/indexOf'
 
 import $n_isRequired from '@netang/utils/isRequired'
 import $n_forIn from '@netang/utils/forIn'
 import $n_runAsync from '@netang/utils/runAsync'
 import $n_isValidObject from '@netang/utils/isValidObject'
+import $n_isValidArray from '@netang/utils/isValidArray'
 import $n_isValidValue from '@netang/utils/isValidValue'
 import $n_trimString from '@netang/utils/trimString'
 import $n_numberDeep from '@netang/utils/numberDeep'
@@ -195,6 +197,9 @@ function formatItemValueCompare(value, { compareOptions1 }) {
  */
 export function getRawData(tableColumns, query, searchFromQuery = true) {
 
+
+    console.log('-----query', $n.cloneDeep(query))
+
     // 原始参数
     const rawQuery = {}
     // 原始表格搜索参数
@@ -268,10 +273,30 @@ export function getRawData(tableColumns, query, searchFromQuery = true) {
                 // 如果在传参中有搜索参数
                 && $n_has(query, newItem.name)
             ) {
+                let newVal = query[newItem.name]
+
                 // 如果有值
-                if ($n_isRequired(query[newItem.name])) {
-                    // 设置单个搜索值
-                    setItemValue(value, query[newItem.name])
+                if ($n_isRequired(newVal)) {
+
+                    newVal = decodeURIComponent(newVal)
+                    if ($n_isJson(newVal)) {
+                        $n_forEach($n_json.parse(newVal), function (v, i) {
+                            if (
+                                i <= 1
+                                && $n_isValidArray(v)
+                                && v.length >= 2
+                            ) {
+                                value[i] = {
+                                    compare: v[0],
+                                    value: $n_isRequired(v[1]) ? v[1] : '',
+                                }
+                            }
+                        })
+
+                    } else {
+                        // 设置单个搜索值
+                        setItemValue(value, newVal)
+                    }
                 }
 
                 // 设置参数中搜索的 key