@jetlinks-web/components 3.3.6 → 3.3.8

package/es/Search/Item.js

@@ -28,7 +28,6 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "reactive": "setup-const",
   "watch": "setup-const",
   "isRef": "setup-const",
-  "nextTick": "setup-const",
   "Select": "setup-maybe-ref",
   "DatePicker": "setup-maybe-ref",
   "RangePicker": "setup-maybe-ref",
@@ -64,6 +63,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "handleColumnsOptions": "setup-const",
   "onTypeChange": "setup-const",
   "onColumnChange": "setup-const",
+  "normalizeTermsModelValue": "setup-const",
   "onTermTypeChange": "setup-const",
   "onValueChange": "setup-const",
   "handleTermsModelValue": "setup-const"
@@ -76,7 +76,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 { computed, ref, reactive, watch, isRef } from 'vue';
 import { Select, DatePicker, RangePicker } from 'ant-design-vue';
 import { componentProps, componentType, typeOptions } from "./setting";
 import { getTermOptions, getItemDefaultValue } from "./util";
@@ -139,9 +139,9 @@ const __sfc_main__ = _defineComponent({
         const btwKeys = computed(() => {
             const record = findItemByColumn();
             if (record.search.isBtw && Array.isArray(record.search.isBtw)) {
-                return [...record.search.isBtw, 'in', 'nin'];
+                return [...record.search.isBtw, 'in', 'nin', 'btw', 'nbtw'];
             }
-            return ['in', 'nin'];
+            return ['in', 'nin', 'btw', 'nbtw'];
         });
         const prefixCls = computed(() => 'JSearch');
         const [wrapSSR, hashId] = useSearchStyle(prefixCls);
@@ -196,17 +196,21 @@ const __sfc_main__ = _defineComponent({
             onTermTypeChange();
             onValueChange();
         };
-        const onTermTypeChange = () => {
+        const normalizeTermsModelValue = () => {
             const isBtw = btwKeys.value.includes(termsModel.termType);
-            if (!isBtw && termsModel.value && Array.isArray(termsModel.value)) {
-                termsModel.value = termsModel.value[0];
-                onValueChange();
+            if ([componentType.treeSelect, componentType.select].includes(targetComponents.value.type)) {
+                handleTermsModelValue(isBtw);
+                return;
             }
-            else if (isBtw && termsModel.value && !Array.isArray(termsModel.value)) {
-                termsModel.value = [termsModel.value];
-                onValueChange();
+            if (targetComponents.value.type === componentType.date) {
+                const isDateRange = ['btw', 'between'].includes(termsModel.termType);
+                termsModel.value = isDateRange ? [] : Array.isArray(termsModel.value) ? termsModel.value[0] : termsModel.value;
             }
+        };
+        const onTermTypeChange = () => {
+            normalizeTermsModelValue();
             emit('update:termType', termsModel.termType);
+            onValueChange();
         };
         const onValueChange = () => {
             emit('update:value', termsModel.value);
@@ -248,13 +252,12 @@ const __sfc_main__ = _defineComponent({
             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;
             }
+            normalizeTermsModelValue();
         }, { immediate: true, deep: true });
         watch(() => [termsModel.column, columnsMap.value], async () => {
             // 根据column从map中获取record，再解析search属性

package/es/style/styleRegister.js

@@ -1,16 +1,13 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { genComponentStyleHook } from 'ant-design-vue/es/theme/internal';
-import { theme } from 'ant-design-vue';
+import 'ant-design-vue';
 import variableToken from './variable';
 var genCompoentStyle = function genCompoentStyle(styleFn) {
-  return genComponentStyleHook('jetlinks-components', function (_token) {
-    var _theme$useToken = theme.useToken(),
-      token = _theme$useToken.token,
-      hashId = _theme$useToken.hashId;
+  return genComponentStyleHook('jetlinks-components', function (_token, info) {
     var componentToken = {
       token: _objectSpread(_objectSpread({}, _token), variableToken),
-      hashId: hashId.value,
+      hashId: info.hashId,
       componentCls: ".".concat(_token.prefixCls)
     };
     return _toConsumableArray(styleFn.map(function (item) {

package/lib/Search/Item.js

@@ -28,7 +28,6 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "reactive": "setup-const",
   "watch": "setup-const",
   "isRef": "setup-const",
-  "nextTick": "setup-const",
   "Select": "setup-maybe-ref",
   "DatePicker": "setup-maybe-ref",
   "RangePicker": "setup-maybe-ref",
@@ -64,6 +63,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "handleColumnsOptions": "setup-const",
   "onTypeChange": "setup-const",
   "onColumnChange": "setup-const",
+  "normalizeTermsModelValue": "setup-const",
   "onTermTypeChange": "setup-const",
   "onValueChange": "setup-const",
   "handleTermsModelValue": "setup-const"
@@ -76,7 +76,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 { computed, ref, reactive, watch, isRef } from 'vue';
 import { Select, DatePicker, RangePicker } from 'ant-design-vue';
 import { componentProps, componentType, typeOptions } from "./setting";
 import { getTermOptions, getItemDefaultValue } from "./util";
@@ -139,9 +139,9 @@ const __sfc_main__ = _defineComponent({
         const btwKeys = computed(() => {
             const record = findItemByColumn();
             if (record.search.isBtw && Array.isArray(record.search.isBtw)) {
-                return [...record.search.isBtw, 'in', 'nin'];
+                return [...record.search.isBtw, 'in', 'nin', 'btw', 'nbtw'];
             }
-            return ['in', 'nin'];
+            return ['in', 'nin', 'btw', 'nbtw'];
         });
         const prefixCls = computed(() => 'JSearch');
         const [wrapSSR, hashId] = useSearchStyle(prefixCls);
@@ -196,17 +196,21 @@ const __sfc_main__ = _defineComponent({
             onTermTypeChange();
             onValueChange();
         };
-        const onTermTypeChange = () => {
+        const normalizeTermsModelValue = () => {
             const isBtw = btwKeys.value.includes(termsModel.termType);
-            if (!isBtw && termsModel.value && Array.isArray(termsModel.value)) {
-                termsModel.value = termsModel.value[0];
-                onValueChange();
+            if ([componentType.treeSelect, componentType.select].includes(targetComponents.value.type)) {
+                handleTermsModelValue(isBtw);
+                return;
             }
-            else if (isBtw && termsModel.value && !Array.isArray(termsModel.value)) {
-                termsModel.value = [termsModel.value];
-                onValueChange();
+            if (targetComponents.value.type === componentType.date) {
+                const isDateRange = ['btw', 'between'].includes(termsModel.termType);
+                termsModel.value = isDateRange ? [] : Array.isArray(termsModel.value) ? termsModel.value[0] : termsModel.value;
             }
+        };
+        const onTermTypeChange = () => {
+            normalizeTermsModelValue();
             emit('update:termType', termsModel.termType);
+            onValueChange();
         };
         const onValueChange = () => {
             emit('update:value', termsModel.value);
@@ -248,13 +252,12 @@ const __sfc_main__ = _defineComponent({
             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;
             }
+            normalizeTermsModelValue();
         }, { immediate: true, deep: true });
         watch(() => [termsModel.column, columnsMap.value], async () => {
             // 根据column从map中获取record，再解析search属性

package/lib/style/styleRegister.js

@@ -8,16 +8,13 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _internal = require("ant-design-vue/es/theme/internal");
-var _antDesignVue = require("ant-design-vue");
+require("ant-design-vue");
 var _variable = _interopRequireDefault(require("./variable"));
 var genCompoentStyle = function genCompoentStyle(styleFn) {
-  return (0, _internal.genComponentStyleHook)('jetlinks-components', function (_token) {
-    var _theme$useToken = _antDesignVue.theme.useToken(),
-      token = _theme$useToken.token,
-      hashId = _theme$useToken.hashId;
+  return (0, _internal.genComponentStyleHook)('jetlinks-components', function (_token, info) {
     var componentToken = {
       token: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _token), _variable.default),
-      hashId: hashId.value,
+      hashId: info.hashId,
       componentCls: ".".concat(_token.prefixCls)
     };
     return (0, _toConsumableArray2.default)(styleFn.map(function (item) {

package/package.json

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