@netang/quasar 0.2.37 → 0.2.39

package/components/uploader-query/index.vue

@@ -123,7 +123,7 @@
                         fit="fill"
                     >
                         <!-- 如果是外链 -->
-                        <span class="n-uploader-query__item__net" v-if="fileItem.isNet && ! fileItem.isNetUploaded">链接</span>
+                        <span class="n-uploader-query__item__net" v-if="fileItem.isNet && ! fileItem.isNetUploaded">网络</span>
 
                         <!-- 内容 -->
                         <div

package/package.json

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

package/utils/$power.js

@@ -1171,30 +1171,59 @@ async function request(options) {
     }
 
     // 判断是否有确认框
-    const isConfirm = $n_get(o.powerBtn.data, 'confirm')
+    let isConfirm = $n_get(o.powerBtn.data, 'confirm')
+    const isConfirmPassword = $n_get(o.powerBtn.data, 'confirmPassword')
     if (
         // 如果有确认框
         isConfirm
         // 如果有密码确认框
-        || $n_get(o.powerBtn.data, 'confirmPassword')
+        || isConfirmPassword
     ) {
+        // 如果是确认密码
+        if (isConfirmPassword) {
+
+            const {
+                confirmPassword,
+            } = configs.power
+
+            // 如果确认密码方法存在
+            if ($n_isFunction(confirmPassword)) {
+
+                // 确认框
+                $n_confirm({
+                    message: $n_isValidString(isConfirmPassword) ? isConfirmPassword : '重要操作，请输入登录密码并确认后操作！',
+                    prompt: {
+                        model: '',
+                        isValid: val => val.length > 0,
+                        type: 'password',
+                    },
+                    persistent: true,
+                })
+                    // 点击确认执行
+                    .onOk(function (e) {
+                        confirmPassword(e, onConfirmRequest)
+                    })
+                return
+            }
+
+            // 否则为普通确认框
+            isConfirm = true
+        }
+
         // 如果需要先弹出确认框
         if (isConfirm) {
-
             // 确认框
             $n_confirm({
-                // 重要操作，请输入登录密码并确认后操作
                 message: $n_isValidString(isConfirm) ? isConfirm : '确认要执行该操作吗？',
+                persistent: true,
             })
                 // 点击确认执行
                 .onOk(onConfirmRequest)
-
-            return
         }
     }
 
     // 否则执行确认请求事件
-    await onConfirmRequest()
+    onConfirmRequest()
 
     /**
      * 确认请求事件

package/utils/$table.js

@@ -1286,20 +1286,31 @@ async function getViewData(options) {
     }, options)
 
     const _isValidValue = $n_isValidValue(httpValue)
-    if (_isValidValue || $n_isValidArray(httpValue)) {
+    const hasSearch = $n_has(httpData, 'n_search')
+    if (_isValidValue || $n_isValidArray(httpValue) || hasSearch) {
 
-        let per_page
-        let value
-        let compare
+        const n_search = []
+        let per_page = 1
 
-        if (_isValidValue) {
-            compare = dicts.SEARCH_COMPARE_TYPE__EQUAL
-            value = httpValue
-            per_page = 1
-        } else {
-            compare = dicts.SEARCH_COMPARE_TYPE__IN
-            value = $n_uniq(httpValue)
-            per_page = value.length
+        if (! hasSearch) {
+
+            let value
+            let compare
+
+            if (_isValidValue) {
+                compare = dicts.SEARCH_COMPARE_TYPE__EQUAL
+                value = httpValue
+            } else {
+                compare = dicts.SEARCH_COMPARE_TYPE__IN
+                value = $n_uniq(httpValue)
+                per_page = value.length
+            }
+
+            n_search.push({
+                field,
+                compare,
+                value,
+            })
         }
 
         const { status, data } = await $n_http({
@@ -1310,13 +1321,7 @@ async function getViewData(options) {
                 Pview: 1,
             },
             data: Object.assign({
-                n_search: [
-                    {
-                        field,
-                        compare,
-                        value,
-                    },
-                ],
+                n_search,
                 page: 1,
                 per_page,
             }, httpData),

package/utils/config.js

@@ -31,6 +31,10 @@ export const configs = {
     components: {},
     // 对话框组件
     dialogComponents: {},
+    power: {
+        // 确认密码
+        confirmPassword: null,
+    },
     // 上传器配置
     uploader: {
         // 如果是 Minio 上传, 则在后面加上下划线

package/utils/useSearch.js

@@ -6,7 +6,6 @@ import $n_isFunction from 'lodash/isFunction'
 import $n_findIndex from 'lodash/findIndex'
 
 import $n_forEach from '@netang/utils/forEach'
-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'
@@ -68,6 +67,8 @@ function setItemCompare(item) {
             { label: '!=', value: dicts.SEARCH_COMPARE_TYPE__NOT_EQUAL },
             { label: '>', value: dicts.SEARCH_COMPARE_TYPE__GT },
             { label: '≥', value: dicts.SEARCH_COMPARE_TYPE__GTE },
+            { label: '<', value: dicts.SEARCH_COMPARE_TYPE__LT },
+            { label: '≤', value: dicts.SEARCH_COMPARE_TYPE__LTE },
         ]
 
     // 如果类型为日期