@jetlinks-web/components 3.1.3 → 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/Item.js

@@ -272,11 +272,12 @@ const __sfc_main__ = _defineComponent({
                         "allow-clear": "",
                         style: { "width": "100%", "min-width": "80px" }
                     }, targetComponents.value.props, {
-                        options: valueOptions.value,
+                        options: !['treeSelect', 'tree'].includes(targetComponents.value.type) && valueOptions.value,
+                        treeData: ['treeSelect', 'tree'].includes(targetComponents.value.type) && valueOptions.value,
                         value: termsModel.value,
                         "onUpdate:value": _cache[3] || (_cache[3] = ($event) => ((termsModel.value) = $event)),
                         onChange: onValueChange
-                    }), null, 16 /* FULL_PROPS */, ["options", "value"]))
+                    }), null, 16 /* FULL_PROPS */, ["options", "treeData", "value"]))
                 ])
             ], 2 /* CLASS */));
         };

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,3 +1,5 @@
+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";
 export var optionsMapKey = Symbol('searchOptionsMap');
@@ -123,61 +125,65 @@ export var componentType = {
 };
 export var componentProps = function componentProps(record) {
   var type = record.type;
+  var _props = record.componentProps || {};
   switch (type) {
     case 'string':
     case componentType.input:
       return {
         type: type,
-        name: Input
+        name: Input,
+        props: _props
       };
     case componentType.inputNumber:
       return {
         type: type,
-        name: InputNumber
+        name: InputNumber,
+        props: _props
       };
     case componentType.password:
       return {
         type: type,
-        name: InputPassword
+        name: InputPassword,
+        props: _props
       };
     case componentType.time:
       return {
         type: type,
         name: TimePicker,
-        props: {
+        props: _objectSpread({
           valueFormat: 'HH:mm:ss'
-        }
+        }, _props)
       };
     case componentType.date:
       return {
         type: type,
         name: DatePicker,
-        props: {
+        props: _objectSpread({
           valueFormat: 'YYYY-MM-DD HH:mm:ss'
-        }
+        }, _props)
       };
     case componentType.timeRange:
       return {
         type: type,
         name: TimeRangePicker,
-        props: {
+        props: _objectSpread({
           valueFormat: 'HH:mm:ss'
-        }
+        }, _props)
       };
     case componentType.rangePicker:
       return {
         type: type,
         name: RangePicker,
-        props: {
+        props: _objectSpread({
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
           showTime: true
-        }
+        }, _props)
       };
     case componentType.treeSelect:
       return {
         type: type,
         name: TreeSelect,
-        props: {
+        props: _objectSpread(_defineProperty({
           showSearch: true,
           height: 350,
           fieldNames: {
@@ -187,13 +193,15 @@ 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)
       };
     case componentType.select:
       return {
         type: type,
         name: Select,
-        props: {
+        props: _objectSpread({
           showSearch: true,
           // mode: isBtw ? 'multiple' : 'combobox',
           filterOption: function filterOption(v, option) {
@@ -203,12 +211,13 @@ export var componentProps = function componentProps(record) {
             width: '100%',
             minWidth: '80px'
           }
-        }
+        }, _props)
       };
     case componentType.component:
       return {
         type: type,
-        name: record.components
+        name: record.components,
+        props: _props
       };
     default:
       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

@@ -272,11 +272,12 @@ const __sfc_main__ = _defineComponent({
                         "allow-clear": "",
                         style: { "width": "100%", "min-width": "80px" }
                     }, targetComponents.value.props, {
-                        options: valueOptions.value,
+                        options: !['treeSelect', 'tree'].includes(targetComponents.value.type) && valueOptions.value,
+                        treeData: ['treeSelect', 'tree'].includes(targetComponents.value.type) && valueOptions.value,
                         value: termsModel.value,
                         "onUpdate:value": _cache[3] || (_cache[3] = ($event) => ((termsModel.value) = $event)),
                         onChange: onValueChange
-                    }), null, 16 /* FULL_PROPS */, ["options", "value"]))
+                    }), null, 16 /* FULL_PROPS */, ["options", "treeData", "value"]))
                 ])
             ], 2 /* CLASS */));
         };

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

@@ -1,9 +1,12 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 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 _antDesignVue = require("ant-design-vue");
 var _util = require("./util");
 var optionsMapKey = exports.optionsMapKey = Symbol('searchOptionsMap');
@@ -129,61 +132,65 @@ var componentType = exports.componentType = {
 };
 var componentProps = exports.componentProps = function componentProps(record) {
   var type = record.type;
+  var _props = record.componentProps || {};
   switch (type) {
     case 'string':
     case componentType.input:
       return {
         type: type,
-        name: _antDesignVue.Input
+        name: _antDesignVue.Input,
+        props: _props
       };
     case componentType.inputNumber:
       return {
         type: type,
-        name: _antDesignVue.InputNumber
+        name: _antDesignVue.InputNumber,
+        props: _props
       };
     case componentType.password:
       return {
         type: type,
-        name: _antDesignVue.InputPassword
+        name: _antDesignVue.InputPassword,
+        props: _props
       };
     case componentType.time:
       return {
         type: type,
         name: _antDesignVue.TimePicker,
-        props: {
+        props: (0, _objectSpread3.default)({
           valueFormat: 'HH:mm:ss'
-        }
+        }, _props)
       };
     case componentType.date:
       return {
         type: type,
         name: _antDesignVue.DatePicker,
-        props: {
+        props: (0, _objectSpread3.default)({
           valueFormat: 'YYYY-MM-DD HH:mm:ss'
-        }
+        }, _props)
       };
     case componentType.timeRange:
       return {
         type: type,
         name: _antDesignVue.TimeRangePicker,
-        props: {
+        props: (0, _objectSpread3.default)({
           valueFormat: 'HH:mm:ss'
-        }
+        }, _props)
       };
     case componentType.rangePicker:
       return {
         type: type,
         name: _antDesignVue.RangePicker,
-        props: {
+        props: (0, _objectSpread3.default)({
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
           showTime: true
-        }
+        }, _props)
       };
     case componentType.treeSelect:
       return {
         type: type,
         name: _antDesignVue.TreeSelect,
-        props: {
+        props: (0, _objectSpread3.default)((0, _defineProperty2.default)({
           showSearch: true,
           height: 350,
           fieldNames: {
@@ -193,13 +200,15 @@ 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)
       };
     case componentType.select:
       return {
         type: type,
         name: _antDesignVue.Select,
-        props: {
+        props: (0, _objectSpread3.default)({
           showSearch: true,
           // mode: isBtw ? 'multiple' : 'combobox',
           filterOption: function filterOption(v, option) {
@@ -209,12 +218,13 @@ var componentProps = exports.componentProps = function componentProps(record) {
             width: '100%',
             minWidth: '80px'
           }
-        }
+        }, _props)
       };
     case componentType.component:
       return {
         type: type,
-        name: record.components
+        name: record.components,
+        props: _props
       };
     default:
       return {};

package/package.json

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