@jetlinks-web/components 3.3.5 → 3.3.7

package/es/ProLayout/SiderMenu/style.js

@@ -74,7 +74,7 @@ export var genSiderMenuStyle = function genSiderMenuStyle(config) {
     zIndex: 10,
     minHeight: '100%',
     boxShadow: '2px 0 6px rgba(0, 21, 41, 0.35)'
-  }), "".concat(token.antCls, "-layout-sider-children"), {
+  }), "".concat(token.antCls, "-layout-sider-children"), _defineProperty({
     display: 'flex',
     flexDirection: 'column',
     height: '100%',
@@ -93,7 +93,11 @@ export var genSiderMenuStyle = function genSiderMenuStyle(config) {
       borderRadius: '3px',
       boxShadow: 'inset 0 0 5px rgba(255, 255, 255, 0.05)'
     }
-  }), "&".concat(token.antCls, "-layout-sider-collapsed"), _defineProperty(_defineProperty({}, "".concat(token.antCls, "-menu-inline-collapsed"), {
+  }, "".concat(proLayoutSiderMenuCls, "-logo"), {
+    h1: {
+      color: '#333'
+    }
+  })), "&".concat(token.antCls, "-layout-sider-collapsed"), _defineProperty(_defineProperty({}, "".concat(token.antCls, "-menu-inline-collapsed"), {
     width: '48px'
   }), "".concat(proLayoutSiderMenuCls), _defineProperty({}, "".concat(proLayoutSiderMenuCls, "-logo"), {
     padding: '16px 24px'
@@ -132,7 +136,7 @@ export var genSiderMenuStyle = function genSiderMenuStyle(config) {
     borderRightColor: 'transparent'
   }), "".concat(proLayoutSiderMenuCls, "-collapsed-button"), {
     borderTop: "".concat(token.lineWidth, " solid ").concat(token.colorSplit)
-  })), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_$concat9, "".concat(proLayoutSiderMenuCls, "-icon"), {
+  })), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_$concat9, "".concat(proLayoutSiderMenuCls, "-icon"), {
     width: '14px',
     verticalAlign: 'baseline'
   }), "".concat(proLayoutSiderMenuCls, "-link"), _defineProperty({
@@ -149,11 +153,7 @@ export var genSiderMenuStyle = function genSiderMenuStyle(config) {
     lineHeight: 1
   }), '.drawer .drawer-content', {
     background: "#001529"
-  }), "".concat(token.antCls, "-layout-sider-children"), _defineProperty({}, "".concat(proLayoutSiderMenuCls, "-logo"), {
-    h1: {
-      color: '#333'
-    }
-  })))), "".concat(token.antCls, "-pro-menu-item"), _defineProperty({}, ".anticon".concat(token.antCls, "-pro-menu-item-title"), {
+  }))), "".concat(token.antCls, "-pro-menu-item"), _defineProperty({}, ".anticon".concat(token.antCls, "-pro-menu-item-title"), {
     marginLeft: '10px'
   })), '.sider-app-menus', {
     width: '100px',

package/es/ProTable/ProTable.js

@@ -297,7 +297,11 @@ const __sfc_main__ = _defineComponent({
             }
         };
         watch(() => props.params, (newValue) => {
-            _debounceFn(newValue || {});
+            _debounceFn({
+                ...(newValue || {}),
+                pageSize: page.pageSize || 12,
+                pageIndex: 0,
+            });
         }, { deep: true, immediate: true });
         watch(props.modeValue, (newValue) => {
             if (newValue) {

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/Search/style/search.js

@@ -10,7 +10,7 @@ export var genSearchStyle = function genSearchStyle(config) {
       flex: '1 1 auto',
       '.left': {
         minWidth: '380px',
-        maxWidth: '580px'
+        maxWidth: '610px'
       }
     }),
     '&.senior': _defineProperty({}, "> ".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({

package/lib/ProLayout/SiderMenu/style.js

@@ -81,7 +81,7 @@ var genSiderMenuStyle = exports.genSiderMenuStyle = function genSiderMenuStyle(c
     zIndex: 10,
     minHeight: '100%',
     boxShadow: '2px 0 6px rgba(0, 21, 41, 0.35)'
-  }), "".concat(token.antCls, "-layout-sider-children"), {
+  }), "".concat(token.antCls, "-layout-sider-children"), (0, _defineProperty2.default)({
     display: 'flex',
     flexDirection: 'column',
     height: '100%',
@@ -100,7 +100,11 @@ var genSiderMenuStyle = exports.genSiderMenuStyle = function genSiderMenuStyle(c
       borderRadius: '3px',
       boxShadow: 'inset 0 0 5px rgba(255, 255, 255, 0.05)'
     }
-  }), "&".concat(token.antCls, "-layout-sider-collapsed"), (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(token.antCls, "-menu-inline-collapsed"), {
+  }, "".concat(proLayoutSiderMenuCls, "-logo"), {
+    h1: {
+      color: '#333'
+    }
+  })), "&".concat(token.antCls, "-layout-sider-collapsed"), (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(token.antCls, "-menu-inline-collapsed"), {
     width: '48px'
   }), "".concat(proLayoutSiderMenuCls), (0, _defineProperty2.default)({}, "".concat(proLayoutSiderMenuCls, "-logo"), {
     padding: '16px 24px'
@@ -139,7 +143,7 @@ var genSiderMenuStyle = exports.genSiderMenuStyle = function genSiderMenuStyle(c
     borderRightColor: 'transparent'
   }), "".concat(proLayoutSiderMenuCls, "-collapsed-button"), {
     borderTop: "".concat(token.lineWidth, " solid ").concat(token.colorSplit)
-  })), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_$concat9, "".concat(proLayoutSiderMenuCls, "-icon"), {
+  })), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_$concat9, "".concat(proLayoutSiderMenuCls, "-icon"), {
     width: '14px',
     verticalAlign: 'baseline'
   }), "".concat(proLayoutSiderMenuCls, "-link"), (0, _defineProperty2.default)({
@@ -156,11 +160,7 @@ var genSiderMenuStyle = exports.genSiderMenuStyle = function genSiderMenuStyle(c
     lineHeight: 1
   }), '.drawer .drawer-content', {
     background: "#001529"
-  }), "".concat(token.antCls, "-layout-sider-children"), (0, _defineProperty2.default)({}, "".concat(proLayoutSiderMenuCls, "-logo"), {
-    h1: {
-      color: '#333'
-    }
-  })))), "".concat(token.antCls, "-pro-menu-item"), (0, _defineProperty2.default)({}, ".anticon".concat(token.antCls, "-pro-menu-item-title"), {
+  }))), "".concat(token.antCls, "-pro-menu-item"), (0, _defineProperty2.default)({}, ".anticon".concat(token.antCls, "-pro-menu-item-title"), {
     marginLeft: '10px'
   })), '.sider-app-menus', {
     width: '100px',

package/lib/ProTable/ProTable.js

@@ -297,7 +297,11 @@ const __sfc_main__ = _defineComponent({
             }
         };
         watch(() => props.params, (newValue) => {
-            _debounceFn(newValue || {});
+            _debounceFn({
+                ...(newValue || {}),
+                pageSize: page.pageSize || 12,
+                pageIndex: 0,
+            });
         }, { deep: true, immediate: true });
         watch(props.modeValue, (newValue) => {
             if (newValue) {

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/Search/style/search.js

@@ -17,7 +17,7 @@ var genSearchStyle = exports.genSearchStyle = function genSearchStyle(config) {
       flex: '1 1 auto',
       '.left': {
         minWidth: '380px',
-        maxWidth: '580px'
+        maxWidth: '610px'
       }
     }),
     '&.senior': (0, _defineProperty2.default)({}, "> ".concat(componentCls, "-content"), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "3.3.5",
+  "version": "3.3.7",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -155,8 +155,8 @@
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
     "@jetlinks-web/constants": "^1.0.9",
-    "@jetlinks-web/utils": "^1.3.3",
-    "@jetlinks-web/hooks": "^1.1.2"
+    "@jetlinks-web/hooks": "^1.1.2",
+    "@jetlinks-web/utils": "^1.3.3"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",