@jetlinks-web/components 3.3.6 → 3.3.7

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.
Files changed (3) hide show
  1. package/es/Search/Item.js +16 -13
  2. package/lib/Search/Item.js +16 -13
  3. package/package.json +1 -1
package/es/Search/Item.js CHANGED
@@ -28,7 +28,6 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
28
28
  "reactive": "setup-const",
29
29
  "watch": "setup-const",
30
30
  "isRef": "setup-const",
31
- "nextTick": "setup-const",
32
31
  "Select": "setup-maybe-ref",
33
32
  "DatePicker": "setup-maybe-ref",
34
33
  "RangePicker": "setup-maybe-ref",
@@ -64,6 +63,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
64
63
  "handleColumnsOptions": "setup-const",
65
64
  "onTypeChange": "setup-const",
66
65
  "onColumnChange": "setup-const",
66
+ "normalizeTermsModelValue": "setup-const",
67
67
  "onTermTypeChange": "setup-const",
68
68
  "onValueChange": "setup-const",
69
69
  "handleTermsModelValue": "setup-const"
@@ -76,7 +76,7 @@ const _hoisted_1 = {
76
76
  };
77
77
  const _hoisted_2 = { key: 1 };
78
78
  const _hoisted_3 = { class: "JSearch-item--value" };
79
- import { computed, ref, reactive, watch, isRef, } from 'vue';
79
+ import { computed, ref, reactive, watch, isRef } from 'vue';
80
80
  import { Select, DatePicker, RangePicker } from 'ant-design-vue';
81
81
  import { componentProps, componentType, typeOptions } from "./setting";
82
82
  import { getTermOptions, getItemDefaultValue } from "./util";
@@ -139,9 +139,9 @@ const __sfc_main__ = _defineComponent({
139
139
  const btwKeys = computed(() => {
140
140
  const record = findItemByColumn();
141
141
  if (record.search.isBtw && Array.isArray(record.search.isBtw)) {
142
- return [...record.search.isBtw, 'in', 'nin'];
142
+ return [...record.search.isBtw, 'in', 'nin', 'btw', 'nbtw'];
143
143
  }
144
- return ['in', 'nin'];
144
+ return ['in', 'nin', 'btw', 'nbtw'];
145
145
  });
146
146
  const prefixCls = computed(() => 'JSearch');
147
147
  const [wrapSSR, hashId] = useSearchStyle(prefixCls);
@@ -196,17 +196,21 @@ const __sfc_main__ = _defineComponent({
196
196
  onTermTypeChange();
197
197
  onValueChange();
198
198
  };
199
- const onTermTypeChange = () => {
199
+ const normalizeTermsModelValue = () => {
200
200
  const isBtw = btwKeys.value.includes(termsModel.termType);
201
- if (!isBtw && termsModel.value && Array.isArray(termsModel.value)) {
202
- termsModel.value = termsModel.value[0];
203
- onValueChange();
201
+ if ([componentType.treeSelect, componentType.select].includes(targetComponents.value.type)) {
202
+ handleTermsModelValue(isBtw);
203
+ return;
204
204
  }
205
- else if (isBtw && termsModel.value && !Array.isArray(termsModel.value)) {
206
- termsModel.value = [termsModel.value];
207
- onValueChange();
205
+ if (targetComponents.value.type === componentType.date) {
206
+ const isDateRange = ['btw', 'between'].includes(termsModel.termType);
207
+ termsModel.value = isDateRange ? [] : Array.isArray(termsModel.value) ? termsModel.value[0] : termsModel.value;
208
208
  }
209
+ };
210
+ const onTermTypeChange = () => {
211
+ normalizeTermsModelValue();
209
212
  emit('update:termType', termsModel.termType);
213
+ onValueChange();
210
214
  };
211
215
  const onValueChange = () => {
212
216
  emit('update:value', termsModel.value);
@@ -248,13 +252,12 @@ const __sfc_main__ = _defineComponent({
248
252
  else if (targetComponents.value.type === componentType.date && ['btw', 'between'].includes(termsModel.termType)) {
249
253
  // 当日期类型选择了 btw 时，切换到 RangePicker 组件
250
254
  targetComponents.value.name = RangePicker;
251
- termsModel.value = [];
252
255
  }
253
256
  else if (targetComponents.value.type === componentType.date && !['btw', 'between'].includes(termsModel.termType)) {
254
257
  // 当 RangePicker 取消 btw 时，切换回 DatePicker 组件
255
258
  targetComponents.value.name = DatePicker;
256
- termsModel.value = undefined;
257
259
  }
260
+ normalizeTermsModelValue();
258
261
  }, { immediate: true, deep: true });
259
262
  watch(() => [termsModel.column, columnsMap.value], async () => {
260
263
  // 根据column从map中获取record，再解析search属性
package/lib/Search/Item.js CHANGED
@@ -28,7 +28,6 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
28
28
  "reactive": "setup-const",
29
29
  "watch": "setup-const",
30
30
  "isRef": "setup-const",
31
- "nextTick": "setup-const",
32
31
  "Select": "setup-maybe-ref",
33
32
  "DatePicker": "setup-maybe-ref",
34
33
  "RangePicker": "setup-maybe-ref",
@@ -64,6 +63,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
64
63
  "handleColumnsOptions": "setup-const",
65
64
  "onTypeChange": "setup-const",
66
65
  "onColumnChange": "setup-const",
66
+ "normalizeTermsModelValue": "setup-const",
67
67
  "onTermTypeChange": "setup-const",
68
68
  "onValueChange": "setup-const",
69
69
  "handleTermsModelValue": "setup-const"
@@ -76,7 +76,7 @@ const _hoisted_1 = {
76
76
  };
77
77
  const _hoisted_2 = { key: 1 };
78
78
  const _hoisted_3 = { class: "JSearch-item--value" };
79
- import { computed, ref, reactive, watch, isRef, } from 'vue';
79
+ import { computed, ref, reactive, watch, isRef } from 'vue';
80
80
  import { Select, DatePicker, RangePicker } from 'ant-design-vue';
81
81
  import { componentProps, componentType, typeOptions } from "./setting";
82
82
  import { getTermOptions, getItemDefaultValue } from "./util";
@@ -139,9 +139,9 @@ const __sfc_main__ = _defineComponent({
139
139
  const btwKeys = computed(() => {
140
140
  const record = findItemByColumn();
141
141
  if (record.search.isBtw && Array.isArray(record.search.isBtw)) {
142
- return [...record.search.isBtw, 'in', 'nin'];
142
+ return [...record.search.isBtw, 'in', 'nin', 'btw', 'nbtw'];
143
143
  }
144
- return ['in', 'nin'];
144
+ return ['in', 'nin', 'btw', 'nbtw'];
145
145
  });
146
146
  const prefixCls = computed(() => 'JSearch');
147
147
  const [wrapSSR, hashId] = useSearchStyle(prefixCls);
@@ -196,17 +196,21 @@ const __sfc_main__ = _defineComponent({
196
196
  onTermTypeChange();
197
197
  onValueChange();
198
198
  };
199
- const onTermTypeChange = () => {
199
+ const normalizeTermsModelValue = () => {
200
200
  const isBtw = btwKeys.value.includes(termsModel.termType);
201
- if (!isBtw && termsModel.value && Array.isArray(termsModel.value)) {
202
- termsModel.value = termsModel.value[0];
203
- onValueChange();
201
+ if ([componentType.treeSelect, componentType.select].includes(targetComponents.value.type)) {
202
+ handleTermsModelValue(isBtw);
203
+ return;
204
204
  }
205
- else if (isBtw && termsModel.value && !Array.isArray(termsModel.value)) {
206
- termsModel.value = [termsModel.value];
207
- onValueChange();
205
+ if (targetComponents.value.type === componentType.date) {
206
+ const isDateRange = ['btw', 'between'].includes(termsModel.termType);
207
+ termsModel.value = isDateRange ? [] : Array.isArray(termsModel.value) ? termsModel.value[0] : termsModel.value;
208
208
  }
209
+ };
210
+ const onTermTypeChange = () => {
211
+ normalizeTermsModelValue();
209
212
  emit('update:termType', termsModel.termType);
213
+ onValueChange();
210
214
  };
211
215
  const onValueChange = () => {
212
216
  emit('update:value', termsModel.value);
@@ -248,13 +252,12 @@ const __sfc_main__ = _defineComponent({
248
252
  else if (targetComponents.value.type === componentType.date && ['btw', 'between'].includes(termsModel.termType)) {
249
253
  // 当日期类型选择了 btw 时，切换到 RangePicker 组件
250
254
  targetComponents.value.name = RangePicker;
251
- termsModel.value = [];
252
255
  }
253
256
  else if (targetComponents.value.type === componentType.date && !['btw', 'between'].includes(termsModel.termType)) {
254
257
  // 当 RangePicker 取消 btw 时，切换回 DatePicker 组件
255
258
  targetComponents.value.name = DatePicker;
256
- termsModel.value = undefined;
257
259
  }
260
+ normalizeTermsModelValue();
258
261
  }, { immediate: true, deep: true });
259
262
  watch(() => [termsModel.column, columnsMap.value], async () => {
260
263
  // 根据column从map中获取record，再解析search属性
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jetlinks-web/components",
3
- "version": "3.3.6",
3
+ "version": "3.3.7",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",