@jetlinks-web/components 2.0.2-1 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.0.2-1",
+  "version": "2.0.2",
   "description": "",
   "main": "index.ts",
   "module": "index.ts",
@@ -20,9 +20,9 @@
     "sortablejs": "^1.15.2",
     "echarts": "^5.4.3",
     "monaco-editor": "^0.40.0",
+    "@jetlinks-web/utils": "^1.0.6",
     "@jetlinks-web/constants": "^1.0.2",
-    "@jetlinks-web/hooks": "^1.0.11",
-    "@jetlinks-web/utils": "^1.0.6"
+    "@jetlinks-web/hooks": "^1.0.10"
   },
   "devDependencies": {
     "lodash-es": "^4.17.21",

package/src/ConfigProvider/index.tsx

@@ -1,40 +1,42 @@
-import {defineComponent, provide, reactive} from 'vue'
-import { configProps } from './context'
-import type { MapConfigType } from './context'
-import { ComponentsEnum, MAPConfig } from '@jetlinks-web/constants'
-import { ConfigProvider } from 'ant-design-vue'
-import {omit} from 'lodash-es'
-import Empty from '../Empty'
-
-const JConfigProvider = defineComponent({
-  name: 'JConfigProvider',
-  inheritAttrs: false,
-  props: {
-    ...configProps()
-  },
-  setup(props, { slots }) {
-
-    const _iconConfig = reactive(props.IconConfig || {})
-    const _mapConfig = reactive<MapConfigType>(props.MapConfig || {})
-
-    provide(ComponentsEnum.Icon, _iconConfig) // 全局Icon 配置
-
-    provide(MAPConfig, _mapConfig) // 全局地图配置
-
-    return () => {
-
-      return h(
-        ConfigProvider,
-        {...omit(props, ['IconConfig', 'MapConfig'])},
-        {
-          default: slots.default,
-          renderEmpty: () => (slots.renderEmpty?.() || <Empty />)
-        }
-      )
-    }
-  }
-})
-
-JConfigProvider.config = ConfigProvider.config
-
-export default JConfigProvider
+import {defineComponent, provide, reactive} from 'vue'
+import { configProps } from './context'
+import type { MapConfigType } from './context'
+import { ComponentsEnum, MAPConfig } from '@jetlinks-web/constants'
+import { ConfigProvider } from 'ant-design-vue'
+import {omit} from 'lodash-es'
+import Empty from '../Empty'
+
+const JConfigProvider = defineComponent({
+  name: 'JConfigProvider',
+  inheritAttrs: false,
+  props: {
+    ...configProps()
+  },
+  setup(props, { slots }) {
+
+    const _iconConfig = reactive(props.IconConfig || {})
+    const _mapConfig = reactive<MapConfigType>(props.MapConfig || {})
+
+    provide(ComponentsEnum.Icon, _iconConfig) // 全局Icon 配置
+
+    provide(MAPConfig, _mapConfig) // 全局地图配置
+
+    return () => {
+      return (
+        <ConfigProvider
+          {...omit(props, ['IconConfig', 'MapConfig'])}
+          v-slots={{
+            renderEmpty: () => (slots.renderEmpty?.() || <Empty />),
+            ...slots,
+          }}
+        >
+          { slots.default?.() }
+        </ConfigProvider>
+      )
+    }
+  }
+})
+
+JConfigProvider.config = ConfigProvider.config
+
+export default JConfigProvider

package/src/ProLayout/Basic/BasicLayout.tsx

@@ -21,7 +21,6 @@ import {
     reactive,
     watchEffect,
     toRefs,
-    h
 } from 'vue';
 import { defaultSettingProps } from '../defaultSettings';
 import { baseHeaderProps } from '../TopHeader';
@@ -195,9 +194,7 @@ export default defineComponent({
             if (p.headerRender === false || p.pure) {
                 return null;
             }
-            return h(Header, { ...p, matchMenuKeys: matchMenuKeys || []})
-
-          // <Header {...p} matchMenuKeys={matchMenuKeys || []} />;
+            return <Header {...p} matchMenuKeys={matchMenuKeys || []} />;
         };
 
         const breadcrumb = computed<BreadcrumbProps>(() => ({