@jetlinks-web/components 3.1.4 → 3.1.5

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/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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -154,8 +154,8 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
-    "@jetlinks-web/constants": "^1.0.9",
     "@jetlinks-web/hooks": "^1.1.1",
+    "@jetlinks-web/constants": "^1.0.9",
     "@jetlinks-web/utils": "^1.2.12"
   },
   "publishConfig": {