@netang/quasar 0.2.37 → 0.2.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -123,7 +123,7 @@
123
123
  fit="fill"
124
124
  >
125
125
  <!-- 如果是外链 -->
126
- <span class="n-uploader-query__item__net" v-if="fileItem.isNet && ! fileItem.isNetUploaded">链接</span>
126
+ <span class="n-uploader-query__item__net" v-if="fileItem.isNet && ! fileItem.isNetUploaded">网络</span>
127
127
 
128
128
  <!-- 内容 -->
129
129
  <div
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@netang/quasar",
3
- "version": "0.2.37",
3
+ "version": "0.2.38",
4
4
 
5
5
  "description": "netang-quasar",
6
6
  "scripts": {
package/utils/$table.js CHANGED
@@ -1286,20 +1286,31 @@ async function getViewData(options) {
1286
1286
  }, options)
1287
1287
 
1288
1288
  const _isValidValue = $n_isValidValue(httpValue)
1289
- if (_isValidValue || $n_isValidArray(httpValue)) {
1289
+ const hasSearch = $n_has(httpData, 'n_search')
1290
+ if (_isValidValue || $n_isValidArray(httpValue) || hasSearch) {
1290
1291
 
1291
- let per_page
1292
- let value
1293
- let compare
1292
+ const n_search = []
1293
+ let per_page = 1
1294
1294
 
1295
- if (_isValidValue) {
1296
- compare = dicts.SEARCH_COMPARE_TYPE__EQUAL
1297
- value = httpValue
1298
- per_page = 1
1299
- } else {
1300
- compare = dicts.SEARCH_COMPARE_TYPE__IN
1301
- value = $n_uniq(httpValue)
1302
- per_page = value.length
1295
+ if (! hasSearch) {
1296
+
1297
+ let value
1298
+ let compare
1299
+
1300
+ if (_isValidValue) {
1301
+ compare = dicts.SEARCH_COMPARE_TYPE__EQUAL
1302
+ value = httpValue
1303
+ } else {
1304
+ compare = dicts.SEARCH_COMPARE_TYPE__IN
1305
+ value = $n_uniq(httpValue)
1306
+ per_page = value.length
1307
+ }
1308
+
1309
+ n_search.push({
1310
+ field,
1311
+ compare,
1312
+ value,
1313
+ })
1303
1314
  }
1304
1315
 
1305
1316
  const { status, data } = await $n_http({
@@ -1310,13 +1321,7 @@ async function getViewData(options) {
1310
1321
  Pview: 1,
1311
1322
  },
1312
1323
  data: Object.assign({
1313
- n_search: [
1314
- {
1315
- field,
1316
- compare,
1317
- value,
1318
- },
1319
- ],
1324
+ n_search,
1320
1325
  page: 1,
1321
1326
  per_page,
1322
1327
  }, httpData),