@jetlinks-web/components 3.2.0 → 3.2.1

package/es/Search/Item.js

@@ -30,6 +30,8 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "isRef": "setup-const",
   "nextTick": "setup-const",
   "Select": "setup-maybe-ref",
+  "DatePicker": "setup-maybe-ref",
+  "RangePicker": "setup-maybe-ref",
   "componentProps": "setup-maybe-ref",
   "componentType": "setup-maybe-ref",
   "typeOptions": "setup-maybe-ref",
@@ -75,7 +77,7 @@ const _hoisted_1 = {
 const _hoisted_2 = { key: 1 };
 const _hoisted_3 = { class: "JSearch-item--value" };
 import { computed, ref, reactive, watch, isRef, } from 'vue';
-import { Select } from 'ant-design-vue';
+import { Select, DatePicker, RangePicker } from 'ant-design-vue';
 import { componentProps, componentType, typeOptions } from "./setting";
 import { getTermOptions, getItemDefaultValue } from "./util";
 import { useLocaleReceiver } from "../LocaleReciver";
@@ -243,6 +245,16 @@ const __sfc_main__ = _defineComponent({
                 };
                 handleTermsModelValue(isBtw);
             }
+            else if (targetComponents.value.type === componentType.date && ['btw', 'between'].includes(termsModel.termType)) {
+                // 当日期类型选择了 btw 时，切换到 RangePicker 组件
+                targetComponents.value.name = RangePicker;
+                termsModel.value = [];
+            }
+            else if (targetComponents.value.type === componentType.date && !['btw', 'between'].includes(termsModel.termType)) {
+                // 当 RangePicker 取消 btw 时，切换回 DatePicker 组件
+                targetComponents.value.name = DatePicker;
+                termsModel.value = undefined;
+            }
         }, { immediate: true, deep: true });
         watch(() => [termsModel.column, columnsMap.value], async () => {
             // 根据column从map中获取record，再解析search属性

package/es/Search/util.js

@@ -213,7 +213,7 @@ export var getTermOptions = function getTermOptions(type, locale) {
       break;
     case 'time':
     case 'date':
-      keys = ['gt', 'lt', 'gte', 'lte'];
+      keys = ['gt', 'lt', 'gte', 'lte', 'btw'];
       break;
     case 'timeRange':
     case 'rangePicker':

package/es/VirtualTable/Table.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { defineComponent, computed, ref, watch, onMounted, onBeforeUnmount, nextTick, createVNode as _createVNode } from 'vue';
+import { defineComponent, computed, ref, watch, onMounted, onBeforeUnmount, nextTick, toRef, defineExpose, createVNode as _createVNode } from 'vue';
 import { Table } from 'ant-design-vue';
 import { tableProps } from "ant-design-vue/es/table";
 import { useVirtualScroll } from './useVirtualScroll';
@@ -190,7 +190,7 @@ export default defineComponent({
       removeScrollListener();
     });
     // 暴露方法
-    expose({
+    defineExpose({
       scrollTo: virtualScroll.scrollTo,
       scrollToIndex: virtualScroll.scrollToIndex,
       // 树形数据相关方法

package/lib/Search/Item.js

@@ -30,6 +30,8 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "isRef": "setup-const",
   "nextTick": "setup-const",
   "Select": "setup-maybe-ref",
+  "DatePicker": "setup-maybe-ref",
+  "RangePicker": "setup-maybe-ref",
   "componentProps": "setup-maybe-ref",
   "componentType": "setup-maybe-ref",
   "typeOptions": "setup-maybe-ref",
@@ -75,7 +77,7 @@ const _hoisted_1 = {
 const _hoisted_2 = { key: 1 };
 const _hoisted_3 = { class: "JSearch-item--value" };
 import { computed, ref, reactive, watch, isRef, } from 'vue';
-import { Select } from 'ant-design-vue';
+import { Select, DatePicker, RangePicker } from 'ant-design-vue';
 import { componentProps, componentType, typeOptions } from "./setting";
 import { getTermOptions, getItemDefaultValue } from "./util";
 import { useLocaleReceiver } from "../LocaleReciver";
@@ -243,6 +245,16 @@ const __sfc_main__ = _defineComponent({
                 };
                 handleTermsModelValue(isBtw);
             }
+            else if (targetComponents.value.type === componentType.date && ['btw', 'between'].includes(termsModel.termType)) {
+                // 当日期类型选择了 btw 时，切换到 RangePicker 组件
+                targetComponents.value.name = RangePicker;
+                termsModel.value = [];
+            }
+            else if (targetComponents.value.type === componentType.date && !['btw', 'between'].includes(termsModel.termType)) {
+                // 当 RangePicker 取消 btw 时，切换回 DatePicker 组件
+                targetComponents.value.name = DatePicker;
+                termsModel.value = undefined;
+            }
         }, { immediate: true, deep: true });
         watch(() => [termsModel.column, columnsMap.value], async () => {
             // 根据column从map中获取record，再解析search属性

package/lib/Search/util.js

@@ -220,7 +220,7 @@ var getTermOptions = exports.getTermOptions = function getTermOptions(type, loca
       break;
     case 'time':
     case 'date':
-      keys = ['gt', 'lt', 'gte', 'lte'];
+      keys = ['gt', 'lt', 'gte', 'lte', 'btw'];
       break;
     case 'timeRange':
     case 'rangePicker':

package/lib/VirtualTable/Table.js

@@ -114,11 +114,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
     });
     // 使用树形数据 hook
     var treeDataResult = (0, _useTreeData.useTreeData)({
-      data: toRef(props, 'dataSource'),
+      data: (0, _vue.toRef)(props, 'dataSource'),
       childrenColumnName: childrenColumnName.value,
       rowKey: rowKeyProp.value,
       defaultExpandedRowKeys: props.defaultExpandedRowKeys,
-      expandedRowKeys: props.expandedRowKeys ? toRef(props, 'expandedRowKeys') : undefined,
+      expandedRowKeys: props.expandedRowKeys ? (0, _vue.toRef)(props, 'expandedRowKeys') : undefined,
       defaultExpandAllRows: props.defaultExpandAllRows,
       onExpandedRowsChange: function onExpandedRowsChange(keys) {
         emit('expandedRowsChange', keys);
@@ -197,7 +197,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       removeScrollListener();
     });
     // 暴露方法
-    expose({
+    (0, _vue.defineExpose)({
       scrollTo: virtualScroll.scrollTo,
       scrollToIndex: virtualScroll.scrollToIndex,
       // 树形数据相关方法

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",