@jetlinks-web/components 2.4.2 → 2.4.4

package/es/EditTable/EditTable.js

@@ -89,8 +89,8 @@ import { FULL_SCREEN, RIGHT_MENU, TABLE_DATA_SOURCE, TABLE_ERROR, TABLE_TOOL, TA
 import { handleColumnsWidth } from './utils';
 import { useResizeObserver, useValidate, useFormContext } from './hooks';
 import { tableProps } from 'ant-design-vue/lib/table';
-import Header from './header.js';
-import Body from './body.js';
+import Header from './Header.js';
+import Body from './Body.js';
 import { useFullscreen } from '@vueuse/core';
 import { provide, useAttrs, useSlots, ref, reactive, computed, watch } from 'vue';
 import { bodyProps, defaultProps } from "./props";

package/es/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823262911"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180402299"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/es/FullPage/FullPage.js

@@ -6,7 +6,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823263794"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180402748"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/es/MonacoEditor/Monaco.js

@@ -36,7 +36,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "dom": "setup-ref",
-  "instance": "setup-ref",
+  "instance": "setup-let",
   "monacoProviderRef": "setup-ref",
   "monacoTypescriptProviderRef": "setup-ref",
   "handleSuggestions": "setup-const",
@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "insert": "setup-const"
 } */
 import { openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { ref, onMounted, watch, onUnmounted, toRaw, nextTick } from 'vue';
+import { ref, onMounted, watch, onUnmounted, nextTick } from 'vue';
 import * as monaco from 'monaco-editor';
 import { omit } from 'lodash-es';
 const __sfc_main__ = Object.assign({
@@ -77,7 +77,7 @@ const __sfc_main__ = Object.assign({
         const props = __props;
         const emit = __emit;
         const dom = ref();
-        const instance = ref();
+        let instance;
         const monacoProviderRef = ref();
         const monacoTypescriptProviderRef = ref();
         // codeTipItem.dispose() // 销毁自定义提示
@@ -130,12 +130,14 @@ const __sfc_main__ = Object.assign({
          * 代码格式化
          */
         const editorFormat = () => {
-            if (!instance.value)
+            if (!instance)
                 return;
-            _optionalChain([toRaw, 'call', _11 => _11(instance.value), 'access', _12 => _12.getAction, 'call', _13 => _13('editor.action.formatDocument'), 'optionalAccess', _14 => _14.run, 'call', _15 => _15()]);
+            setTimeout(() => {
+                _optionalChain([instance, 'access', _11 => _11.getAction, 'call', _12 => _12('editor.action.formatDocument'), 'optionalAccess', _13 => _13.run, 'call', _14 => _14()]);
+            }, 50);
             if (props.hasOwnProperty('readOnly')) {
                 setTimeout(() => {
-                    toRaw(instance.value).updateOptions({
+                    instance.updateOptions({
                         readOnly: props.readOnly !== false,
                     });
                 }, 100);
@@ -147,7 +149,7 @@ const __sfc_main__ = Object.assign({
         });
         onMounted(async () => {
             const _model = monaco.editor.createModel(props.modelValue, props.language);
-            instance.value = monaco.editor.create(dom.value, {
+            instance = monaco.editor.create(dom.value, {
                 model: _model,
                 tabSize: 2,
                 automaticLayout: true,
@@ -156,21 +158,21 @@ const __sfc_main__ = Object.assign({
                 formatOnPaste: true,
                 ...(omit(props.options, ['readOnly']) || {}),
             });
-            instance.value.onDidChangeModelContent(() => {
+            instance.onDidChangeModelContent(() => {
                 //
-                const value = toRaw(instance.value).getValue();
+                const value = instance.getValue();
                 nextTick(() => {
                     emit('update:modelValue', value);
                     emit('change', value);
                 });
             });
-            instance.value.onDidBlurEditorText(() => {
+            instance.onDidBlurEditorText(() => {
                 emit('blur');
                 if (props.blurFormat) {
                     editorFormat();
                 }
             });
-            instance.value.onDidFocusEditorText(() => {
+            instance.onDidFocusEditorText(() => {
                 emit('focus');
             });
             if (props.modelValue) {
@@ -178,7 +180,7 @@ const __sfc_main__ = Object.assign({
                     editorFormat();
                 }, 200);
             }
-            _optionalChain([props, 'access', _16 => _16.init, 'optionalCall', _17 => _17(instance.value, monaco)]);
+            _optionalChain([props, 'access', _15 => _15.init, 'optionalCall', _16 => _16(instance, monaco)]);
         });
         /**
          * 光标位置插入内容
@@ -186,31 +188,31 @@ const __sfc_main__ = Object.assign({
          * @param position
          */
         const insert = (val, position) => {
-            if (!instance.value)
+            if (!instance)
                 return;
-            const _position = position || toRaw(instance.value).getPosition();
-            const value = toRaw(instance.value).getValue();
+            const _position = position || instance.getPosition();
+            const value = instance.getValue();
             if (position && position.lineNumber) {
-                toRaw(instance.value).setPosition(position);
+                instance.setPosition(position);
             }
-            toRaw(instance.value).executeEdits(value, [
+            instance.executeEdits(value, [
                 {
-                    range: new monaco.Range(_optionalChain([_position, 'optionalAccess', _18 => _18.lineNumber]), _optionalChain([_position, 'optionalAccess', _19 => _19.column]), _optionalChain([_position, 'optionalAccess', _20 => _20.lineNumber]), _optionalChain([_position, 'optionalAccess', _21 => _21.column])),
+                    range: new monaco.Range(_optionalChain([_position, 'optionalAccess', _17 => _17.lineNumber]), _optionalChain([_position, 'optionalAccess', _18 => _18.column]), _optionalChain([_position, 'optionalAccess', _19 => _19.lineNumber]), _optionalChain([_position, 'optionalAccess', _20 => _20.column])),
                     text: val,
                 },
             ]);
         };
         watch(() => props.modelValue, (val) => {
-            if (!instance.value ||
-                (instance.value &&
-                    props.modelValue === toRaw(instance.value).getValue()))
+            if (!instance ||
+                (instance &&
+                    props.modelValue === instance.getValue()))
                 return;
             // setValue之前获取光标位置
-            const position = toRaw(instance.value).getPosition();
+            const position = instance.getPosition();
             // setValue之后光标位置改变
-            toRaw(instance.value).setValue(val);
+            instance.setValue(val);
             // 设置光标位置为setValue之前的位置
-            toRaw(instance.value).setPosition(position);
+            instance.setPosition(position);
             editorFormat();
         });
         watch(() => JSON.stringify(props.registrationTips), () => {
@@ -222,7 +224,7 @@ const __sfc_main__ = Object.assign({
         onUnmounted(() => {
             disposeRegister();
             disposeTypescript();
-            _optionalChain([toRaw, 'call', _22 => _22(instance.value), 'access', _23 => _23.editor, 'optionalAccess', _24 => _24.dispose, 'optionalCall', _25 => _25()]);
+            _optionalChain([instance, 'access', _21 => _21.editor, 'optionalAccess', _22 => _22.dispose, 'optionalCall', _23 => _23()]);
         });
         __expose({
             editorFormat,

package/es/ProLayout/Basic/BasicLayout.js

@@ -110,6 +110,9 @@ export default defineComponent({
       return hasSide.value && hasSplitMenu.value;
     });
     var siderWidth = computed(function () {
+      if (props.layoutType === LayoutType.PAD) {
+        return props.collapsed ? 0 : props.siderWidth;
+      }
       return props.collapsed ? props.collapsedWidth : props.siderWidth;
     });
     var onCollapse = function onCollapse(collapsed) {
@@ -179,7 +182,7 @@ export default defineComponent({
     var layoutType = computed(function () {
       return props.layoutType;
     });
-    var routeContext = reactive(_objectSpread(_objectSpread(_objectSpread({}, defaultRouteContext), pick(toRefs(props), ['pure', 'locale', 'menuData', 'openKeys', 'selectedKeys', 'contentWidth', 'disableMobile', 'fixSiderbar', 'fixedHeader', 'headerHeight', 'collapsedWidth'])), {}, {
+    var routeContext = reactive(_objectSpread(_objectSpread(_objectSpread({}, defaultRouteContext), pick(toRefs(props), ['pure', 'locale', 'menuData', 'openKeys', 'selectedKeys', 'contentWidth', 'disableMobile', 'fixSiderbar', 'fixedHeader', 'headerHeight', 'collapsedWidth', 'headerLeftWidth'])), {}, {
       siderWidth: siderWidth,
       breadcrumb: breadcrumb,
       flatMenuData: flatMenuData,
@@ -189,6 +192,7 @@ export default defineComponent({
       flatMenu: hasFlatMenu,
       layoutType: layoutType
     }));
+    console.log(toRefs(props));
     provide(routeContextInjectKey, routeContext);
     return function () {
       var pure = props.pure,
@@ -294,6 +298,7 @@ export default defineComponent({
           default: function _default() {
             return [_createVNode(SiderMenu, _objectSpread(_objectSpread({}, restProps), {}, {
               "logo": logoRender || restProps.logo,
+              "collapsedWidth": 0,
               "headerHeight": 0,
               "menuHeaderRender": menuHeaderRender,
               "menuExtraRender": menuExtraRender,

package/es/ProLayout/SiderMenu/SiderMenu.js

@@ -263,7 +263,8 @@ var SiderMenu = function SiderMenu(props) {
     "collapsedWidth": collapsedWidth,
     "style": {
       overflow: 'hidden',
-      paddingTop: "".concat(props.headerHeight, "px")
+      paddingTop: "".concat(props.headerHeight, "px"),
+      zIndex: props.layoutType === LayoutType.PAD ? 200 : 1
     },
     "width": siderWidth,
     "theme": theme,

package/es/ProLayout/TopHeader/index.js

@@ -8,7 +8,7 @@ import { computed, ref } from 'vue';
 import { default as ResizeObserver } from 'ant-design-vue/es/vc-resize-observer';
 import { defaultRenderLogoAndTitle, siderMenuProps } from '../SiderMenu/SiderMenu';
 import PropTypes from 'ant-design-vue/es/_util/vue-types';
-import { defaultSettingProps } from '../defaultSettings';
+import { defaultSettingProps, LayoutType } from '../defaultSettings';
 import { defaultPrefixCls, useRouteContext } from '../RouteContext';
 import BaseMenu from '../SiderMenu/BaseMenu';
 import { clearMenuItem } from '../util';
@@ -58,7 +58,8 @@ export var baseHeaderProps = _objectSpread(_objectSpread({}, defaultSettingProps
   onMenuHeaderClick: PropTypes.func,
   onCollapse: siderMenuProps.onCollapse,
   onOpenKeys: siderMenuProps.onOpenKeys,
-  onSelect: siderMenuProps.onSelect
+  onSelect: siderMenuProps.onSelect,
+  headerLeftWidth: Number
 });
 export var topNavHeaderProps = _objectSpread(_objectSpread({}, siderMenuProps), baseHeaderProps);
 var RightContent = function RightContent(_ref) {
@@ -122,8 +123,14 @@ export var TopNavHeader = function TopNavHeader(props) {
   var className = computed(function () {
     return _defineProperty(_defineProperty(_defineProperty({}, prefixCls, true), "light", props.theme === 'light'), "dark", props.theme === 'dark');
   });
+  var paddingLeft = computed(function () {
+    return context.layoutType === LayoutType.PAD && props.collapsed ? context.headerLeftWidth + 'px' : 0;
+  });
   return _createVNode("div", {
-    "class": className.value
+    "class": className.value,
+    "style": {
+      paddingLeft: paddingLeft.value
+    }
   }, [_createVNode("div", {
     "ref": headerRef,
     "class": "".concat(prefixCls, "-main ").concat(contentWidth === 'Fixed' ? 'wide' : '')

package/es/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823266011"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180404597"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/es/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823267117"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180405166"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823266175"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180403963"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/es/Search/Search.js

@@ -43,7 +43,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823266323"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180404314"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/lib/EditTable/EditTable.js

@@ -89,8 +89,8 @@ import { FULL_SCREEN, RIGHT_MENU, TABLE_DATA_SOURCE, TABLE_ERROR, TABLE_TOOL, TA
 import { handleColumnsWidth } from './utils';
 import { useResizeObserver, useValidate, useFormContext } from './hooks';
 import { tableProps } from 'ant-design-vue/lib/table';
-import Header from './header.js';
-import Body from './body.js';
+import Header from './Header.js';
+import Body from './Body.js';
 import { useFullscreen } from '@vueuse/core';
 import { provide, useAttrs, useSlots, ref, reactive, computed, watch } from 'vue';
 import { bodyProps, defaultProps } from "./props";

package/lib/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823262879"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180402275"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/lib/FullPage/FullPage.js

@@ -6,7 +6,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823263805"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180402736"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/lib/MonacoEditor/Monaco.js

@@ -36,7 +36,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "dom": "setup-ref",
-  "instance": "setup-ref",
+  "instance": "setup-let",
   "monacoProviderRef": "setup-ref",
   "monacoTypescriptProviderRef": "setup-ref",
   "handleSuggestions": "setup-const",
@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "insert": "setup-const"
 } */
 import { openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { ref, onMounted, watch, onUnmounted, toRaw, nextTick } from 'vue';
+import { ref, onMounted, watch, onUnmounted, nextTick } from 'vue';
 import * as monaco from 'monaco-editor';
 import { omit } from 'lodash-es';
 const __sfc_main__ = Object.assign({
@@ -77,7 +77,7 @@ const __sfc_main__ = Object.assign({
         const props = __props;
         const emit = __emit;
         const dom = ref();
-        const instance = ref();
+        let instance;
         const monacoProviderRef = ref();
         const monacoTypescriptProviderRef = ref();
         // codeTipItem.dispose() // 销毁自定义提示
@@ -130,12 +130,14 @@ const __sfc_main__ = Object.assign({
          * 代码格式化
          */
         const editorFormat = () => {
-            if (!instance.value)
+            if (!instance)
                 return;
-            _optionalChain([toRaw, 'call', _11 => _11(instance.value), 'access', _12 => _12.getAction, 'call', _13 => _13('editor.action.formatDocument'), 'optionalAccess', _14 => _14.run, 'call', _15 => _15()]);
+            setTimeout(() => {
+                _optionalChain([instance, 'access', _11 => _11.getAction, 'call', _12 => _12('editor.action.formatDocument'), 'optionalAccess', _13 => _13.run, 'call', _14 => _14()]);
+            }, 50);
             if (props.hasOwnProperty('readOnly')) {
                 setTimeout(() => {
-                    toRaw(instance.value).updateOptions({
+                    instance.updateOptions({
                         readOnly: props.readOnly !== false,
                     });
                 }, 100);
@@ -147,7 +149,7 @@ const __sfc_main__ = Object.assign({
         });
         onMounted(async () => {
             const _model = monaco.editor.createModel(props.modelValue, props.language);
-            instance.value = monaco.editor.create(dom.value, {
+            instance = monaco.editor.create(dom.value, {
                 model: _model,
                 tabSize: 2,
                 automaticLayout: true,
@@ -156,21 +158,21 @@ const __sfc_main__ = Object.assign({
                 formatOnPaste: true,
                 ...(omit(props.options, ['readOnly']) || {}),
             });
-            instance.value.onDidChangeModelContent(() => {
+            instance.onDidChangeModelContent(() => {
                 //
-                const value = toRaw(instance.value).getValue();
+                const value = instance.getValue();
                 nextTick(() => {
                     emit('update:modelValue', value);
                     emit('change', value);
                 });
             });
-            instance.value.onDidBlurEditorText(() => {
+            instance.onDidBlurEditorText(() => {
                 emit('blur');
                 if (props.blurFormat) {
                     editorFormat();
                 }
             });
-            instance.value.onDidFocusEditorText(() => {
+            instance.onDidFocusEditorText(() => {
                 emit('focus');
             });
             if (props.modelValue) {
@@ -178,7 +180,7 @@ const __sfc_main__ = Object.assign({
                     editorFormat();
                 }, 200);
             }
-            _optionalChain([props, 'access', _16 => _16.init, 'optionalCall', _17 => _17(instance.value, monaco)]);
+            _optionalChain([props, 'access', _15 => _15.init, 'optionalCall', _16 => _16(instance, monaco)]);
         });
         /**
          * 光标位置插入内容
@@ -186,31 +188,31 @@ const __sfc_main__ = Object.assign({
          * @param position
          */
         const insert = (val, position) => {
-            if (!instance.value)
+            if (!instance)
                 return;
-            const _position = position || toRaw(instance.value).getPosition();
-            const value = toRaw(instance.value).getValue();
+            const _position = position || instance.getPosition();
+            const value = instance.getValue();
             if (position && position.lineNumber) {
-                toRaw(instance.value).setPosition(position);
+                instance.setPosition(position);
             }
-            toRaw(instance.value).executeEdits(value, [
+            instance.executeEdits(value, [
                 {
-                    range: new monaco.Range(_optionalChain([_position, 'optionalAccess', _18 => _18.lineNumber]), _optionalChain([_position, 'optionalAccess', _19 => _19.column]), _optionalChain([_position, 'optionalAccess', _20 => _20.lineNumber]), _optionalChain([_position, 'optionalAccess', _21 => _21.column])),
+                    range: new monaco.Range(_optionalChain([_position, 'optionalAccess', _17 => _17.lineNumber]), _optionalChain([_position, 'optionalAccess', _18 => _18.column]), _optionalChain([_position, 'optionalAccess', _19 => _19.lineNumber]), _optionalChain([_position, 'optionalAccess', _20 => _20.column])),
                     text: val,
                 },
             ]);
         };
         watch(() => props.modelValue, (val) => {
-            if (!instance.value ||
-                (instance.value &&
-                    props.modelValue === toRaw(instance.value).getValue()))
+            if (!instance ||
+                (instance &&
+                    props.modelValue === instance.getValue()))
                 return;
             // setValue之前获取光标位置
-            const position = toRaw(instance.value).getPosition();
+            const position = instance.getPosition();
             // setValue之后光标位置改变
-            toRaw(instance.value).setValue(val);
+            instance.setValue(val);
             // 设置光标位置为setValue之前的位置
-            toRaw(instance.value).setPosition(position);
+            instance.setPosition(position);
             editorFormat();
         });
         watch(() => JSON.stringify(props.registrationTips), () => {
@@ -222,7 +224,7 @@ const __sfc_main__ = Object.assign({
         onUnmounted(() => {
             disposeRegister();
             disposeTypescript();
-            _optionalChain([toRaw, 'call', _22 => _22(instance.value), 'access', _23 => _23.editor, 'optionalAccess', _24 => _24.dispose, 'optionalCall', _25 => _25()]);
+            _optionalChain([instance, 'access', _21 => _21.editor, 'optionalAccess', _22 => _22.dispose, 'optionalCall', _23 => _23()]);
         });
         __expose({
             editorFormat,

package/lib/ProLayout/Basic/BasicLayout.js

@@ -119,6 +119,9 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       return hasSide.value && hasSplitMenu.value;
     });
     var siderWidth = (0, _vue.computed)(function () {
+      if (props.layoutType === _defaultSettings.LayoutType.PAD) {
+        return props.collapsed ? 0 : props.siderWidth;
+      }
       return props.collapsed ? props.collapsedWidth : props.siderWidth;
     });
     var onCollapse = function onCollapse(collapsed) {
@@ -188,7 +191,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
     var layoutType = (0, _vue.computed)(function () {
       return props.layoutType;
     });
-    var routeContext = (0, _vue.reactive)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _RouteContext.defaultRouteContext), (0, _lodashEs.pick)((0, _vue.toRefs)(props), ['pure', 'locale', 'menuData', 'openKeys', 'selectedKeys', 'contentWidth', 'disableMobile', 'fixSiderbar', 'fixedHeader', 'headerHeight', 'collapsedWidth'])), {}, {
+    var routeContext = (0, _vue.reactive)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _RouteContext.defaultRouteContext), (0, _lodashEs.pick)((0, _vue.toRefs)(props), ['pure', 'locale', 'menuData', 'openKeys', 'selectedKeys', 'contentWidth', 'disableMobile', 'fixSiderbar', 'fixedHeader', 'headerHeight', 'collapsedWidth', 'headerLeftWidth'])), {}, {
       siderWidth: siderWidth,
       breadcrumb: breadcrumb,
       flatMenuData: flatMenuData,
@@ -198,6 +201,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       flatMenu: hasFlatMenu,
       layoutType: layoutType
     }));
+    console.log((0, _vue.toRefs)(props));
     (0, _vue.provide)(_RouteContext.routeContextInjectKey, routeContext);
     return function () {
       var pure = props.pure,
@@ -303,6 +307,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
           default: function _default() {
             return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
               "logo": logoRender || restProps.logo,
+              "collapsedWidth": 0,
               "headerHeight": 0,
               "menuHeaderRender": menuHeaderRender,
               "menuExtraRender": menuExtraRender,

package/lib/ProLayout/SiderMenu/SiderMenu.js

@@ -272,7 +272,8 @@ var SiderMenu = function SiderMenu(props) {
     "collapsedWidth": collapsedWidth,
     "style": {
       overflow: 'hidden',
-      paddingTop: "".concat(props.headerHeight, "px")
+      paddingTop: "".concat(props.headerHeight, "px"),
+      zIndex: props.layoutType === _defaultSettings.LayoutType.PAD ? 200 : 1
     },
     "width": siderWidth,
     "theme": theme,

package/lib/ProLayout/TopHeader/index.js

@@ -63,7 +63,8 @@ var baseHeaderProps = exports.baseHeaderProps = (0, _objectSpread2.default)((0,
   onMenuHeaderClick: _vueTypes.default.func,
   onCollapse: _SiderMenu.siderMenuProps.onCollapse,
   onOpenKeys: _SiderMenu.siderMenuProps.onOpenKeys,
-  onSelect: _SiderMenu.siderMenuProps.onSelect
+  onSelect: _SiderMenu.siderMenuProps.onSelect,
+  headerLeftWidth: Number
 });
 var topNavHeaderProps = exports.topNavHeaderProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _SiderMenu.siderMenuProps), baseHeaderProps);
 var RightContent = function RightContent(_ref) {
@@ -127,8 +128,14 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
   var className = (0, _vue.computed)(function () {
     return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, prefixCls, true), "light", props.theme === 'light'), "dark", props.theme === 'dark');
   });
+  var paddingLeft = (0, _vue.computed)(function () {
+    return context.layoutType === _defaultSettings.LayoutType.PAD && props.collapsed ? context.headerLeftWidth + 'px' : 0;
+  });
   return (0, _vue.createVNode)("div", {
-    "class": className.value
+    "class": className.value,
+    "style": {
+      paddingLeft: paddingLeft.value
+    }
   }, [(0, _vue.createVNode)("div", {
     "ref": headerRef,
     "class": "".concat(prefixCls, "-main ").concat(contentWidth === 'Fixed' ? 'wide' : '')

package/lib/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823265997"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180404612"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/lib/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823267134"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180405152"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823266066"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180403858"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/lib/Search/Search.js

@@ -43,7 +43,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1726823266371"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1730180404277"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -152,8 +152,8 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
-    "@jetlinks-web/constants": "^1.0.5",
-    "@jetlinks-web/utils": "^1.2.1",
+    "@jetlinks-web/constants": "^1.0.6",
+    "@jetlinks-web/utils": "^1.2.4",
     "@jetlinks-web/hooks": "^1.0.16"
   },
   "publishConfig": {