@jetlinks-web/components 2.0.1 → 2.0.2-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.0.1",
+  "version": "2.0.2-2",
   "description": "",
   "main": "index.ts",
   "module": "index.ts",
@@ -21,8 +21,8 @@
     "echarts": "^5.4.3",
     "monaco-editor": "^0.40.0",
     "@jetlinks-web/constants": "^1.0.2",
-    "@jetlinks-web/utils": "^1.0.6",
-    "@jetlinks-web/hooks": "^1.0.10"
+    "@jetlinks-web/hooks": "^1.0.12",
+    "@jetlinks-web/utils": "^1.0.6"
   },
   "devDependencies": {
     "lodash-es": "^4.17.21",

package/src/ConfigProvider/context.ts

@@ -1,17 +1,17 @@
-import type {PropType} from "vue";
-import { configProviderProps } from 'ant-design-vue/lib/config-provider/context';
-
-export type MapConfigType = {
-  mapStyle?: any
-  JSKey?: string
-  WebKey?: string
-}
-export const configProps = () => ({
-  ...configProviderProps(),
-  IconConfig: {
-    type: Object as PropType<{ scriptUrl: string }>
-  },
-  MapConfig: {
-    type: Object as PropType<MapConfigType>
-  }
-})
+import type {PropType} from "vue";
+import { configProviderProps } from 'ant-design-vue/es/config-provider/context';
+
+export type MapConfigType = {
+  mapStyle?: any
+  JSKey?: string
+  WebKey?: string
+}
+export const configProps = () => ({
+  ...configProviderProps(),
+  IconConfig: {
+    type: Object as PropType<{ scriptUrl: string }>
+  },
+  MapConfig: {
+    type: Object as PropType<MapConfigType>
+  }
+})

package/src/ConfigProvider/index.tsx

@@ -1,42 +1,40 @@
-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
+import {defineComponent, provide, reactive, h} 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