@jetlinks-web/components 3.3.2 → 3.3.4

package/es/ProLayout/Basic/BasicLayout.js

@@ -10,7 +10,7 @@ import { defaultSettingProps, LayoutType } from '../defaultSettings';
 import { baseHeaderProps } from '../TopHeader';
 import Header, { headerViewProps } from './Header';
 import useConfigInject from "ant-design-vue/es/config-provider/hooks/useConfigInject";
-import { pick } from 'lodash-es';
+import { pick, isObject } from 'lodash-es';
 import { defaultRouteContext, routeContextInjectKey } from '../RouteContext';
 import { getMenuFirstChildren, getSlot } from '../util';
 import { Layout, LayoutContent, Breadcrumb, Tabs } from 'ant-design-vue';
@@ -164,8 +164,7 @@ export default defineComponent({
       return "".concat(props.prefixCls, "-basicLayout");
     });
     var className = computed(function () {
-      var isObject = isObject(props.classNames);
-      return _objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true), isObject ? props.classNames || {} : {});
+      return _objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true), isObject(props.classNames) ? props.classNames || {} : {});
     });
     var genLayoutStyle = reactive({
       position: 'relative'

package/es/Search/Advanced/index.js

@@ -20,12 +20,10 @@
   "useAttrs": "setup-const",
   "inject": "setup-const",
   "computed": "setup-const",
-  "toRefs": "setup-const",
   "SaveHistory": "setup-const",
   "History": "setup-const",
   "compatibleOldTerms": "setup-maybe-ref",
   "getItemDefaultValue": "setup-maybe-ref",
-  "hasExpand": "setup-maybe-ref",
   "termsParamsFormat": "setup-maybe-ref",
   "Select": "setup-maybe-ref",
   "Button": "setup-maybe-ref",
@@ -34,6 +32,7 @@
   "AIcon": "setup-maybe-ref",
   "useLocaleReceiver": "setup-maybe-ref",
   "SearchConfig": "setup-maybe-ref",
+  "cloneDeep": "setup-maybe-ref",
   "isObject": "setup-maybe-ref",
   "useSearchStyle": "setup-maybe-ref",
   "props": "setup-reactive-const",
@@ -44,6 +43,7 @@
   "layout": "setup-ref",
   "compatible": "setup-ref",
   "screenSize": "setup-ref",
+  "expandedTermsCache": "setup-ref",
   "context": "setup-maybe-ref",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
@@ -54,6 +54,7 @@
   "initValues": "setup-maybe-ref",
   "columnsMap": "setup-maybe-ref",
   "defaultCacheValues": "setup-maybe-ref",
+  "getExpandedTerms": "setup-const",
   "expandChange": "setup-const",
   "addUrlParams": "setup-const",
   "submitData": "setup-const",
@@ -90,12 +91,12 @@ import { useHandleColumns, useOptionMapContent, useRouteQuery } from '../hooks';
 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 { compatibleOldTerms, getItemDefaultValue, termsParamsFormat } from '../util';
 import { Select, Button, Form, FormItemRest } from 'ant-design-vue';
 import { AIcon } from '../../components';
 import { useLocaleReceiver } from '../../LocaleReciver';
 import { SearchConfig } from '../../utils/constants';
-import { isObject } from 'lodash-es';
+import { cloneDeep, isObject } from 'lodash-es';
 import useSearchStyle from '../style';
 const __sfc_main__ = _defineComponent({
     ...{
@@ -152,6 +153,7 @@ const __sfc_main__ = _defineComponent({
         const layout = ref('horizontal');
         const compatible = ref(false);
         const screenSize = ref(true);
+        const expandedTermsCache = ref([]);
         const context = inject(SearchConfig);
         const prefixCls = computed(() => 'JSearch');
         const [wrapSSR, hashId] = useSearchStyle(prefixCls);
@@ -161,23 +163,35 @@ const __sfc_main__ = _defineComponent({
         const target = useRouteQuery('target');
         const { initValues, columnsMap, defaultCacheValues } = useHandleColumns(props, terms, { mode: 'advanced' });
         useOptionMapContent(columnsOptionMap);
+        const getExpandedTerms = () => {
+            if (expandedTermsCache.value.length) {
+                const cacheTerms = cloneDeep(expandedTermsCache.value);
+                if (terms.terms[0]) {
+                    cacheTerms[0] = cloneDeep(terms.terms[0]);
+                }
+                return cacheTerms;
+            }
+            const arr = Object.values(columnsMap.value);
+            const mergeArr = [];
+            for (let i = 1; i < 6; i++) {
+                const indexIn = i % arr.length;
+                const obj = getItemDefaultValue(arr[indexIn], defaultCacheValues.value);
+                if (i === 3) {
+                    obj.type = 'and';
+                }
+                mergeArr.push(obj);
+            }
+            return [...terms.terms, ...mergeArr];
+        };
         const expandChange = () => {
-            expand.value = !expand.value;
-            terms.terms.length = 1;
             if (expand.value) {
-                // 展开
-                let arr = Object.values(columnsMap.value);
-                const mergeArr = [];
-                for (let i = 1; i < 6; i++) {
-                    const indexIn = i % arr.length;
-                    const obj = getItemDefaultValue(arr[indexIn], defaultCacheValues.value);
-                    if (i === 3) {
-                        obj.type = 'and';
-                    }
-                    mergeArr.push(obj);
-                }
-                terms.terms = [...terms.terms, ...mergeArr];
+                expandedTermsCache.value = cloneDeep(terms.terms);
+                terms.terms = terms.terms.slice(0, 1);
+            }
+            else {
+                terms.terms = getExpandedTerms();
             }
+            expand.value = !expand.value;
         };
         const addUrlParams = () => {
             if (props.target) {
@@ -203,6 +217,7 @@ const __sfc_main__ = _defineComponent({
          */
         const reset = () => {
             expand.value = false;
+            expandedTermsCache.value = [];
             initValues();
             if (props.type === 'advanced') {
                 q.value = undefined;
@@ -220,6 +235,9 @@ const __sfc_main__ = _defineComponent({
                 const object = compatibleOldTerms(content, columnsMap.value, defaultCacheValues.value);
                 terms.terms = object.terms || [];
                 expand.value = object.expand;
+                expandedTermsCache.value = object.expand
+                    ? cloneDeep((object.terms || []))
+                    : [];
                 searchSubmit();
             }
             catch (e) {

package/lib/ProLayout/Basic/BasicLayout.js

@@ -172,8 +172,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       return "".concat(props.prefixCls, "-basicLayout");
     });
     var className = (0, _vue.computed)(function () {
-      var isObject = isObject(props.classNames);
-      return (0, _objectSpread3.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true), isObject ? props.classNames || {} : {});
+      return (0, _objectSpread3.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true), (0, _lodashEs.isObject)(props.classNames) ? props.classNames || {} : {});
     });
     var genLayoutStyle = (0, _vue.reactive)({
       position: 'relative'

package/lib/Search/Advanced/index.js

@@ -20,12 +20,10 @@
   "useAttrs": "setup-const",
   "inject": "setup-const",
   "computed": "setup-const",
-  "toRefs": "setup-const",
   "SaveHistory": "setup-const",
   "History": "setup-const",
   "compatibleOldTerms": "setup-maybe-ref",
   "getItemDefaultValue": "setup-maybe-ref",
-  "hasExpand": "setup-maybe-ref",
   "termsParamsFormat": "setup-maybe-ref",
   "Select": "setup-maybe-ref",
   "Button": "setup-maybe-ref",
@@ -34,6 +32,7 @@
   "AIcon": "setup-maybe-ref",
   "useLocaleReceiver": "setup-maybe-ref",
   "SearchConfig": "setup-maybe-ref",
+  "cloneDeep": "setup-maybe-ref",
   "isObject": "setup-maybe-ref",
   "useSearchStyle": "setup-maybe-ref",
   "props": "setup-reactive-const",
@@ -44,6 +43,7 @@
   "layout": "setup-ref",
   "compatible": "setup-ref",
   "screenSize": "setup-ref",
+  "expandedTermsCache": "setup-ref",
   "context": "setup-maybe-ref",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
@@ -54,6 +54,7 @@
   "initValues": "setup-maybe-ref",
   "columnsMap": "setup-maybe-ref",
   "defaultCacheValues": "setup-maybe-ref",
+  "getExpandedTerms": "setup-const",
   "expandChange": "setup-const",
   "addUrlParams": "setup-const",
   "submitData": "setup-const",
@@ -90,12 +91,12 @@ import { useHandleColumns, useOptionMapContent, useRouteQuery } from '../hooks';
 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 { compatibleOldTerms, getItemDefaultValue, termsParamsFormat } from '../util';
 import { Select, Button, Form, FormItemRest } from 'ant-design-vue';
 import { AIcon } from '../../components';
 import { useLocaleReceiver } from '../../LocaleReciver';
 import { SearchConfig } from '../../utils/constants';
-import { isObject } from 'lodash-es';
+import { cloneDeep, isObject } from 'lodash-es';
 import useSearchStyle from '../style';
 const __sfc_main__ = _defineComponent({
     ...{
@@ -152,6 +153,7 @@ const __sfc_main__ = _defineComponent({
         const layout = ref('horizontal');
         const compatible = ref(false);
         const screenSize = ref(true);
+        const expandedTermsCache = ref([]);
         const context = inject(SearchConfig);
         const prefixCls = computed(() => 'JSearch');
         const [wrapSSR, hashId] = useSearchStyle(prefixCls);
@@ -161,23 +163,35 @@ const __sfc_main__ = _defineComponent({
         const target = useRouteQuery('target');
         const { initValues, columnsMap, defaultCacheValues } = useHandleColumns(props, terms, { mode: 'advanced' });
         useOptionMapContent(columnsOptionMap);
+        const getExpandedTerms = () => {
+            if (expandedTermsCache.value.length) {
+                const cacheTerms = cloneDeep(expandedTermsCache.value);
+                if (terms.terms[0]) {
+                    cacheTerms[0] = cloneDeep(terms.terms[0]);
+                }
+                return cacheTerms;
+            }
+            const arr = Object.values(columnsMap.value);
+            const mergeArr = [];
+            for (let i = 1; i < 6; i++) {
+                const indexIn = i % arr.length;
+                const obj = getItemDefaultValue(arr[indexIn], defaultCacheValues.value);
+                if (i === 3) {
+                    obj.type = 'and';
+                }
+                mergeArr.push(obj);
+            }
+            return [...terms.terms, ...mergeArr];
+        };
         const expandChange = () => {
-            expand.value = !expand.value;
-            terms.terms.length = 1;
             if (expand.value) {
-                // 展开
-                let arr = Object.values(columnsMap.value);
-                const mergeArr = [];
-                for (let i = 1; i < 6; i++) {
-                    const indexIn = i % arr.length;
-                    const obj = getItemDefaultValue(arr[indexIn], defaultCacheValues.value);
-                    if (i === 3) {
-                        obj.type = 'and';
-                    }
-                    mergeArr.push(obj);
-                }
-                terms.terms = [...terms.terms, ...mergeArr];
+                expandedTermsCache.value = cloneDeep(terms.terms);
+                terms.terms = terms.terms.slice(0, 1);
+            }
+            else {
+                terms.terms = getExpandedTerms();
             }
+            expand.value = !expand.value;
         };
         const addUrlParams = () => {
             if (props.target) {
@@ -203,6 +217,7 @@ const __sfc_main__ = _defineComponent({
          */
         const reset = () => {
             expand.value = false;
+            expandedTermsCache.value = [];
             initValues();
             if (props.type === 'advanced') {
                 q.value = undefined;
@@ -220,6 +235,9 @@ const __sfc_main__ = _defineComponent({
                 const object = compatibleOldTerms(content, columnsMap.value, defaultCacheValues.value);
                 terms.terms = object.terms || [];
                 expand.value = object.expand;
+                expandedTermsCache.value = object.expand
+                    ? cloneDeep((object.terms || []))
+                    : [];
                 searchSubmit();
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "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/constants": "^1.0.9",
     "@jetlinks-web/utils": "^1.3.3",
-    "@jetlinks-web/hooks": "^1.1.1"
+    "@jetlinks-web/hooks": "^1.1.1",
+    "@jetlinks-web/constants": "^1.0.9"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",