@jetlinks-web/components 3.1.4 → 3.1.6

package/es/Search/Advanced/index.js

@@ -19,6 +19,7 @@
   "useAttrs": "setup-const",
   "inject": "setup-const",
   "computed": "setup-const",
+  "toRefs": "setup-const",
   "SaveHistory": "setup-const",
   "History": "setup-const",
   "compatibleOldTerms": "setup-maybe-ref",
@@ -59,7 +60,6 @@
   "reset": "setup-const",
   "historyItemClick": "setup-const",
   "handleUrlParams": "setup-const",
-  "completeTerms": "setup-const",
   "handleDefaultValues": "setup-const",
   "clearValue": "setup-const"
 } */
@@ -86,13 +86,13 @@ const _hoisted_12 = { class: "JSearch-footer--btns" };
 import SearchItem from '../Item.js';
 import { typeOptions } from '../setting';
 import { useHandleColumns, useOptionMapContent, useRouteQuery } from '../hooks';
-import { ref, reactive, watch, useAttrs, inject, computed } from 'vue';
+import { ref, reactive, watch, useAttrs, inject, computed, } from 'vue';
 import SaveHistory from './SaveHistory.js';
 import History from './History.js';
 import { compatibleOldTerms, getItemDefaultValue, termsParamsFormat, } from '../util';
 import { Select, Button, Form, FormItemRest } from 'ant-design-vue';
-import { AIcon } from '../../../';
-import { useLocaleReceiver } from "../../LocaleReciver/index";
+import { AIcon } from '../../components';
+import { useLocaleReceiver } from "../../LocaleReciver";
 import { SearchConfig } from "../../utils/constants";
 import { isObject } from "lodash-es";
 import useSearchStyle from '../style';
@@ -154,7 +154,7 @@ const __sfc_main__ = _defineComponent({
         const attrs = useAttrs();
         const q = useRouteQuery('q');
         const target = useRouteQuery('target');
-        const { initValues, columnsMap, defaultCacheValues } = useHandleColumns({ ...props, mode: 'advanced' }, terms);
+        const { initValues, columnsMap, defaultCacheValues } = useHandleColumns(props, terms, { mode: 'advanced' });
         useOptionMapContent(columnsOptionMap);
         const expandChange = () => {
             expand.value = !expand.value;
@@ -228,30 +228,6 @@ const __sfc_main__ = _defineComponent({
                 historyItemClick(params);
             }
         };
-        /**
-         * 递归补全 terms 数组
-         * @param data 原始 terms 对象
-         * @param callback 补全函数，返回一个 term 对象
-         */
-        function completeTerms(data, callback) {
-            const fillTerms = (terms) => {
-                const completed = terms.map(term => {
-                    if (Array.isArray(term.terms)) {
-                        // 递归补全子 terms
-                        term.terms = fillTerms(term.terms);
-                    }
-                    return term;
-                });
-                // 补足到长度为 3
-                while (completed.length < 3) {
-                    completed.push(callback());
-                }
-                return completed;
-            };
-            return {
-                terms: fillTerms(data.terms),
-            };
-        }
         /**
          * 处理传入的默认值
          */

package/es/Search/Item.js

@@ -50,6 +50,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "columnsValues": "setup-maybe-ref",
   "targetComponents": "setup-ref",
   "valueOptions": "setup-ref",
+  "btwKeys": "setup-const",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
   "hashId": "setup-maybe-ref",
@@ -131,6 +132,7 @@ const __sfc_main__ = _defineComponent({
         const columnsValues = useDefaultValue();
         const targetComponents = ref({});
         const valueOptions = ref();
+        const btwKeys = ['in', 'nin'];
         const prefixCls = computed(() => 'JSearch');
         const [wrapSSR, hashId] = useSearchStyle(prefixCls);
         const termTypeOptions = computed(() => {
@@ -185,29 +187,40 @@ const __sfc_main__ = _defineComponent({
             onValueChange();
         };
         const onTermTypeChange = () => {
+            const isBtw = btwKeys.includes(termsModel.termType);
+            if (!isBtw && Array.isArray(termsModel.value)) {
+                termsModel.value = termsModel.value[0];
+                onValueChange();
+            }
+            else if (isBtw && !Array.isArray(termsModel.value)) {
+                termsModel.value = [termsModel.value];
+                onValueChange();
+            }
             emit('update:termType', termsModel.termType);
         };
         const onValueChange = () => {
             emit('update:value', termsModel.value);
         };
         watch(() => termsModel.termType, () => {
-            const isBtw = ['in', 'nin'].includes(termsModel.termType);
+            const isBtw = btwKeys.includes(termsModel.termType);
             if (targetComponents.value.type === componentType.treeSelect) {
                 targetComponents.value.props = {
-                    multiple: isBtw,
                     ...targetComponents.value.props,
+                    multiple: isBtw,
                 };
             }
             else if (targetComponents.value.type === componentType.select) {
                 targetComponents.value.props = {
-                    mode: isBtw ? 'multiple' : 'combobox',
                     ...targetComponents.value.props,
+                    mode: isBtw ? 'multiple' : 'combobox',
                 };
             }
         }, { immediate: true });
-        watch(() => termsModel.column, async () => {
+        watch(() => [termsModel.column, columnsMap.value], async () => {
             // 根据column从map中获取record，再解析search属性
             const record = findItemByColumn();
+            if (!record)
+                return;
             const options = findOptionsByColumn();
             targetComponents.value = componentProps(record.search);
             targetComponents.value.label = record.title;
@@ -218,7 +231,7 @@ const __sfc_main__ = _defineComponent({
             else {
                 await handleColumnsOptions(record.search.options);
             }
-        }, { immediate: true });
+        }, { immediate: true, deep: true });
         watch(() => [props.value, props.termType, props.column, props.type], () => {
             termsModel.value = props.value;
             termsModel.termType = props.termType;

package/es/Search/hooks/index.js

@@ -24,7 +24,7 @@ export var useColumnsMap = function useColumnsMap() {
 export var useDefaultValue = function useDefaultValue() {
   return inject(columnsValues);
 };
-export var useHandleColumns = function useHandleColumns(props, terms) {
+export var useHandleColumns = function useHandleColumns(props, terms, options) {
   var columnsMap = ref({}); // 存储每个column
   var defaultCacheValues = ref({});
   useColumnsMapContent(columnsMap);
@@ -72,7 +72,8 @@ export var useHandleColumns = function useHandleColumns(props, terms) {
   };
   var initValues = function initValues() {
     var arr = Object.values(columnsMap.value);
-    if (props.mode === 'advanced') {
+    if (!arr.length) return;
+    if (options.mode === 'advanced') {
       //  设置第一位
       terms.terms = [getItemDefaultValue(arr[0], defaultCacheValues.value)];
     } else {

package/es/Search/setting.js

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { TreeSelect, Select, Input, InputNumber, DatePicker, TimePicker, InputPassword, RangePicker, TimeRangePicker } from 'ant-design-vue';
 import { filterSelectNode, filterTreeSelectNode } from "./util";
@@ -108,7 +107,7 @@ export var termType = function termType(locale) {
 };
 export var componentType = {
   input: 'input',
-  inputNumber: 'inputNumber',
+  inputNumber: 'number',
   password: 'password',
   switch: 'switch',
   radio: 'radio',
@@ -183,7 +182,7 @@ export var componentProps = function componentProps(record) {
       return {
         type: type,
         name: TreeSelect,
-        props: _objectSpread(_defineProperty({
+        props: _objectSpread({
           showSearch: true,
           height: 350,
           fieldNames: {
@@ -193,9 +192,7 @@ export var componentProps = function componentProps(record) {
           filterTreeNode: function filterTreeNode(v, option) {
             return filterTreeSelectNode(v, option);
           }
-        }, "filterTreeNode", function filterTreeNode(v, option) {
-          return filterTreeSelectNode(v, option);
-        }), _props)
+        }, _props)
       };
     case componentType.select:
       return {

package/lib/Search/Advanced/index.js

@@ -19,6 +19,7 @@
   "useAttrs": "setup-const",
   "inject": "setup-const",
   "computed": "setup-const",
+  "toRefs": "setup-const",
   "SaveHistory": "setup-const",
   "History": "setup-const",
   "compatibleOldTerms": "setup-maybe-ref",
@@ -59,7 +60,6 @@
   "reset": "setup-const",
   "historyItemClick": "setup-const",
   "handleUrlParams": "setup-const",
-  "completeTerms": "setup-const",
   "handleDefaultValues": "setup-const",
   "clearValue": "setup-const"
 } */
@@ -86,13 +86,13 @@ const _hoisted_12 = { class: "JSearch-footer--btns" };
 import SearchItem from '../Item.js';
 import { typeOptions } from '../setting';
 import { useHandleColumns, useOptionMapContent, useRouteQuery } from '../hooks';
-import { ref, reactive, watch, useAttrs, inject, computed } from 'vue';
+import { ref, reactive, watch, useAttrs, inject, computed, } from 'vue';
 import SaveHistory from './SaveHistory.js';
 import History from './History.js';
 import { compatibleOldTerms, getItemDefaultValue, termsParamsFormat, } from '../util';
 import { Select, Button, Form, FormItemRest } from 'ant-design-vue';
-import { AIcon } from '../../../';
-import { useLocaleReceiver } from "../../LocaleReciver/index";
+import { AIcon } from '../../components';
+import { useLocaleReceiver } from "../../LocaleReciver";
 import { SearchConfig } from "../../utils/constants";
 import { isObject } from "lodash-es";
 import useSearchStyle from '../style';
@@ -154,7 +154,7 @@ const __sfc_main__ = _defineComponent({
         const attrs = useAttrs();
         const q = useRouteQuery('q');
         const target = useRouteQuery('target');
-        const { initValues, columnsMap, defaultCacheValues } = useHandleColumns({ ...props, mode: 'advanced' }, terms);
+        const { initValues, columnsMap, defaultCacheValues } = useHandleColumns(props, terms, { mode: 'advanced' });
         useOptionMapContent(columnsOptionMap);
         const expandChange = () => {
             expand.value = !expand.value;
@@ -228,30 +228,6 @@ const __sfc_main__ = _defineComponent({
                 historyItemClick(params);
             }
         };
-        /**
-         * 递归补全 terms 数组
-         * @param data 原始 terms 对象
-         * @param callback 补全函数，返回一个 term 对象
-         */
-        function completeTerms(data, callback) {
-            const fillTerms = (terms) => {
-                const completed = terms.map(term => {
-                    if (Array.isArray(term.terms)) {
-                        // 递归补全子 terms
-                        term.terms = fillTerms(term.terms);
-                    }
-                    return term;
-                });
-                // 补足到长度为 3
-                while (completed.length < 3) {
-                    completed.push(callback());
-                }
-                return completed;
-            };
-            return {
-                terms: fillTerms(data.terms),
-            };
-        }
         /**
          * 处理传入的默认值
          */

package/lib/Search/Item.js

@@ -50,6 +50,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "columnsValues": "setup-maybe-ref",
   "targetComponents": "setup-ref",
   "valueOptions": "setup-ref",
+  "btwKeys": "setup-const",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
   "hashId": "setup-maybe-ref",
@@ -131,6 +132,7 @@ const __sfc_main__ = _defineComponent({
         const columnsValues = useDefaultValue();
         const targetComponents = ref({});
         const valueOptions = ref();
+        const btwKeys = ['in', 'nin'];
         const prefixCls = computed(() => 'JSearch');
         const [wrapSSR, hashId] = useSearchStyle(prefixCls);
         const termTypeOptions = computed(() => {
@@ -185,29 +187,40 @@ const __sfc_main__ = _defineComponent({
             onValueChange();
         };
         const onTermTypeChange = () => {
+            const isBtw = btwKeys.includes(termsModel.termType);
+            if (!isBtw && Array.isArray(termsModel.value)) {
+                termsModel.value = termsModel.value[0];
+                onValueChange();
+            }
+            else if (isBtw && !Array.isArray(termsModel.value)) {
+                termsModel.value = [termsModel.value];
+                onValueChange();
+            }
             emit('update:termType', termsModel.termType);
         };
         const onValueChange = () => {
             emit('update:value', termsModel.value);
         };
         watch(() => termsModel.termType, () => {
-            const isBtw = ['in', 'nin'].includes(termsModel.termType);
+            const isBtw = btwKeys.includes(termsModel.termType);
             if (targetComponents.value.type === componentType.treeSelect) {
                 targetComponents.value.props = {
-                    multiple: isBtw,
                     ...targetComponents.value.props,
+                    multiple: isBtw,
                 };
             }
             else if (targetComponents.value.type === componentType.select) {
                 targetComponents.value.props = {
-                    mode: isBtw ? 'multiple' : 'combobox',
                     ...targetComponents.value.props,
+                    mode: isBtw ? 'multiple' : 'combobox',
                 };
             }
         }, { immediate: true });
-        watch(() => termsModel.column, async () => {
+        watch(() => [termsModel.column, columnsMap.value], async () => {
             // 根据column从map中获取record，再解析search属性
             const record = findItemByColumn();
+            if (!record)
+                return;
             const options = findOptionsByColumn();
             targetComponents.value = componentProps(record.search);
             targetComponents.value.label = record.title;
@@ -218,7 +231,7 @@ const __sfc_main__ = _defineComponent({
             else {
                 await handleColumnsOptions(record.search.options);
             }
-        }, { immediate: true });
+        }, { immediate: true, deep: true });
         watch(() => [props.value, props.termType, props.column, props.type], () => {
             termsModel.value = props.value;
             termsModel.termType = props.termType;

package/lib/Search/hooks/index.js

@@ -72,7 +72,7 @@ var useColumnsMap = exports.useColumnsMap = function useColumnsMap() {
 var useDefaultValue = exports.useDefaultValue = function useDefaultValue() {
   return (0, _vue.inject)(columnsValues);
 };
-var useHandleColumns = exports.useHandleColumns = function useHandleColumns(props, terms) {
+var useHandleColumns = exports.useHandleColumns = function useHandleColumns(props, terms, options) {
   var columnsMap = (0, _vue.ref)({}); // 存储每个column
   var defaultCacheValues = (0, _vue.ref)({});
   useColumnsMapContent(columnsMap);
@@ -120,7 +120,8 @@ var useHandleColumns = exports.useHandleColumns = function useHandleColumns(prop
   };
   var initValues = function initValues() {
     var arr = Object.values(columnsMap.value);
-    if (props.mode === 'advanced') {
+    if (!arr.length) return;
+    if (options.mode === 'advanced') {
       //  设置第一位
       terms.terms = [(0, _util.getItemDefaultValue)(arr[0], defaultCacheValues.value)];
     } else {

package/lib/Search/setting.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.typeOptions = exports.termType = exports.searchProps = exports.optionsMapKey = exports.componentType = exports.componentProps = exports.TermTypeMap = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _antDesignVue = require("ant-design-vue");
 var _util = require("./util");
 var optionsMapKey = exports.optionsMapKey = Symbol('searchOptionsMap');
@@ -115,7 +114,7 @@ var termType = exports.termType = function termType(locale) {
 };
 var componentType = exports.componentType = {
   input: 'input',
-  inputNumber: 'inputNumber',
+  inputNumber: 'number',
   password: 'password',
   switch: 'switch',
   radio: 'radio',
@@ -157,7 +156,7 @@ var componentProps = exports.componentProps = function componentProps(record) {
       return {
         type: type,
         name: _antDesignVue.TimePicker,
-        props: (0, _objectSpread3.default)({
+        props: (0, _objectSpread2.default)({
           valueFormat: 'HH:mm:ss'
         }, _props)
       };
@@ -165,7 +164,7 @@ var componentProps = exports.componentProps = function componentProps(record) {
       return {
         type: type,
         name: _antDesignVue.DatePicker,
-        props: (0, _objectSpread3.default)({
+        props: (0, _objectSpread2.default)({
           valueFormat: 'YYYY-MM-DD HH:mm:ss'
         }, _props)
       };
@@ -173,7 +172,7 @@ var componentProps = exports.componentProps = function componentProps(record) {
       return {
         type: type,
         name: _antDesignVue.TimeRangePicker,
-        props: (0, _objectSpread3.default)({
+        props: (0, _objectSpread2.default)({
           valueFormat: 'HH:mm:ss'
         }, _props)
       };
@@ -181,7 +180,7 @@ var componentProps = exports.componentProps = function componentProps(record) {
       return {
         type: type,
         name: _antDesignVue.RangePicker,
-        props: (0, _objectSpread3.default)({
+        props: (0, _objectSpread2.default)({
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
           showTime: true
         }, _props)
@@ -190,7 +189,7 @@ var componentProps = exports.componentProps = function componentProps(record) {
       return {
         type: type,
         name: _antDesignVue.TreeSelect,
-        props: (0, _objectSpread3.default)((0, _defineProperty2.default)({
+        props: (0, _objectSpread2.default)({
           showSearch: true,
           height: 350,
           fieldNames: {
@@ -200,15 +199,13 @@ var componentProps = exports.componentProps = function componentProps(record) {
           filterTreeNode: function filterTreeNode(v, option) {
             return (0, _util.filterTreeSelectNode)(v, option);
           }
-        }, "filterTreeNode", function filterTreeNode(v, option) {
-          return (0, _util.filterTreeSelectNode)(v, option);
-        }), _props)
+        }, _props)
       };
     case componentType.select:
       return {
         type: type,
         name: _antDesignVue.Select,
-        props: (0, _objectSpread3.default)({
+        props: (0, _objectSpread2.default)({
           showSearch: true,
           // mode: isBtw ? 'multiple' : 'combobox',
           filterOption: function filterOption(v, option) {

package/package.json

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