@jetlinks-web/components 3.2.3 → 3.2.6

package/lib/ProLayout/Basic/Header.js

@@ -32,6 +32,12 @@ var headerViewProps = exports.headerViewProps = (0, _objectSpread2.default)((0,
       return undefined;
     }
   },
+  leftContentRender: {
+    type: [Object, Function, Boolean],
+    default: function _default() {
+      return undefined;
+    }
+  },
   hasSiderMenu: _vueTypes.default.looseBool,
   siderWidth: _vueTypes.default.number.def(208)
 });
@@ -62,6 +68,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
         "theme": theme.value,
         "mode": "horizontal"
       }, props), {}, {
+        "leftContentRender": props.leftContentRender,
         "onCollapse": onCollapse.value,
         "menuData": context.menuData
       }), null);

package/lib/ProLayout/TopHeader/index.js

@@ -56,6 +56,12 @@ var baseHeaderProps = exports.baseHeaderProps = (0, _objectSpread2.default)((0,
       return undefined;
     }
   },
+  leftContentRender: {
+    type: [Object, Function],
+    default: function _default() {
+      return undefined;
+    }
+  },
   collapsedButtonRender: _SiderMenu.siderMenuProps.collapsedButtonRender,
   matchMenuKeys: _SiderMenu.siderMenuProps.matchMenuKeys,
   // events
@@ -96,6 +102,7 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
     onOpenKeys = props.onOpenKeys,
     onSelect = props.onSelect,
     contentWidth = props.contentWidth,
+    leftContentRender = props.leftContentRender,
     rightContentRender = props.rightContentRender,
     topHeaderMenuRender = props.topHeaderMenuRender,
     layout = props.layout,
@@ -152,7 +159,9 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
     "class": "".concat(prefixCls, "-logo"),
     "key": "logo",
     "id": "logo"
-  }, [headerDom])]), (0, _vue.createVNode)("div", {
+  }, [headerDom])]), leftContentRender && (0, _vue.createVNode)("div", {
+    "class": "".concat(prefixCls, "-left-content")
+  }, [typeof leftContentRender === 'function' ? leftContentRender((0, _objectSpread2.default)({}, props)) : leftContentRender]), (0, _vue.createVNode)("div", {
     "style": {
       flex: 1
     },

package/lib/ProLayout/TopHeader/style.js

@@ -91,13 +91,17 @@ var genTopHeaderStyle = exports.genTopHeaderStyle = function genTopHeaderStyle(c
     }
   }), '.anticon', {
     color: 'inherit'
-  })), "".concat(topNavHeaderCls, "-main"), (0, _defineProperty2.default)({
+  })), "".concat(topNavHeaderCls, "-main"), (0, _defineProperty2.default)((0, _defineProperty2.default)({
     display: 'flex',
     height: '100%',
     paddingLeft: '16px'
   }, "".concat(topNavHeaderCls, "-main-left"), {
     display: 'flex',
     minWidth: '192px'
+  }), "".concat(topNavHeaderCls, "-left-content"), {
+    display: 'flex',
+    alignItems: 'center',
+    marginInlineEnd: '16px'
   })), '.anticon', {
     color: '#fff'
   }), "".concat(topNavHeaderCls, "-logo"), {

package/lib/Search/Advanced/History.js

@@ -41,7 +41,7 @@ const _hoisted_3 = {
 };
 import { computed, ref } from 'vue';
 import { isFunction } from 'lodash-es';
-import { AIcon, Empty, Ellipsis } from '../../../';
+import { AIcon, Empty, Ellipsis } from '../../';
 import { Popconfirm, Button, FormItemRest, Popover, message } from 'ant-design-vue';
 import { useLocaleReceiver } from "../../LocaleReciver";
 import useSearchStyle from '../style';

package/lib/Search/Advanced/index.js

@@ -7,6 +7,7 @@
   "deleteRequest": "props",
   "deleteKey": "props",
   "defaultValues": "props",
+  "saveButton": "props",
   "SearchItem": "setup-const",
   "typeOptions": "setup-maybe-ref",
   "useHandleColumns": "setup-maybe-ref",
@@ -92,14 +93,14 @@ import History from './History.js';
 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 { useLocaleReceiver } from '../../LocaleReciver';
+import { SearchConfig } from '../../utils/constants';
+import { isObject } from 'lodash-es';
 import useSearchStyle from '../style';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JAdvancedSearch',
-        inheritAttrs: false
+        inheritAttrs: false,
     },
     props: {
         columns: {
@@ -135,7 +136,11 @@ const __sfc_main__ = _defineComponent({
         defaultValues: {
             type: Object,
             default: undefined,
-        }
+        },
+        saveButton: {
+            type: Boolean,
+            default: true,
+        },
     },
     emits: ['search', 'reset'],
     setup(__props, { expose: __expose, emit: __emit }) {
@@ -159,7 +164,8 @@ const __sfc_main__ = _defineComponent({
         const expandChange = () => {
             expand.value = !expand.value;
             terms.terms.length = 1;
-            if (expand.value) { // 展开
+            if (expand.value) {
+                // 展开
                 let arr = Object.values(columnsMap.value);
                 const mergeArr = [];
                 for (let i = 1; i < 6; i++) {
@@ -266,11 +272,11 @@ const __sfc_main__ = _defineComponent({
         watch(() => props.target, () => {
             clearValue();
         }, {
-            immediate: true
+            immediate: true,
         });
         __expose({
             setValues: handleDefaultValues,
-            reset
+            reset,
         });
         return (_ctx, _cache) => {
             return (_openBlock(), _createBlock(_unref(Form), {
@@ -295,11 +301,7 @@ const __sfc_main__ = _defineComponent({
                                 ])
                             }, [
                                 _createElementVNode("div", {
-                                    class: _normalizeClass([
-                                        'JSearch-items',
-                                        expand.value ? 'items-expand' : '',
-                                        layout.value,
-                                    ])
+                                    class: _normalizeClass(['JSearch-items', expand.value ? 'items-expand' : '', layout.value])
                                 }, [
                                     _createElementVNode("div", _hoisted_1, [
                                         _createElementVNode("div", _hoisted_2, [
@@ -359,10 +361,7 @@ const __sfc_main__ = _defineComponent({
                                         : _createCommentVNode("v-if", true)
                                 ], 2 /* CLASS */),
                                 _createElementVNode("div", {
-                                    class: _normalizeClass([
-                                        'JSearch-footer',
-                                        expand.value || compatible.value ? 'expand' : '',
-                                    ])
+                                    class: _normalizeClass(['JSearch-footer', expand.value || compatible.value ? 'expand' : ''])
                                 }, [
                                     _renderSlot(_ctx.$slots, "footerRender", {
                                         reset: reset,
@@ -376,11 +375,14 @@ const __sfc_main__ = _defineComponent({
                                                 ]),
                                                 _: 1 /* STABLE */
                                             }),
-                                            _createVNode(SaveHistory, {
-                                                terms: terms,
-                                                target: _unref(target),
-                                                request: __props.request || _unref(context).saveRequest
-                                            }, null, 8 /* PROPS */, ["terms", "target", "request"]),
+                                            (__props.saveButton !== false)
+                                                ? (_openBlock(), _createBlock(SaveHistory, {
+                                                    key: 0,
+                                                    terms: terms,
+                                                    target: _unref(target),
+                                                    request: __props.request || _unref(context).saveRequest
+                                                }, null, 8 /* PROPS */, ["terms", "target", "request"]))
+                                                : _createCommentVNode("v-if", true),
                                             _createVNode(History, {
                                                 target: _unref(target),
                                                 request: __props.historyRequest || _unref(context).historyRequest,
@@ -399,10 +401,7 @@ const __sfc_main__ = _defineComponent({
                                                 _createElementVNode("span", _hoisted_7, _toDisplayString(_unref(contextLocale).advanced.more), 1 /* TEXT */),
                                                 _createVNode(_unref(AIcon), {
                                                     type: "DoubleRightOutlined",
-                                                    class: _normalizeClass([
-                                                        'more-icon',
-                                                        expand.value ? 'more-up' : 'more-down',
-                                                    ])
+                                                    class: _normalizeClass(['more-icon', expand.value ? 'more-up' : 'more-down'])
                                                 }, null, 8 /* PROPS */, ["class"])
                                             ]),
                                             _: 1 /* STABLE */

package/package.json

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