@jetlinks-web/components 2.4.11 → 2.4.13

package/es/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058145743"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098504716"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/es/FullPage/FullPage.js

@@ -9,7 +9,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058146991"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098505186"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/es/ProTable/ProTable.js

@@ -149,14 +149,6 @@ const __sfc_main__ = _defineComponent({
             }
         };
         const _debounceFn = debounce(handleSearch, 300);
-        watch(() => props.params, (newValue) => {
-            _debounceFn(newValue || {});
-        }, { deep: true, immediate: true });
-        watch(() => props.dataSource, (newVal) => {
-            if (newVal && !props.request) {
-                handleSearch(props.params);
-            }
-        }, { deep: true, immediate: true });
         const onPageChange = (_page, size) => {
             handleSearch({
                 ...props.params,
@@ -218,6 +210,14 @@ const __sfc_main__ = _defineComponent({
                 }
             }
         };
+        watch(() => props.params, (newValue) => {
+            _debounceFn(newValue || {});
+        }, { deep: true, immediate: true });
+        watch(() => props.dataSource, (newVal) => {
+            if (newVal && !props.request) {
+                handleSearch(props.params);
+            }
+        }, { deep: true, immediate: true });
         onMounted(() => {
             windowChange(); // 初始化
             window.onresize = () => {

package/es/ProTable/setting.js

@@ -3,6 +3,7 @@ import { tableProps } from "ant-design-vue/es/table/Table";
 import "vue";
 import "ant-design-vue/es/table";
 import { paginationProps } from 'ant-design-vue/es/pagination/Pagination';
+import { omit } from 'lodash-es';
 export var _headerProps = {
   mode: {
     type: [String, undefined],
@@ -57,7 +58,7 @@ export var _contentProps = _objectSpread(_objectSpread(_objectSpread({}, tablePr
     default: 'id'
   }
 });
-export var _paginationProps = _objectSpread(_objectSpread({}, paginationProps()), {}, {
+export var _paginationProps = _objectSpread(_objectSpread({}, omit(paginationProps(), ['onChange'])), {}, {
   total: {
     type: Number,
     default: 0

package/es/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058148932"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506101"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/es/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058149795"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506939"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Advanced/index.js

@@ -25,6 +25,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "deleteKey": "props",
   "routerMode": "props",
   "style": "props",
+  "defaultValues": "props",
   "SearchItem": "setup-const",
   "optionsMapKey": "setup-maybe-ref",
   "typeOptions": "setup-maybe-ref",
@@ -42,6 +43,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "handleQData": "setup-maybe-ref",
   "hasExpand": "setup-maybe-ref",
   "termsParamsFormat": "setup-maybe-ref",
+  "termsToValue": "setup-maybe-ref",
   "Select": "setup-maybe-ref",
   "Button": "setup-maybe-ref",
   "Form": "setup-maybe-ref",
@@ -59,6 +61,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "compatible": "setup-ref",
   "screenSize": "setup-ref",
   "resetNumber": "setup-ref",
+  "isFirstHandleDefaultValues": "setup-let",
   "searchItems": "setup-ref",
   "termsData": "setup-reactive-const",
   "columnOptionMap": "setup-ref",
@@ -71,6 +74,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "reset": "setup-const",
   "historyItemClick": "setup-const",
   "handleUrlParams": "setup-const",
+  "handleDefaultValues": "setup-const",
   "handleItems": "setup-const"
 } */
 import { defineComponent as _defineComponent } from 'vue';
@@ -100,7 +104,7 @@ import { useRouteQuery } from '@vueuse/router';
 import { ref, reactive, watch, provide } from 'vue';
 import SaveHistory from './SaveHistory.js';
 import History from './History.js';
-import { compatibleOldTerms, getTermTypeFn, handleQData, hasExpand, termsParamsFormat, } from '../util';
+import { compatibleOldTerms, getTermTypeFn, handleQData, hasExpand, termsParamsFormat, termsToValue, } from '../util';
 import { Select, Button, Form, FormItemRest } from 'ant-design-vue';
 import { AIcon } from '../../../';
 import { cloneDeep } from 'lodash-es';
@@ -151,9 +155,13 @@ const __sfc_main__ = _defineComponent({
             type: [String, Object],
             default: undefined,
         },
+        defaultValues: {
+            type: Object,
+            default: undefined,
+        }
     },
     emits: ["search"],
-    setup(__props, { emit: __emit }) {
+    setup(__props, { expose: __expose, emit: __emit }) {
         const props = __props;
         const searchRef = ref(null);
         const searchRefContentRef = ref(null);
@@ -169,6 +177,7 @@ const __sfc_main__ = _defineComponent({
         // 当前组件宽度 true 大于1000
         const screenSize = ref(true);
         const resetNumber = ref(1);
+        let isFirstHandleDefaultValues = false;
         const searchItems = ref([]); // 当前查询条件
         const termsData = reactive({
             terms: [
@@ -232,18 +241,6 @@ const __sfc_main__ = _defineComponent({
             resetNumber.value += 1;
             emit('search', { terms: [] });
         };
-        watch(width, (value) => {
-            if (value < 1000) {
-                layout.value = 'vertical';
-                screenSize.value = false;
-                compatible.value = value < 760;
-            }
-            else {
-                layout.value = 'horizontal';
-                screenSize.value = true;
-                compatible.value = false;
-            }
-        }, { immediate: true });
         const historyItemClick = (content) => {
             try {
                 termsData.terms = _optionalChain([handleQData, 'call', _2 => _2(compatibleOldTerms(content)), 'optionalAccess', _3 => _3.terms]) || [];
@@ -267,6 +264,20 @@ const __sfc_main__ = _defineComponent({
                 emit('search', termsParamsFormat(termsData, columnOptionMap.value));
             }
         };
+        /**
+         * 处理传入的默认值
+         */
+        const handleDefaultValues = () => {
+            const defaultValues = props.defaultValues.terms.map((a) => {
+                a.terms.map((b) => {
+                    return termsToValue(b, searchItems.value);
+                });
+                return a;
+            });
+            termsData.terms = _optionalChain([handleQData, 'call', _6 => _6(compatibleOldTerms(JSON.stringify({ terms: defaultValues }))), 'optionalAccess', _7 => _7.terms]) || [];
+            expand.value = hasExpand(termsData.terms);
+            emit('search', termsParamsFormat(termsData, columnOptionMap.value));
+        };
         /**
          * 处理每项的key为Item组件所需要的key
          */
@@ -309,7 +320,13 @@ const __sfc_main__ = _defineComponent({
                 }
             });
             submitData();
-            handleUrlParams({ q: q.value, target: target.value });
+            if (props.defaultValues && !isFirstHandleDefaultValues) {
+                handleDefaultValues();
+                isFirstHandleDefaultValues = true;
+            }
+            else {
+                handleUrlParams({ q: q.value, target: target.value });
+            }
         };
         watch(() => props.columns, () => {
             termsData.terms = [
@@ -325,7 +342,22 @@ const __sfc_main__ = _defineComponent({
         }, {
             deep: true,
         });
+        watch(width, (value) => {
+            if (value < 1000) {
+                layout.value = 'vertical';
+                screenSize.value = false;
+                compatible.value = value < 760;
+            }
+            else {
+                layout.value = 'horizontal';
+                screenSize.value = true;
+                compatible.value = false;
+            }
+        }, { immediate: true });
         handleItems();
+        __expose({
+            setValues: handleDefaultValues,
+        });
         return (_ctx, _cache) => {
             return (_openBlock(), _createBlock(_unref(Form), {
                 model: termsData,

package/es/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058149050"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506445"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,
@@ -155,6 +155,7 @@ const __sfc_main__ = _defineComponent({
          * @param column {}
          * @param options {}
          * @param defaultTermType {}
+         * @param termFilter {}
          */
         const getTermType = (type, column, options, defaultTermType, termFilter) => {
             termTypeOptions.option = _optionalChain([options, 'optionalAccess', _10 => _10.length])

package/es/Search/Search.js

@@ -43,7 +43,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058149145"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506529"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/es/Search/util.js

@@ -153,6 +153,7 @@ export var compatibleOldTerms = function compatibleOldTerms(q) {
       terms: _terms
     };
   } catch (e) {
+    console.warn('[Pro Search Error] > ', e);
     return {
       terms: _terms
     };
@@ -231,4 +232,25 @@ export var getTermOptions = function getTermOptions(type, column) {
       break;
   }
   return keys.length ? getTermTypes(keys) : termType;
+};
+export var termsToValue = function termsToValue(targetItem, searchItems) {
+  if (['like', 'nlike'].includes(targetItem.termType) && !!targetItem.value) {
+    if (targetItem.value.startsWith('%') && targetItem.value.endsWith('%')) {
+      targetItem.value = targetItem.value.slice(1, -1);
+    }
+  }
+  // 处理重命名
+  var searchItem = searchItems.filter(function (item) {
+    return item.rename;
+  }).find(function (item) {
+    if (item.rename === targetItem.column) {
+      targetItem.column = item.column;
+      return true;
+    }
+    return item.column === targetItem.column;
+  });
+  if (!targetItem.termType) {
+    targetItem.termType = getTermTypeFn(searchItem.type);
+  }
+  return targetItem;
 };

package/lib/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058145684"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098504693"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/lib/FullPage/FullPage.js

@@ -9,7 +9,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058146976"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098505192"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/lib/ProTable/ProTable.js

@@ -149,14 +149,6 @@ const __sfc_main__ = _defineComponent({
             }
         };
         const _debounceFn = debounce(handleSearch, 300);
-        watch(() => props.params, (newValue) => {
-            _debounceFn(newValue || {});
-        }, { deep: true, immediate: true });
-        watch(() => props.dataSource, (newVal) => {
-            if (newVal && !props.request) {
-                handleSearch(props.params);
-            }
-        }, { deep: true, immediate: true });
         const onPageChange = (_page, size) => {
             handleSearch({
                 ...props.params,
@@ -218,6 +210,14 @@ const __sfc_main__ = _defineComponent({
                 }
             }
         };
+        watch(() => props.params, (newValue) => {
+            _debounceFn(newValue || {});
+        }, { deep: true, immediate: true });
+        watch(() => props.dataSource, (newVal) => {
+            if (newVal && !props.request) {
+                handleSearch(props.params);
+            }
+        }, { deep: true, immediate: true });
         onMounted(() => {
             windowChange(); // 初始化
             window.onresize = () => {

package/lib/ProTable/setting.js

@@ -10,6 +10,7 @@ var _Table = require("ant-design-vue/es/table/Table");
 require("vue");
 require("ant-design-vue/es/table");
 var _Pagination = require("ant-design-vue/es/pagination/Pagination");
+var _lodashEs = require("lodash");
 var _headerProps = exports._headerProps = {
   mode: {
     type: [String, undefined],
@@ -64,7 +65,7 @@ var _contentProps = exports._contentProps = (0, _objectSpread2.default)((0, _obj
     default: 'id'
   }
 });
-var _paginationProps = exports._paginationProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _Pagination.paginationProps)()), {}, {
+var _paginationProps = exports._paginationProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodashEs.omit)((0, _Pagination.paginationProps)(), ['onChange'])), {}, {
   total: {
     type: Number,
     default: 0

package/lib/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058148922"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506110"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/lib/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058149772"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506926"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Advanced/index.js

@@ -25,6 +25,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "deleteKey": "props",
   "routerMode": "props",
   "style": "props",
+  "defaultValues": "props",
   "SearchItem": "setup-const",
   "optionsMapKey": "setup-maybe-ref",
   "typeOptions": "setup-maybe-ref",
@@ -42,6 +43,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "handleQData": "setup-maybe-ref",
   "hasExpand": "setup-maybe-ref",
   "termsParamsFormat": "setup-maybe-ref",
+  "termsToValue": "setup-maybe-ref",
   "Select": "setup-maybe-ref",
   "Button": "setup-maybe-ref",
   "Form": "setup-maybe-ref",
@@ -59,6 +61,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "compatible": "setup-ref",
   "screenSize": "setup-ref",
   "resetNumber": "setup-ref",
+  "isFirstHandleDefaultValues": "setup-let",
   "searchItems": "setup-ref",
   "termsData": "setup-reactive-const",
   "columnOptionMap": "setup-ref",
@@ -71,6 +74,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "reset": "setup-const",
   "historyItemClick": "setup-const",
   "handleUrlParams": "setup-const",
+  "handleDefaultValues": "setup-const",
   "handleItems": "setup-const"
 } */
 import { defineComponent as _defineComponent } from 'vue';
@@ -100,7 +104,7 @@ import { useRouteQuery } from '@vueuse/router';
 import { ref, reactive, watch, provide } from 'vue';
 import SaveHistory from './SaveHistory.js';
 import History from './History.js';
-import { compatibleOldTerms, getTermTypeFn, handleQData, hasExpand, termsParamsFormat, } from '../util';
+import { compatibleOldTerms, getTermTypeFn, handleQData, hasExpand, termsParamsFormat, termsToValue, } from '../util';
 import { Select, Button, Form, FormItemRest } from 'ant-design-vue';
 import { AIcon } from '../../../';
 import { cloneDeep } from 'lodash-es';
@@ -151,9 +155,13 @@ const __sfc_main__ = _defineComponent({
             type: [String, Object],
             default: undefined,
         },
+        defaultValues: {
+            type: Object,
+            default: undefined,
+        }
     },
     emits: ["search"],
-    setup(__props, { emit: __emit }) {
+    setup(__props, { expose: __expose, emit: __emit }) {
         const props = __props;
         const searchRef = ref(null);
         const searchRefContentRef = ref(null);
@@ -169,6 +177,7 @@ const __sfc_main__ = _defineComponent({
         // 当前组件宽度 true 大于1000
         const screenSize = ref(true);
         const resetNumber = ref(1);
+        let isFirstHandleDefaultValues = false;
         const searchItems = ref([]); // 当前查询条件
         const termsData = reactive({
             terms: [
@@ -232,18 +241,6 @@ const __sfc_main__ = _defineComponent({
             resetNumber.value += 1;
             emit('search', { terms: [] });
         };
-        watch(width, (value) => {
-            if (value < 1000) {
-                layout.value = 'vertical';
-                screenSize.value = false;
-                compatible.value = value < 760;
-            }
-            else {
-                layout.value = 'horizontal';
-                screenSize.value = true;
-                compatible.value = false;
-            }
-        }, { immediate: true });
         const historyItemClick = (content) => {
             try {
                 termsData.terms = _optionalChain([handleQData, 'call', _2 => _2(compatibleOldTerms(content)), 'optionalAccess', _3 => _3.terms]) || [];
@@ -267,6 +264,20 @@ const __sfc_main__ = _defineComponent({
                 emit('search', termsParamsFormat(termsData, columnOptionMap.value));
             }
         };
+        /**
+         * 处理传入的默认值
+         */
+        const handleDefaultValues = () => {
+            const defaultValues = props.defaultValues.terms.map((a) => {
+                a.terms.map((b) => {
+                    return termsToValue(b, searchItems.value);
+                });
+                return a;
+            });
+            termsData.terms = _optionalChain([handleQData, 'call', _6 => _6(compatibleOldTerms(JSON.stringify({ terms: defaultValues }))), 'optionalAccess', _7 => _7.terms]) || [];
+            expand.value = hasExpand(termsData.terms);
+            emit('search', termsParamsFormat(termsData, columnOptionMap.value));
+        };
         /**
          * 处理每项的key为Item组件所需要的key
          */
@@ -309,7 +320,13 @@ const __sfc_main__ = _defineComponent({
                 }
             });
             submitData();
-            handleUrlParams({ q: q.value, target: target.value });
+            if (props.defaultValues && !isFirstHandleDefaultValues) {
+                handleDefaultValues();
+                isFirstHandleDefaultValues = true;
+            }
+            else {
+                handleUrlParams({ q: q.value, target: target.value });
+            }
         };
         watch(() => props.columns, () => {
             termsData.terms = [
@@ -325,7 +342,22 @@ const __sfc_main__ = _defineComponent({
         }, {
             deep: true,
         });
+        watch(width, (value) => {
+            if (value < 1000) {
+                layout.value = 'vertical';
+                screenSize.value = false;
+                compatible.value = value < 760;
+            }
+            else {
+                layout.value = 'horizontal';
+                screenSize.value = true;
+                compatible.value = false;
+            }
+        }, { immediate: true });
         handleItems();
+        __expose({
+            setValues: handleDefaultValues,
+        });
         return (_ctx, _cache) => {
             return (_openBlock(), _createBlock(_unref(Form), {
                 model: termsData,

package/lib/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058148966"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506396"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,
@@ -155,6 +155,7 @@ const __sfc_main__ = _defineComponent({
          * @param column {}
          * @param options {}
          * @param defaultTermType {}
+         * @param termFilter {}
          */
         const getTermType = (type, column, options, defaultTermType, termFilter) => {
             termTypeOptions.option = _optionalChain([options, 'optionalAccess', _10 => _10.length])

package/lib/Search/Search.js

@@ -43,7 +43,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1734058149125"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1735098506509"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/lib/Search/util.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termsParamsFormat = exports.hasExpand = exports.handleQData = exports.handleParamsToString = exports.handleLikeValue = exports.getTermTypes = exports.getTermTypeFn = exports.getTermOptions = exports.filterTreeSelectNode = exports.filterSelectNode = exports.compatibleOldTerms = void 0;
+exports.termsToValue = exports.termsParamsFormat = exports.hasExpand = exports.handleQData = exports.handleParamsToString = exports.handleLikeValue = exports.getTermTypes = exports.getTermTypeFn = exports.getTermOptions = exports.filterTreeSelectNode = exports.filterSelectNode = exports.compatibleOldTerms = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _lodashEs = require("lodash");
@@ -160,6 +160,7 @@ var compatibleOldTerms = exports.compatibleOldTerms = function compatibleOldTerm
       terms: _terms
     };
   } catch (e) {
+    console.warn('[Pro Search Error] > ', e);
     return {
       terms: _terms
     };
@@ -238,4 +239,25 @@ var getTermOptions = exports.getTermOptions = function getTermOptions(type, colu
       break;
   }
   return keys.length ? getTermTypes(keys) : _setting.termType;
+};
+var termsToValue = exports.termsToValue = function termsToValue(targetItem, searchItems) {
+  if (['like', 'nlike'].includes(targetItem.termType) && !!targetItem.value) {
+    if (targetItem.value.startsWith('%') && targetItem.value.endsWith('%')) {
+      targetItem.value = targetItem.value.slice(1, -1);
+    }
+  }
+  // 处理重命名
+  var searchItem = searchItems.filter(function (item) {
+    return item.rename;
+  }).find(function (item) {
+    if (item.rename === targetItem.column) {
+      targetItem.column = item.column;
+      return true;
+    }
+    return item.column === targetItem.column;
+  });
+  if (!targetItem.termType) {
+    targetItem.termType = getTermTypeFn(searchItem.type);
+  }
+  return targetItem;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.4.11",
+  "version": "2.4.13",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -19,7 +19,7 @@
     "@ant-design/icons-vue": "^7.0.1",
     "@vuemap/vue-amap": "^2.0.17",
     "@vueuse/core": "^10.2.1",
-    "@vueuse/router": "^10.9.0",
+    "@vueuse/router": "^12.1.0",
     "async-validator": "^4.2.5",
     "echarts": "^5.4.3",
     "markdown-it": "^14.1.0",
@@ -152,8 +152,8 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
-    "@jetlinks-web/constants": "^1.0.7",
     "@jetlinks-web/hooks": "^1.0.20",
+    "@jetlinks-web/constants": "^1.0.7",
     "@jetlinks-web/utils": "^1.2.5"
   },
   "publishConfig": {