Merge branch 'master-fetch-dev' into master-fetch

Merge pull request !166 from dodu/dev-commet

.gitignore

@@ -4,4 +4,3 @@ dist
 dist-ssr
 *.local
 .vscode
-.idea

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-view",
-  "version": "2.2.7",
+  "version": "2.2.3",
   "engines": {
     "node": ">=12.0"
   },
@@ -16,7 +16,6 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.8",
-    "@iconify/json": "^2.2.158",
     "@types/color": "^3.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/keymaster": "^1.6.30",
@@ -33,7 +32,6 @@
     "gsap": "^3.11.3",
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
-    "iconify-icon": "^1.0.8",
     "keymaster": "^1.6.2",
     "mitt": "^3.0.0",
     "monaco-editor": "^0.33.0",
@@ -43,7 +41,7 @@
     "three": "^0.145.0",
     "vue": "^3.2.31",
     "vue-demi": "^0.13.1",
-    "vue-i18n": "9.2.2",
+    "vue-i18n": "^9.2.2",
     "vue-router": "4.0.12",
     "vue3-lazyload": "^0.2.5-beta",
     "vue3-sketch-ruler": "^1.3.3",
@@ -52,6 +50,8 @@
   "devDependencies": {
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.0.2",
+    "@iconify/types": "^2.0.0",
+    "@iconify/vue": "^4.1.1",
     "@types/node": "^16.11.26",
     "@types/three": "^0.144.0",
     "@typescript-eslint/eslint-plugin": "^5.18.0",

src/App.vue

@@ -33,5 +33,5 @@ useSystemInit()
 
 // 全局语言
 const { locale, dateLocale } = useLang()
-//测试提交
+
 </script>

src/api/http.ts

@@ -163,6 +163,7 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
   params = translateStr(params)
   // form 类型处理
   let formData: FormData = new FormData()
+  formData.set('default', 'defaultData')
   // 类型处理
 
   switch (requestParamsBodyType) {

src/components/GoIconify/index.ts

@@ -1,3 +0,0 @@
-import GoIconify from './index.vue';
-
-export { GoIconify };

src/components/GoIconify/index.vue

@@ -1,34 +0,0 @@
-<template>
-  <iconify-icon
-    :icon="icon"
-    :rotate="`${rotate}deg`"
-    :width="width"
-    :style="{
-      color: color
-    }"
-  ></iconify-icon>
-</template>
-
-<script setup lang="ts">
-defineProps({
-  icon: {
-    type: String,
-    required: true
-  },
-  color: {
-    type: String,
-    default: '#999999',
-    required: false
-  },
-  width: {
-    type: [String, Number],
-    default: '20',
-    required: false
-  },
-  rotate: {
-    type: [String, Number],
-    default: '0',
-    required: false
-  }
-})
-</script>

src/components/Pages/ChartItemSetting/GlobalSetting.vue

@@ -391,12 +391,8 @@ const visualMap = computed(() => {
 // 监听legend color颜色改变type = scroll的颜色
 watch(() => legend.value && legend.value.textStyle.color, (newVal) => {
   if (legend.value && newVal) {
-     if (!legend.value.pageTextStyle) {
-      legend.value.pageTextStyle = { color: newVal }
-    } else {
-      legend.value.pageTextStyle.color = newVal
-    }
-  }
+    legend.value.pageTextStyle.color = newVal
+  } 
 }, {
   immediate: true,
   deep: true,

src/components/Pages/ChartItemSetting/StylesSetting.vue

@@ -69,22 +69,6 @@
       </setting-item>
     </setting-item-box>
 
-    <!--  预设滤镜  -->
-    <div v-if="presetImageList.length" class="preset-filter">
-      <n-image
-        class="preset-img"
-        width="46"
-        preview-disabled
-        object-fit="scale-down"
-        v-for="(item, index) in presetImageList"
-        :key="index"
-        :class="{ 'active-preset': item.hueRotate === chartStyles.hueRotate }"
-        :style="{ filter: `hue-rotate(${item.hueRotate}deg)` }"
-        :src="item.src"
-        @click="() => (chartStyles.hueRotate = item.hueRotate)"
-      ></n-image>
-    </div>
-
     <!-- 混合模式 -->
     <setting-item-box v-if="!isCanvas" :alone="true">
       <template #name>
@@ -165,12 +149,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, PropType } from 'vue'
+import { PropType } from 'vue'
 import { PickCreateComponentType, BlendModeEnumList } from '@/packages/index.d'
 import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
 import { icon } from '@/plugins'
-import logoImg from '@/assets/logo.png'
-import { useDesignStore } from '@/store/modules/designStore/designStore'
 
 const props = defineProps({
   isGroup: {
@@ -193,48 +175,10 @@ const { HelpOutlineIcon } = icon.ionicons5
 const sliderFormatTooltip = (v: string) => {
   return `${(parseFloat(v) * 100).toFixed(0)}%`
 }
-
 // 角度格式化
 const degFormatTooltip = (v: string) => {
   return `${v}deg`
 }
-
-// 预设滤镜
-interface presetImageData {
-  index: number
-  src: string
-  hueRotate: number
-}
-
-const presetImageList = ref([] as presetImageData[])
-for (let i = 1; i <= 12; i++) {
-  presetImageList.value.push({
-    index: i,
-    src: logoImg,
-    hueRotate: i * 30
-  })
-}
 </script>
 
-<style lang="scss" scoped>
-// 预设滤镜
-.preset-filter {
-  margin: 20px 0 10px 0;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  .preset-img {
-    margin-bottom: 10px;
-    padding: 2px;
-    border-radius: 6px;
-    transition: 0.2s all;
-    cursor: pointer;
-    &:hover {
-      box-shadow: 0 0 0 2px #66a9c9;
-    }
-  }
-  .active-preset {
-    box-shadow: 0 0 0 2px #66a9c9;
-  }
-}
-</style>
+<style lang="scss" scoped></style>

src/hooks/useChartDataFetch.hook.ts

@@ -90,7 +90,7 @@ export const useChartDataFetch = (
 
         // 普通初始化与组件交互处理监听
         watch(
-          () => targetComponent.request.requestParams,
+          () => targetComponent.request,
           () => {
             fetchFn()
           },
@@ -105,11 +105,7 @@ export const useChartDataFetch = (
         // 单位
         const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
         // 开启轮询
-        if (time) {
-          fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
-        } else {
-          fetchFn()
-        }
+        if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
       }
       // eslint-disable-next-line no-empty
     } catch (error) {
@@ -118,14 +114,10 @@ export const useChartDataFetch = (
   }
 
   if (isPreview()) {
+    // 判断是否是数据池类型
     targetComponent.request.requestDataType === RequestDataTypeEnum.Pond
-      ? addGlobalDataInterface(targetComponent, useChartEditStore, (newData: any) => {
-          echartsUpdateHandle(newData)
-          if (updateCallback) updateCallback(newData)
-        })
+      ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
       : requestIntervalFn()
-  } else {
-    requestIntervalFn()
   }
   return { vChartRef }
 }

src/hooks/useChartDataPondFetch.hook.ts

@@ -1,4 +1,4 @@
-import { toRaw, watch, computed, ComputedRef } from 'vue'
+import { toRaw } from 'vue'
 import { customizeHttp } from '@/api/http'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -20,7 +20,7 @@ const mittDataPondMap = new Map<string, DataPondMapType[]>()
 // 创建单个数据项轮询接口
 const newPondItemInterval = (
   requestGlobalConfig: RequestGlobalConfigType,
-  requestDataPondItem: ComputedRef<RequestDataPondItemType>,
+  requestDataPondItem: RequestDataPondItemType,
   dataPondMapItem?: DataPondMapType[]
 ) => {
   if (!dataPondMapItem) return
@@ -31,7 +31,8 @@ const newPondItemInterval = (
   // 请求
   const fetchFn = async () => {
     try {
-      const res = await customizeHttp(toRaw(requestDataPondItem.value.dataPondRequestConfig), toRaw(requestGlobalConfig))
+      const res = await customizeHttp(toRaw(requestDataPondItem.dataPondRequestConfig), toRaw(requestGlobalConfig))
+
       if (res) {
         try {
           // 遍历更新回调函数
@@ -48,32 +49,19 @@ const newPondItemInterval = (
     }
   }
 
-  watch(
-    () => requestDataPondItem.value.dataPondRequestConfig.requestParams.Params,
-    () => {
-      fetchFn()
-    },
-    {
-      immediate: false,
-      deep: true
-    }
-  )
-
-
   // 立即调用
   fetchFn()
 
-
-  const targetInterval = requestDataPondItem.value.dataPondRequestConfig.requestInterval
-  const targetUnit = requestDataPondItem.value.dataPondRequestConfig.requestIntervalUnit
+  const targetInterval = requestDataPondItem.dataPondRequestConfig.requestInterval
+  const targetUnit = requestDataPondItem.dataPondRequestConfig.requestIntervalUnit
 
   const globalRequestInterval = requestGlobalConfig.requestInterval
   const globalUnit = requestGlobalConfig.requestIntervalUnit
 
   // 定时时间
-  const time = targetInterval ? targetInterval : globalRequestInterval
+  const time = targetInterval  ? targetInterval : globalRequestInterval
   // 单位
-  const unit = targetInterval ? targetUnit : globalUnit
+  const unit = targetInterval  ? targetUnit : globalUnit
   // 开启轮询
   if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
 }
@@ -108,16 +96,13 @@ export const useChartDataPondFetch = () => {
   }
 
   // 初始化数据池
-  const initDataPond = (useChartEditStore: ChartEditStoreType) => {
-    const { requestGlobalConfig } = useChartEditStore()
-    const chartEditStore = useChartEditStore()
+  const initDataPond = (requestGlobalConfig: RequestGlobalConfigType) => {
+    const { requestDataPond } = requestGlobalConfig
     // 根据 mapId 查找对应的数据池配置
     for (let pondKey of mittDataPondMap.keys()) {
-      const requestDataPondItem = computed(() => {
-        return requestGlobalConfig.requestDataPond.find(item => item.dataPondId === pondKey)
-      }) as ComputedRef<RequestDataPondItemType>
-      if (requestDataPondItem.value) {
-        newPondItemInterval(chartEditStore.requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
+      const requestDataPondItem = requestDataPond.find(item => item.dataPondId === pondKey)
+      if (requestDataPondItem) {
+        newPondItemInterval(requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
       }
     }
   }

src/hooks/useChartInteract.hook.ts

@@ -1,5 +1,4 @@
 import { toRefs } from 'vue'
-import { isPreview } from '@/utils'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 
@@ -13,7 +12,6 @@ export const useChartInteract = (
   param: { [T: string]: any },
   interactEventOn: string
 ) => {
-  if (!isPreview()) return
   const chartEditStore = useChartEditStore()
   const { interactEvents } = chartConfig.events
   const fnOnEvent = interactEvents.filter(item => {
@@ -22,37 +20,20 @@ export const useChartInteract = (
 
   if (fnOnEvent.length === 0) return
   fnOnEvent.forEach(item => {
-
-    const globalConfigPindAprndex = chartEditStore.requestGlobalConfig.requestDataPond.findIndex(cItem =>
-      cItem.dataPondId === item.interactComponentId
-    )
-    if (globalConfigPindAprndex !== -1) {
-      const { Params, Header } = toRefs(chartEditStore.requestGlobalConfig.requestDataPond[globalConfigPindAprndex].dataPondRequestConfig.requestParams)
-
-      Object.keys(item.interactFn).forEach(key => {
-        if (key in Params.value) {
-          Params.value[key] = param[item.interactFn[key]]
-        }
-        if (key in Header.value) {
-          Header.value[key] = param[item.interactFn[key]]
-        }
-      })
-    } else {
-      const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
-      if (index === -1) return
-      const { Params, Header } = toRefs(chartEditStore.componentList[index].request.requestParams)
-
-      Object.keys(item.interactFn).forEach(key => {
-        if (key in Params.value) {
-          Params.value[key] = param[item.interactFn[key]]
-        }
-        if (key in Header.value) {
-          Header.value[key] = param[item.interactFn[key]]
-        }
-      })
-    }
+    const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
+    if (index === -1) return
+    const { Params, Header } = toRefs(chartEditStore.componentList[index].request.requestParams)
+    Object.keys(item.interactFn).forEach(key => {
+      if (Params.value[key]) {
+        Params.value[key] = param[item.interactFn[key]]
+      }
+      if (Header.value[key]) {
+        Header.value[key] = param[item.interactFn[key]]
+      }
+    })
   })
 }
+
 // 联动事件触发的 type 变更时，清除当前绑定内容
 export const clearInteractEvent = (chartConfig: CreateComponentType) => {
 

src/hooks/useLifeHandler.hook.ts

@@ -48,10 +48,10 @@ export const useLifeHandler = (chartConfig: CreateComponentType | CreateComponen
   try {
     return new Function(`
       return (
-        async function(components,mouseEvent){
+        async function(mouseEvent){
           ${fnStr}
         }
-      )`)().bind(undefined,components)
+      )`)()
   } catch (error) {
     console.error(error)
   }

src/hooks/usePreviewScale.hook.ts

@@ -1,218 +1,218 @@
-import throttle from 'lodash/throttle'
-
-// 拆出来是为了更好的分离单独复用
-
-// * 屏幕缩放适配（两边留白）
-export const usePreviewFitScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-  // * 画布尺寸（px）
-  const baseWidth = width
-  const baseHeight = height
-
-  // * 默认缩放值
-  const scale = {
-    width: 1,
-    height: 1,
-  }
-
-  // * 需保持的比例
-  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
-  const calcRate = () => {
-    // 当前屏幕宽高比
-    const currentRate = parseFloat(
-      (window.innerWidth / window.innerHeight).toFixed(5)
-    )
-    if (scaleDom) {
-      if (currentRate > baseProportion) {
-        // 表示更宽
-        scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
-        scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
-        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      } else {
-        // 表示更高
-        scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
-        scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
-        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      }
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
-}
-
-// *  X轴撑满，Y轴滚动条
-export const usePreviewScrollYScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-  // * 画布尺寸（px）
-  const baseWidth = width
-  const baseHeight = height
-
-  // * 默认缩放值
-  const scale = {
-    width: 1,
-    height: 1,
-  }
-
-  // * 需保持的比例
-  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
-  const calcRate = () => {
-    if (scaleDom) {
-      scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
-      scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
-      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
-}
-
-// *  Y轴撑满，X轴滚动条
-export const usePreviewScrollXScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-  // * 画布尺寸（px）
-  const baseWidth = width
-  const baseHeight = height
-
-  // * 默认缩放值
-  const scale = {
-    height: 1,
-    width: 1,
-  }
-
-  // * 需保持的比例
-  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
-  const calcRate = () => {
-    if (scaleDom) {
-      scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
-      scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
-      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
-}
-
-// * 变形内容，宽高铺满
-export const usePreviewFullScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-
-  // * 默认缩放值
-  const scale = {
-    width: 1,
-    height: 1,
-  }
-
-  const calcRate = () => {
-    if (scaleDom) {
-      scale.width = parseFloat((window.innerWidth / width).toFixed(5))
-      scale.height = parseFloat((window.innerHeight / height).toFixed(5))
-      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
+import throttle from 'lodash/throttle'
+
+// 拆出来是为了更好的分离单独复用
+
+// * 屏幕缩放适配（两边留白）
+export const usePreviewFitScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+  // * 画布尺寸（px）
+  const baseWidth = width
+  const baseHeight = height
+
+  // * 默认缩放值
+  const scale = {
+    width: 1,
+    height: 1,
+  }
+
+  // * 需保持的比例
+  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
+  const calcRate = () => {
+    // 当前屏幕宽高比
+    const currentRate = parseFloat(
+      (window.innerWidth / window.innerHeight).toFixed(5)
+    )
+    if (scaleDom) {
+      if (currentRate > baseProportion) {
+        // 表示更宽
+        scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
+        scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
+        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      } else {
+        // 表示更高
+        scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
+        scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
+        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      }
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
+}
+
+// *  X轴撑满，Y轴滚动条
+export const usePreviewScrollYScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+  // * 画布尺寸（px）
+  const baseWidth = width
+  const baseHeight = height
+
+  // * 默认缩放值
+  const scale = {
+    width: 1,
+    height: 1,
+  }
+
+  // * 需保持的比例
+  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
+  const calcRate = () => {
+    if (scaleDom) {
+      scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
+      scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
+      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
+}
+
+// *  Y轴撑满，X轴滚动条
+export const usePreviewScrollXScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+  // * 画布尺寸（px）
+  const baseWidth = width
+  const baseHeight = height
+
+  // * 默认缩放值
+  const scale = {
+    height: 1,
+    width: 1,
+  }
+
+  // * 需保持的比例
+  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
+  const calcRate = () => {
+    if (scaleDom) {
+      scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
+      scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
+      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
+}
+
+// * 变形内容，宽高铺满
+export const usePreviewFullScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+
+  // * 默认缩放值
+  const scale = {
+    width: 1,
+    height: 1,
+  }
+
+  const calcRate = () => {
+    if (scaleDom) {
+      scale.width = parseFloat((window.innerWidth / width).toFixed(5))
+      scale.height = parseFloat((window.innerHeight / height).toFixed(5))
+      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
 }

src/main.ts

@@ -1,67 +1,59 @@
-import { createApp } from 'vue'
-import App from './App.vue'
-import router, { setupRouter } from '@/router'
-import i18n from '@/i18n/index'
-import { setupStore } from '@/store'
-import { setupNaive, setupDirectives, setupCustomComponents, initFunction } from '@/plugins'
-import { GoAppProvider } from '@/components/GoAppProvider/index'
-import { setHtmlTheme } from '@/utils'
-import { addCollection } from 'iconify-icon'
-import uimIcons from '@iconify/json/json/uim.json'
-import lineMdIcons from '@iconify/json/json/line-md.json'
-import wiIcons from '@iconify/json/json/wi.json'
-
-// 引入全局样式
-import '@/styles/pages/index.scss'
-// 引入动画
-import 'animate.css/animate.min.css'
-// 引入标尺
-import 'vue3-sketch-ruler/lib/style.css'
-// 注册图标
-addCollection(uimIcons)
-addCollection(lineMdIcons)
-addCollection(wiIcons)
-
-async function appInit() {
-  const goAppProvider = createApp(GoAppProvider)
-
-  const app = createApp(App)
-
-  // 注册全局常用的 naive-ui 组件
-  setupNaive(app)
-
-  // 注册全局自定义指令
-  setupDirectives(app)
-
-  // 注册全局自定义组件
-  setupCustomComponents(app)
-
-  // 挂载状态管理
-  setupStore(app)
-
-  // 解决路由守卫，Axios中可使用，Dialog，Message 等全局组件
-  goAppProvider.mount('#appProvider', true)
-
-  // 挂载路由
-  setupRouter(app)
-
-  // 路由准备就绪后挂载APP实例
-  await router.isReady()
-
-  // Store 准备就绪后处理主题色
-  setHtmlTheme()
-
-  // 语言注册
-  app.use(i18n)
-
-  // 挂载到页面
-  app.mount('#app', true)
-
-  // 挂载到 window
-  window['$vue'] = app
-}
-
-appInit().then(() => {
-  initFunction()
-})
-
+import { createApp } from 'vue'
+import App from './App.vue'
+import router, { setupRouter } from '@/router'
+import i18n from '@/i18n/index'
+import { setupStore } from '@/store'
+import { setupNaive, setupDirectives, setupCustomComponents, initFunction } from '@/plugins'
+import { GoAppProvider } from '@/components/GoAppProvider/index'
+import { setHtmlTheme } from '@/utils'
+
+// 引入全局样式
+import '@/styles/pages/index.scss'
+// 引入动画
+import 'animate.css/animate.min.css'
+// 引入标尺
+import 'vue3-sketch-ruler/lib/style.css'
+
+async function appInit() {
+  const goAppProvider = createApp(GoAppProvider)
+
+  const app = createApp(App)
+
+  // 注册全局常用的 naive-ui 组件
+  setupNaive(app)
+
+  // 注册全局自定义指令
+  setupDirectives(app)
+
+  // 注册全局自定义组件
+  setupCustomComponents(app)
+
+  // 挂载状态管理
+  setupStore(app)
+
+  // 解决路由守卫，Axios中可使用，Dialog，Message 等全局组件
+  goAppProvider.mount('#appProvider', true)
+
+  // 挂载路由
+  setupRouter(app)
+
+  // 路由准备就绪后挂载APP实例
+  await router.isReady()
+
+  // Store 准备就绪后处理主题色
+  setHtmlTheme()
+
+  // 语言注册
+  app.use(i18n)
+
+  // 挂载到页面
+  app.mount('#app', true)
+
+  // 挂载到 window
+  window['$vue'] = app
+}
+
+appInit().then(() => {
+  initFunction()
+})
+

src/packages/components/Charts/Bars/BarLine/config.ts

@@ -1,75 +0,0 @@
-import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
-import { BarLineConfig } from './index'
-import { CreateComponentType } from '@/packages/index.d'
-import cloneDeep from 'lodash/cloneDeep'
-import dataJson from './data.json'
-
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
-// 柱状折线组合图 分别定义series
-// 写死name可以定义legend显示的名称
-export const barSeriesItem = {
-  type: 'bar',
-  barWidth: 15,
-  label: {
-    show: true,
-    position: 'top',
-    color: '#fff',
-    fontSize: 12
-  },
-  itemStyle: {
-    color: null,
-    borderRadius: 2
-  }
-}
-
-export const lineSeriesItem = {
-  type: 'line',
-  symbol: 'circle',
-  label: {
-    show: true,
-    position: 'top',
-    color: '#fff',
-    fontSize: 12
-  },
-  symbolSize: 5, //设定实心点的大小
-  itemStyle: {
-    color: '#FFE47A',
-    borderWidth: 1
-  },
-  lineStyle: {
-    type: 'solid',
-    width: 3,
-    color: null
-  }
-}
-
-export const option = {
-  tooltip: {
-    show: true,
-    trigger: 'axis',
-    axisPointer: {
-      show: true,
-      type: 'shadow'
-    }
-  },
-  legend: {
-    data: null
-  },
-  xAxis: {
-    show: true,
-    type: 'category'
-  },
-  yAxis: {
-    show: true,
-    type: 'value'
-  },
-  dataset: { ...dataJson },
-  series: [barSeriesItem, lineSeriesItem]
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = BarLineConfig.key
-  public chartConfig = cloneDeep(BarLineConfig)
-  // 图表配置项
-  public option = echartOptionProfixHandle(option, includes)
-}

src/packages/components/Charts/Bars/BarLine/config.vue

@@ -1,93 +0,0 @@
-<template>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem
-    v-for="(item, index) in seriesList"
-    :key="index"
-    :name="`${item.type == 'bar' ? '柱状图' : '折线图'}`"
-    :expanded="true"
-  >
-    <SettingItemBox name="图形" v-if="item.type == 'bar'">
-      <SettingItem name="宽度">
-        <n-input-number
-          v-model:value="item.barWidth"
-          :min="1"
-          :max="100"
-          size="small"
-          placeholder="自动计算"
-        ></n-input-number>
-      </SettingItem>
-      <SettingItem name="圆角">
-        <n-input-number v-model:value="item.itemStyle.borderRadius" :min="0" size="small"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="线条" v-if="item.type == 'line'">
-      <SettingItem name="宽度">
-        <n-input-number
-          v-model:value="item.lineStyle.width"
-          :min="1"
-          :max="100"
-          size="small"
-          placeholder="自动计算"
-        ></n-input-number>
-      </SettingItem>
-      <SettingItem name="类型">
-        <n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="实心点" v-if="item.type == 'line'">
-      <SettingItem name="大小">
-        <n-input-number
-          v-model:value="item.symbolSize"
-          :min="1"
-          :max="100"
-          size="small"
-          placeholder="自动计算"
-        ></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <setting-item-box name="标签">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="item.label.show" size="small" />
-          <n-text>展示标签</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="大小">
-        <n-input-number v-model:value="item.label.fontSize" size="small" :min="1"></n-input-number>
-      </setting-item>
-      <setting-item name="tip颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="item.label.color"></n-color-picker>
-      </setting-item>
-      <setting-item name="位置">
-        <n-select
-          v-model:value="item.label.position"
-          :options="[
-            { label: 'top', value: 'top' },
-            { label: 'left', value: 'left' },
-            { label: 'right', value: 'right' },
-            { label: 'bottom', value: 'bottom' }
-          ]"
-        />
-      </setting-item>
-    </setting-item-box>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType, computed } from 'vue'
-import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { lineConf } from '@/packages/chartConfiguration/echarts'
-import { GlobalThemeJsonType } from '@/settings/chartThemes'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<GlobalThemeJsonType>,
-    required: true
-  }
-})
-
-const seriesList = computed(() => {
-  return props.optionData.series
-})
-</script>

src/packages/components/Charts/Bars/BarLine/data.json

@@ -1,40 +0,0 @@
-{
-  "dimensions": ["product", "data1", "data2"],
-  "source": [
-    {
-      "product": "1月",
-      "data1": 104,
-      "data2": 30
-    },
-    {
-      "product": "2月",
-      "data1": 56,
-      "data2": 56
-    },
-    {
-      "product": "3月",
-      "data1": 136,
-      "data2": 36
-    },
-    {
-      "product": "4月",
-      "data1": 86,
-      "data2": 6
-    },
-    {
-      "product": "5月",
-      "data1": 98,
-      "data2": 10
-    },
-    {
-      "product": "6月",
-      "data1": 86,
-      "data2": 70
-    },
-    {
-      "product": "7月",
-      "data1": 77,
-      "data2": 57
-    }
-  ]
-}

src/packages/components/Charts/Bars/BarLine/index.ts

@@ -1,16 +0,0 @@
-// 公共类型声明
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-// 当前[信息模块]分类声明
-import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-
-export const BarLineConfig: ConfigType = {
-  key: 'BarLine',
-  chartKey: 'VBarLine',
-  conKey: 'VCBarLine',
-  title: '柱状图 & 折线图',
-  category: ChatCategoryEnum.BAR,
-  categoryName: ChatCategoryEnumName.BAR,
-  package: PackagesCategoryEnum.CHARTS,
-  chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'bar_line.png'
-}

src/packages/components/Charts/Bars/BarLine/index.vue

@@ -1,73 +0,0 @@
-<template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="option"
-    :manual-update="isPreview()"
-    autoresize
-  ></v-chart>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, watch, PropType, nextTick } from 'vue'
-import VChart from 'vue-echarts'
-import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-//引入柱状图 折线图
-import { BarChart, LineChart } from 'echarts/charts'
-import config, { includes, barSeriesItem, lineSeriesItem } from './config'
-import { mergeTheme } from '@/packages/public/chart'
-import { useChartDataFetch } from '@/hooks'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview } from '@/utils'
-import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
-
-const props = defineProps({
-  themeSetting: {
-    type: Object,
-    required: true
-  },
-  themeColor: {
-    type: Object,
-    required: true
-  },
-  chartConfig: {
-    type: Object as PropType<config>,
-    required: true
-  }
-})
-
-const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
-
-use([DatasetComponent, CanvasRenderer, BarChart, LineChart, GridComponent, TooltipComponent, LegendComponent])
-
-const replaceMergeArr = ref<string[]>()
-
-const option = computed(() => {
-  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-
-watch(
-  () => props.chartConfig.option.dataset,
-  (newData, oldData) => {
-    if (newData.dimensions.length !== oldData.dimensions.length) {
-      const seriesArr = []
-      for (let i = 0; i < newData.dimensions.length - 1; i++) {
-        seriesArr.push(barSeriesItem, lineSeriesItem)
-      }
-      replaceMergeArr.value = ['series']
-      props.chartConfig.option.series = seriesArr
-      nextTick(() => {
-        replaceMergeArr.value = []
-      })
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
-</script>

src/packages/components/Charts/Bars/index.ts

@@ -1,6 +1,5 @@
-import { BarCommonConfig } from './BarCommon/index'
-import { BarCrossrangeConfig } from './BarCrossrange/index'
-import { CapsuleChartConfig } from './CapsuleChart/index'
-import { BarLineConfig } from './BarLine/index'
-
-export default [BarCommonConfig, BarCrossrangeConfig, BarLineConfig, CapsuleChartConfig]
+import { BarCommonConfig } from './BarCommon/index'
+import { BarCrossrangeConfig } from './BarCrossrange/index'
+import { CapsuleChartConfig } from './CapsuleChart/index'
+
+export default [BarCommonConfig, BarCrossrangeConfig, CapsuleChartConfig]

src/packages/components/Charts/Lines/LineLinearSingle/config.ts

@@ -33,10 +33,6 @@ export const option = {
         width: 3,
         color: {
           type: 'linear',
-          x: 0,
-          y: 0,
-          x2: 0,
-          y2: 1,
           colorStops: [
             {
               offset: 0,

src/packages/components/Charts/Maps/MapBase/config.ts

@@ -11,10 +11,7 @@ export const option = {
   dataset: dataJson,
   mapRegion: {
     adcode: 'china',
-    showHainanIsLands: true,
-    enter: false,
-    backSize: 20,
-    backColor: '#ffffff'
+    showHainanIsLands: true
   },
   tooltip: {
     show: true,
@@ -87,10 +84,7 @@ export const option = {
         shadowColor: '#E1FFFF',
         shadowBlur: 10
       },
-      data: [],
-      encode: {
-        value: 2
-      }
+      data: []
     },
     {
       name: '区域',
@@ -106,19 +100,19 @@ export const option = {
         borderColor: 'rgba(147, 235, 248, 0.8)',
         textStyle: {
           color: '#FFFFFF',
-          fontSize: 12
+          fontSize: 12,
         }
       },
       label: {
         show: false,
         color: '#FFFFFF',
-        fontSize: 12
+        fontSize: 12,
       },
       emphasis: {
         disabled: false,
         label: {
           color: '#FFFFFF',
-          fontSize: 12
+          fontSize: 12,
         },
         itemStyle: {
           areaColor: '#389BB7',
@@ -151,26 +145,6 @@ export const option = {
         shadowOffsetY: 2,
         shadowBlur: 10
       }
-    },
-    {
-      type: 'lines',
-      zlevel: 2,
-      effect: {
-        show: true,
-        period: 4, //箭头指向速度，值越小速度越快
-        trailLength: 0.4, //特效尾迹长度[0,1]值越大，尾迹越长重
-        symbol: 'arrow', //箭头图标
-        symbolSize: 7 //图标大小
-      },
-      lineStyle: {
-        normal: {
-          color: '#4fb6d2',
-          width: 1, //线条宽度
-          opacity: 0.1, //尾迹线条透明度
-          curveness: 0.3 //尾迹线条曲直度
-        }
-      },
-      data: []
     }
   ]
 }

src/packages/components/Charts/Maps/MapBase/config.vue

@@ -69,7 +69,11 @@
         </n-space>
       </SettingItem>
       <SettingItem name="字体颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[1].label.color"></n-color-picker>
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].label.color"
+        ></n-color-picker>
       </SettingItem>
       <SettingItem name="字体大小">
         <n-input-number
@@ -125,7 +129,7 @@
         ></n-color-picker>
       </SettingItem>
     </SettingItemBox>
-
+    
     <SettingItemBox name="悬浮弹窗">
       <SettingItem name="显示">
         <n-space>
@@ -176,22 +180,6 @@
       <SettingItem>
         <n-checkbox v-model:checked="mapRegion.showHainanIsLands" size="small">显示南海群岛</n-checkbox>
       </SettingItem>
-      <SettingItem v-if="seriesList[2]">
-        <n-checkbox v-model:checked="mapRegion.enter" size="small">点击进入下级</n-checkbox>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="返回图标" v-if="mapRegion.enter">
-      <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="mapRegion.backColor"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="大小">
-        <n-input-number
-          v-model:value="mapRegion.backSize"
-          :min="1"
-          size="small"
-          placeholder="请输入字体大小"
-        ></n-input-number>
-      </SettingItem>
     </SettingItemBox>
   </CollapseItem>
   <CollapseItem name="标记" :expanded="true">
@@ -203,7 +191,7 @@
         <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].itemStyle.color"></n-color-picker>
       </SettingItem>
     </SettingItemBox>
-
+      
     <SettingItemBox name="文本">
       <SettingItem name="显示">
         <n-space>
@@ -235,47 +223,6 @@
       </SettingItem>
     </SettingItemBox>
   </CollapseItem>
-
-  <CollapseItem v-if="seriesList[2]" name="飞线" :expanded="true">
-    <SettingItemBox name="箭头">
-      <SettingItem name="速度">
-        <n-tooltip trigger="hover">
-          <template #trigger>
-            <n-input-number v-model:value="seriesList[2].effect.period" size="small" :min="0"></n-input-number>
-          </template>
-          值越小速度越快
-        </n-tooltip>
-      </SettingItem>
-      <SettingItem name="尾迹">
-        <n-tooltip trigger="hover">
-          <template #trigger>
-            <n-input-number
-              v-model:value="seriesList[2].effect.trailLength"
-              size="small"
-              :min="0"
-              :max="1"
-            ></n-input-number>
-          </template>
-          特效尾迹长度[0,1]值越大，尾迹越长重
-        </n-tooltip>
-      </SettingItem>
-      <SettingItem name="大小">
-        <n-input-number v-model:value="seriesList[2].effect.symbolSize" size="small" :min="0"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="配置">
-      <SettingItem name="颜色">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="seriesList[2].lineStyle.normal.color"
-        ></n-color-picker>
-      </SettingItem>
-      <SettingItem name="宽度">
-        <n-input-number v-model:value="seriesList[2].lineStyle.normal.width" size="small" :min="1"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-  </CollapseItem>
 </template>
 
 <script setup lang="ts">

src/packages/components/Charts/Maps/MapBase/data.json

@@ -21,32 +21,6 @@
       "value": [126.642464, 45.756967, 101]
     }
   ],
-  "line": [
-    {
-      "coords": [
-        [113.665412, 34.757975],
-        [116.405285, 39.904989]
-      ]
-    },
-    {
-      "coords": [
-        [101.778916, 36.623178],
-        [116.405285, 39.904989]
-      ]
-    },
-    {
-      "coords": [
-        [106.278179, 38.46637],
-        [116.405285, 39.904989]
-      ]
-    },
-    {
-      "coords": [
-        [126.642464, 45.756967],
-        [116.405285, 39.904989]
-      ]
-    }
-  ],
   "map": [
     {
       "name": "北京市",

src/packages/components/Charts/Maps/MapBase/index.vue

@@ -1,256 +1,156 @@
-<template>
-  <div>
-    <div class="back-icon" v-if="(enter && levelHistory.length !== 0) || (enter && !isPreview())" @click="backLevel">
-      <n-icon :color="backColor" :size="backSize * 1.1">
-        <ArrowBackIcon />
-      </n-icon>
-      <span
-        :style="{
-          'font-weight': 200,
-          color: backColor,
-          'font-size': `${backSize}px`
-        }"
-      >
-        返回上级
-      </span>
-    </div>
-    <v-chart
-      ref="vChartRef"
-      :init-options="initOptions"
-      :theme="themeColor"
-      :option="option.value"
-      :manual-update="isPreview()"
-      autoresize
-      @click="chartPEvents"
-    >
-    </v-chart>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, reactive, watch, ref, nextTick, toRefs } from 'vue'
-import config, { includes } from './config'
-import VChart from 'vue-echarts'
-import { icon } from '@/plugins'
-import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
-import { use, registerMap } from 'echarts/core'
-import { EffectScatterChart, MapChart } from 'echarts/charts'
-import { CanvasRenderer } from 'echarts/renderers'
-import { useChartDataFetch } from '@/hooks'
-import { mergeTheme, setOption } from '@/packages/public/chart'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview } from '@/utils'
-import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
-import mapChinaJson from './mapGeojson/china.json'
-import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } from 'echarts/components'
-
-const props = defineProps({
-  themeSetting: {
-    type: Object,
-    required: true
-  },
-  themeColor: {
-    type: Object,
-    required: true
-  },
-  chartConfig: {
-    type: Object as PropType<config>,
-    required: true
-  }
-})
-
-const { ArrowBackIcon } = icon.ionicons5
-let levelHistory: any = ref([])
-
-const { backColor, backSize, enter } = toRefs(props.chartConfig.option.mapRegion)
-const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
-
-use([
-  MapChart,
-  DatasetComponent,
-  CanvasRenderer,
-  GridComponent,
-  TooltipComponent,
-  GeoComponent,
-  EffectScatterChart,
-  VisualMapComponent
-])
-
-const option = reactive({
-  value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-const vChartRef = ref<typeof VChart>()
-
-//动态获取json注册地图
-const getGeojson = (regionId: string) => {
-  return new Promise<boolean>(resolve => {
-    import(`./mapGeojson/${regionId}.json`).then(data => {
-      registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} })
-      resolve(true)
-    })
-  })
-}
-
-//异步时先注册空的 保证初始化不报错
-registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} })
-
-// 进行更换初始化地图 如果为china 单独处理
-const registerMapInitAsync = async () => {
-  await nextTick()
-  const adCode = `${props.chartConfig.option.mapRegion.adcode}`
-  if (adCode !== 'china') {
-    await getGeojson(adCode)
-  } else {
-    await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands)
-  }
-  vEchartsSetOption()
-}
-registerMapInitAsync()
-
-// 手动触发渲染
-const vEchartsSetOption = () => {
-  option.value = props.chartConfig.option
-  setOption(vChartRef.value, props.chartConfig.option)
-}
-
-// 更新数据处理
-const dataSetHandle = async (dataset: any) => {
-  props.chartConfig.option.series.forEach((item: any) => {
-    if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point
-    else if (item.type === 'lines' && dataset.line) {
-      item.data = dataset.line.map((it: any) => {
-        return {
-          ...it,
-          lineStyle: {
-            color: props.chartConfig.option.series[2].lineStyle.normal.color
-          }
-        }
-      })
-    } else if (item.type === 'map' && dataset.map) item.data = dataset.map
-  })
-  if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces
-
-  isPreview() && vEchartsSetOption()
-}
-// 处理海南群岛
-const hainanLandsHandle = async (newData: boolean) => {
-  if (newData) {
-    await getGeojson('china')
-  } else {
-    registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
-  }
-}
-
-// 点击区域
-const chartPEvents = (e: any) => {
-  if (e.seriesType !== 'map') return
-  if (!props.chartConfig.option.mapRegion.enter) {
-    return
-  }
-  mapChinaJson.features.forEach(item => {
-    var pattern = new RegExp(e.name)
-    if (pattern.test(item.properties.name)) {
-      let code = String(item.properties.adcode)
-      levelHistory.value.push(code)
-      checkOrMap(code)
-    }
-  })
-}
-
-// 返回上一级
-const backLevel = () => {
-  levelHistory.value = []
-  if (levelHistory.value.length > 1) {
-    levelHistory.value.pop()
-    const code = levelHistory[levelHistory.value.length - 1]
-    checkOrMap(code)
-  } else {
-    checkOrMap('china')
-  }
-}
-
-// 切换地图
-const checkOrMap = async (newData: string) => {
-  await getGeojson(newData)
-  props.chartConfig.option.geo.map = newData
-  props.chartConfig.option.series.forEach((item: any) => {
-    if (item.type === 'map') item.map = newData
-  })
-  vEchartsSetOption()
-}
-
-//监听 dataset 数据发生变化
-watch(
-  () => props.chartConfig.option.dataset,
-  newData => {
-    dataSetHandle(newData)
-  },
-  {
-    immediate: true,
-    deep: false
-  }
-)
-
-// 监听线的颜色
-if (props.chartConfig.option.series[2] && !isPreview()) {
-  watch(
-    () => props.chartConfig.option.series[2].lineStyle.normal.color,
-    () => {
-      dataSetHandle(props.chartConfig.option.dataset)
-    },
-    {
-      deep: false
-    }
-  )
-}
-
-//监听是否显示南海群岛
-if (!isPreview()) {
-  watch(
-    () => props.chartConfig.option.mapRegion.showHainanIsLands,
-    async newData => {
-      try {
-        await hainanLandsHandle(newData)
-        vEchartsSetOption()
-      } catch (error) {
-        console.log(error)
-      }
-    },
-    {
-      deep: false
-    }
-  )
-}
-//监听地图展示区域发生变化
-watch(
-  () => `${props.chartConfig.option.mapRegion.adcode}`,
-  newData => {
-    try {
-      checkOrMap(newData)
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-// 预览
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  dataSetHandle(newData)
-})
-</script>
-
-<style scope lang="scss">
-.back-icon {
-  z-index: 50;
-  cursor: pointer;
-  position: absolute;
-  display: flex;
-  align-items: center;
-  top: 0;
-  left: 0;
-  gap: 2px;
-}
-</style>
+<template>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize>
+  </v-chart>
+</template>
+
+<script setup lang="ts">
+import { PropType, reactive, watch, ref, nextTick } from 'vue'
+import config, { includes } from './config'
+import VChart from 'vue-echarts'
+import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
+import { use, registerMap } from 'echarts/core'
+import { EffectScatterChart, MapChart } from 'echarts/charts'
+import { CanvasRenderer } from 'echarts/renderers'
+import { useChartDataFetch } from '@/hooks'
+import { mergeTheme, setOption } from '@/packages/public/chart'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
+import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } from 'echarts/components'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<config>,
+    required: true
+  }
+})
+
+const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
+
+use([
+  MapChart,
+  DatasetComponent,
+  CanvasRenderer,
+  GridComponent,
+  TooltipComponent,
+  GeoComponent,
+  EffectScatterChart,
+  VisualMapComponent
+])
+
+const option = reactive({
+  value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+const vChartRef = ref<typeof VChart>()
+
+//动态获取json注册地图
+const getGeojson = (regionId: string) => {
+  return new Promise<boolean>(resolve => {
+    import(`./mapGeojson/${regionId}.json`).then(data => {
+      registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} })
+      resolve(true)
+    })
+  })
+}
+
+//异步时先注册空的 保证初始化不报错
+registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} })
+
+// 进行更换初始化地图 如果为china 单独处理
+const registerMapInitAsync = async () => {
+  await nextTick()
+  const adCode = `${props.chartConfig.option.mapRegion.adcode}`;
+  if (adCode !== 'china') {
+    await getGeojson(adCode)
+  } else {
+    await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands)
+  }
+  vEchartsSetOption()
+}
+registerMapInitAsync()
+
+// 手动触发渲染
+const vEchartsSetOption = () => {
+  option.value = props.chartConfig.option
+  setOption(vChartRef.value, props.chartConfig.option)
+}
+
+// 更新数据处理
+const dataSetHandle = async (dataset: any) => {
+  props.chartConfig.option.series.forEach((item: any) => {
+    if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point
+    else if (item.type === 'map' && dataset.map) item.data = dataset.map
+  })
+  if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces
+
+  isPreview() && vEchartsSetOption()
+}
+// 处理海南群岛
+const hainanLandsHandle = async (newData: boolean) => {
+  if (newData) {
+    await getGeojson('china')
+  } else {
+    registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
+  }
+}
+//监听 dataset 数据发生变化
+watch(
+  () => props.chartConfig.option.dataset,
+  newData => {
+    dataSetHandle(newData)
+  },
+  {
+    immediate: true,
+    deep: false
+  }
+)
+
+//监听是否显示南海群岛
+watch(
+  () => props.chartConfig.option.mapRegion.showHainanIsLands,
+  async newData => {
+    try {
+      await hainanLandsHandle(newData)
+      vEchartsSetOption()
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  {
+    deep: false
+  }
+)
+
+//监听地图展示区域发生变化
+watch(
+  () => `${props.chartConfig.option.mapRegion.adcode}`,
+  async newData => {
+    try {
+      await getGeojson(newData)
+      props.chartConfig.option.geo.map = newData
+      props.chartConfig.option.series.forEach((item: any) => {
+        if (item.type === 'map') item.map = newData
+      })
+      vEchartsSetOption()
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  {
+    deep: false
+  }
+)
+
+// 预览
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+  dataSetHandle(newData)
+})
+</script>

src/packages/components/Charts/Mores/Funnel/index.vue

@@ -1,52 +1,44 @@
-<template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="(option as EChartsOption)"
-    :manual-update="isPreview()"
-    autoresize
-  ></v-chart>
-</template>
-
-<script setup lang="ts">
-import { computed, PropType } from 'vue'
-import VChart from 'vue-echarts'
-import { EChartsOption } from 'echarts'
-import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-import { FunnelChart } from 'echarts/charts'
-import { includes } from './config'
-import { mergeTheme } from '@/packages/public/chart'
-import { useChartDataFetch } from '@/hooks'
-import { CreateComponentType } from '@/packages/index.d'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview } from '@/utils'
-import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
-
-const props = defineProps({
-  themeSetting: {
-    type: Object,
-    required: true
-  },
-  themeColor: {
-    type: Object,
-    required: true
-  },
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
-
-use([DatasetComponent, CanvasRenderer, FunnelChart, GridComponent, TooltipComponent, LegendComponent])
-
-const option = computed(() => {
-  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
-</script>
+<template>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+</template>
+
+<script setup lang="ts">
+import { computed, PropType } from 'vue'
+import VChart from 'vue-echarts'
+import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { FunnelChart } from 'echarts/charts'
+import { includes } from './config'
+import { mergeTheme } from '@/packages/public/chart'
+import { useChartDataFetch } from '@/hooks'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
+
+use([DatasetComponent, CanvasRenderer, FunnelChart, GridComponent, TooltipComponent, LegendComponent])
+
+const option = computed(() => {
+  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
+</script>

src/packages/components/Charts/Mores/Graph/config.ts

@@ -9,8 +9,7 @@ export const includes = []
 // 关系图布局
 export const GraphLayout = [
   { label: '无', value: 'none' },
-  { label: '环形', value: 'circular' },
-  { label: '力引导', value: 'force' }
+  { label: '环形', value: 'circular' }
 ]
 
 // 标签开关
@@ -25,57 +24,44 @@ export const LabelPosition = [
   { label: '右侧', value: 'right' },
   { label: '顶部', value: 'top' },
   { label: '底部', value: 'bottom' },
-  { label: '内部', value: 'inside' }
-]
-
-// 图-迭代动画
-export const LayoutAnimation = [
-  { label: '开启', value: 1 },
-  { label: '关闭', value: 0 }
+  { label: '内部', value: 'inside' },
 ]
 
 export const option = {
-  dataset: { ...dataJson },
-  tooltip: {},
-  legend: {
-    show: true,
-    textStyle: {
-      color: '#eee',
-      fontSize: 14
+    dataset: { ...dataJson },
+    tooltip: {},
+    legend:{
+      show:true,
+      textStyle:{
+        color:"#eee",
+        fontSize: 14 ,
+      },
+      data: dataJson.categories.map(function (a) {
+          return a.name;
+      })
     },
-    data: dataJson.categories.map(function (a) {
-      return a.name
-    })
-  },
-  series: [
-    {
-      type: 'graph',
-      layout: 'none', // none circular环形布局
-      data: dataJson.nodes,
-      links: dataJson.links,
-      categories: dataJson.categories,
-      label: {
-        show: 1,
-        position: 'right',
-        formatter: '{b}'
-      },
-      labelLayout: {
-        hideOverlap: true
-      },
-      lineStyle: {
-        color: 'source', // 线条颜色
-        curveness: 0.2 // 线条卷曲程度
-      },
-      force: {
-        repulsion: 100,
-        gravity: 0.1,
-        edgeLength: 30,
-        layoutAnimation: 1,
-        friction: 0.6
+    series: [
+      {
+        type: 'graph',
+        layout: 'none', // none circular环形布局
+        data: dataJson.nodes,
+        links: dataJson.links,
+        categories: dataJson.categories,
+        label: { // 标签
+          show: 1,
+          position: 'right',
+          formatter: '{b}'
+        },
+        labelLayout: {
+          hideOverlap: true
+        },
+        lineStyle: {
+          color: 'source', // 线条颜色
+          curveness: 0.2 // 线条卷曲程度
+        }
       }
-    }
-  ]
-}
+    ]
+  };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = GraphConfig.key

src/packages/components/Charts/Mores/Graph/config.vue

@@ -16,14 +16,14 @@
       </SettingItemBox>
       <SettingItemBox name="线条">
         <SettingItem name="弧线">
-          <!-- 需要输入两位的小数才会变化 -->
+        <!-- 需要输入两位的小数才会变化 -->
           <n-input-number
-            v-model:value="optionData.series[0].lineStyle.curveness"
-            :min="0"
-            :step="0.01"
-            placeholder="弯曲程度"
-            size="small"
-          ></n-input-number>
+          v-model:value="optionData.series[0].lineStyle.curveness"
+          :min="0"
+          :step="0.01"
+          placeholder="弯曲程度"
+          size="small"
+        ></n-input-number>
         </SettingItem>
       </SettingItemBox>
       <SettingItemBox name="图例">
@@ -32,61 +32,10 @@
             size="small"
             :modes="['hex']"
             v-model:value="optionData.legend.textStyle.color"
-          ></n-color-picker>
+        ></n-color-picker>
         </SettingItem>
         <SettingItem name="文本">
-          <n-input-number
-            v-model:value="optionData.legend.textStyle.fontSize"
-            :min="0"
-            :step="1"
-            size="small"
-            placeholder="文字大小"
-          >
-          </n-input-number>
-        </SettingItem>
-      </SettingItemBox>
-      <SettingItemBox name="力引导" v-if="optionData.series[0].force && graphConfig.layout == 'force'">
-        <SettingItem name="斥力因子" v-if="optionData.series[0].force.repulsion">
-          <n-input-number
-            v-model:value="optionData.series[0].force.repulsion"
-            :min="0"
-            :step="1"
-            size="small"
-            placeholder="斥力因子大小"
-          >
-          </n-input-number>
-        </SettingItem>
-        <SettingItem name="引力因子" v-if="optionData.series[0].force.gravity">
-          <n-input-number
-            v-model:value="optionData.series[0].force.gravity"
-            :min="0"
-            :step="0.1"
-            size="small"
-            placeholder="引力因子"
-          >
-          </n-input-number>
-        </SettingItem>
-        <SettingItem name="节点距离">
-          <n-input-number
-            v-model:value="optionData.series[0].force.edgeLength"
-            :min="0"
-            :step="1"
-            size="small"
-            placeholder="节点距离"
-          >
-          </n-input-number>
-        </SettingItem>
-        <SettingItem name="迭代动画">
-          <n-select v-model:value="graphConfig.force.layoutAnimation" :options="LayoutAnimation" size="small" />
-        </SettingItem>
-        <SettingItem name="节点速度">
-          <n-input-number
-            v-model:value="optionData.series[0].force.friction"
-            :min="0"
-            :step="0.1"
-            size="small"
-            placeholder="节点速度"
-          >
+          <n-input-number v-model:value="optionData.legend.textStyle.fontSize" :min="0" :step="1" size="small" placeholder="文字大小">
           </n-input-number>
         </SettingItem>
       </SettingItemBox>
@@ -97,7 +46,7 @@
 <script setup lang="ts">
 import { PropType, computed } from 'vue'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { option, GraphLayout, LabelSwitch, LabelPosition, LayoutAnimation } from './config'
+import { option, GraphLayout, LabelSwitch, LabelPosition } from './config'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 
 const props = defineProps({
@@ -107,7 +56,7 @@ const props = defineProps({
   }
 })
 
-const graphConfig = computed<(typeof option.series)[0]>(() => {
+const graphConfig = computed<typeof option.series[0]>(() => {
   return props.optionData.series[0]
 })
 </script>

src/packages/components/Charts/Mores/Graph/index.vue

@@ -1,18 +1,10 @@
 <template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="(option as EChartsOption)"
-    :manual-update="isPreview()"
-    autoresize
-  ></v-chart>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, PropType, watch } from 'vue'
 import VChart from 'vue-echarts'
-import { EChartsOption } from 'echarts'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import dataJson from './data.json'
 import { use } from 'echarts/core'

src/packages/components/Charts/Mores/Heatmap/index.vue

@@ -1,103 +1,95 @@
-<template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="(option as EChartsOption)"
-    :manual-update="isPreview()"
-    autoresize
-  ></v-chart>
-</template>
-
-<script setup lang="ts">
-import { ref, watch, computed, PropType } from 'vue'
-import VChart from 'vue-echarts'
-import { EChartsOption } from 'echarts'
-import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
-import dataJson from './data.json'
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-import { HeatmapChart } from 'echarts/charts'
-import { includes } from './config'
-import { mergeTheme, setOption } from '@/packages/public/chart'
-import { useChartDataFetch } from '@/hooks'
-import { CreateComponentType } from '@/packages/index.d'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview } from '@/utils'
-import {
-  DatasetComponent,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent,
-  VisualMapComponent
-} from 'echarts/components'
-
-const props = defineProps({
-  themeSetting: {
-    type: Object,
-    required: true
-  },
-  themeColor: {
-    type: Object,
-    required: true
-  },
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
-
-use([
-  DatasetComponent,
-  CanvasRenderer,
-  HeatmapChart,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent,
-  VisualMapComponent
-])
-
-const option = computed(() => {
-  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-
-const vChartRef = ref<typeof VChart>()
-
-const dataSetHandle = (dataset: typeof dataJson) => {
-  const { seriesData, xAxis, yAxis } = dataset
-  if (xAxis) {
-    // @ts-ignore
-    props.chartConfig.option.xAxis.data = xAxis
-  }
-  if (yAxis) {
-    // @ts-ignore
-    props.chartConfig.option.yAxis.data = yAxis
-  }
-  if (seriesData) {
-    props.chartConfig.option.series[0].data = seriesData
-  }
-  if (vChartRef.value && isPreview()) {
-    setOption(vChartRef.value, props.chartConfig.option)
-  }
-}
-
-watch(
-  () => props.chartConfig.option.dataset,
-  newData => {
-    try {
-      dataSetHandle(newData)
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: typeof dataJson) => {
-  dataSetHandle(newData)
-})
-</script>
+<template>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+</template>
+
+<script setup lang="ts">
+import { ref, watch, computed, PropType } from 'vue'
+import VChart from 'vue-echarts'
+import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
+import dataJson from './data.json'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { HeatmapChart } from 'echarts/charts'
+import { includes } from './config'
+import { mergeTheme, setOption } from '@/packages/public/chart'
+import { useChartDataFetch } from '@/hooks'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import {
+  DatasetComponent,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+  VisualMapComponent
+} from 'echarts/components'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
+
+use([
+  DatasetComponent,
+  CanvasRenderer,
+  HeatmapChart,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+  VisualMapComponent
+])
+
+const option = computed(() => {
+  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+
+const vChartRef = ref<typeof VChart>()
+
+const dataSetHandle = (dataset: typeof dataJson) => {
+  const { seriesData, xAxis, yAxis } = dataset
+  if (xAxis) {
+    // @ts-ignore
+    props.chartConfig.option.xAxis.data = xAxis
+  }
+  if (yAxis) {
+    // @ts-ignore
+    props.chartConfig.option.yAxis.data = yAxis
+  }
+  if (seriesData) {
+    props.chartConfig.option.series[0].data = seriesData
+  }
+  if (vChartRef.value && isPreview()) {
+    setOption(vChartRef.value, props.chartConfig.option)
+  }
+}
+
+watch(
+  () => props.chartConfig.option.dataset,
+  newData => {
+    try {
+      dataSetHandle(newData)
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  {
+    deep: false
+  }
+)
+
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: typeof dataJson) => {
+  dataSetHandle(newData)
+})
+</script>

src/packages/components/Charts/Mores/Process/index.vue

@@ -3,7 +3,7 @@
     :type="type"
     :height="h"
     :processing="processing"
-    :percentage="dataset"
+    :percentage="option.dataset"
     :indicator-placement="indicatorPlacement"
     :color="color"
     :rail-color="railColor"
@@ -15,7 +15,7 @@
         fontSize: `${indicatorTextSize}px`
       }"
     >
-      {{ dataset }} {{ unit }}
+      {{ option.dataset }} {{ unit }}
     </n-text>
   </n-progress>
 </template>

src/packages/components/Charts/Mores/index.ts

@@ -8,14 +8,4 @@ import { DialConfig } from './Dial/index'
 import { SankeyConfig } from './Sankey/index'
 import { GraphConfig } from './Graph/index'
 
-export default [
-  ProcessConfig,
-  RadarConfig,
-  FunnelConfig,
-  HeatmapConfig,
-  WaterPoloConfig,
-  TreeMapConfig,
-  GraphConfig,
-  SankeyConfig,
-  DialConfig
-]
+export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, WaterPoloConfig, TreeMapConfig, GraphConfig, SankeyConfig, DialConfig]

src/packages/components/Charts/Pies/PieCircle/config.vue

@@ -7,22 +7,6 @@
         </n-input-number>
       </SettingItem>
     </SettingItemBox>
-    <!-- 中心标题 -->
-    <SettingItemBox v-if="config.title" name="标题">
-      <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="字体大小">
-        <n-input-number
-          v-model:value="config.title.textStyle.fontSize"
-          :min="0"
-          :step="1"
-          size="small"
-          placeholder="字体大小"
-        >
-        </n-input-number>
-      </SettingItem>
-    </SettingItemBox>
     <!-- Echarts 全局设置 -->
     <SettingItemBox name="进度条">
       <SettingItem name="颜色">
@@ -47,8 +31,24 @@
         ></n-color-picker>
       </SettingItem>
     </SettingItemBox>
+    <!-- 中心标题 -->
+    <SettingItemBox v-if="config.title" name="标题">
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
+      </SettingItem>
+      <SettingItem name="字体大小">
+        <n-input-number
+          v-model:value="config.title.textStyle.fontSize"
+          :min="0"
+          :step="1"
+          size="small"
+          placeholder="字体大小"
+        >
+        </n-input-number>
+      </SettingItem>
+    </SettingItemBox>
     <!-- 其他样式 -->
-    <SettingItemBox name="轨道">
+    <SettingItemBox name="轨道样式">
       <SettingItem name="颜色">
         <n-color-picker size="small" :modes="['hex']" v-model:value="item.data[1].itemStyle.color"></n-color-picker>
       </SettingItem>
@@ -69,18 +69,6 @@
           v-model:value="item.data[1].itemStyle.shadowColor"
         ></n-color-picker>
       </SettingItem>
-      <SettingItem name="轨道宽度">
-        <n-select
-          v-model:value="item.radius[0]"
-          size="small"
-          :options="[
-            { label: '窄', value: '75%' },
-            { label: '中', value: '60%' },
-            { label: '宽', value: '45%' },
-            { label: '更宽', value: '30%' }
-          ]"
-        />
-      </SettingItem>
     </SettingItemBox>
   </CollapseItem>
 </template>

src/packages/components/Charts/Pies/PieCircle/index.vue

@@ -41,7 +41,7 @@ const option = reactive({
 const dataHandle = (newData: any) => {
   const d = parseFloat(`${newData}`) * 100
   let config = props.chartConfig.option
-  config.title.text = `${+d.toFixed(2)}%`
+  config.title.text = d.toFixed(2) + '%'
   config.series[0].data[0].value[0] = d
   config.series[0].data[1].value[0] = 100 - d
   option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
@@ -68,7 +68,7 @@ watch(
 useChartDataFetch(props.chartConfig, useChartEditStore, (resData: number) => {
   let d = parseFloat(`${resData}`) * 100
   // @ts-ignore
-  option.value.title.text = `${+d.toFixed(2)}%`
+  option.value.title.text = d.toFixed(2) + '%'
   // @ts-ignore
   option.value.series[0].data[0].value[0] = d
   // @ts-ignore

src/packages/components/Charts/Pies/PieCommon/index.vue

@@ -134,10 +134,7 @@ watch(
 )
 
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: typeof dataJson) => {
-  clearPieInterval()
-  if (props.chartConfig.option.isCarousel) {
-    addPieInterval(newData)
-  }
+  addPieInterval(newData)
 })
 
 onMounted(() => {

src/packages/components/Charts/index.d.ts

@@ -14,6 +14,5 @@ export enum ChatCategoryEnumName {
   LINE = '折线图',
   SCATTER = '散点图',
   MAP = '地图',
-  COMBINATION = '组合图',
   MORE = '更多'
 }

src/packages/components/Decorates/Mores/FlipperNumber/index.vue

@@ -63,7 +63,7 @@ watch(
   () => props.chartConfig.option,
   newVal => {
     try {
-      updateDatasetHandler((newVal as any as OptionType).dataset)
+      updateDatasetHandler((newVal as OptionType).dataset)
     } catch (error) {
       console.log(error)
     }

src/packages/components/Decorates/Mores/FullScreen/config.ts

@@ -1,18 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { FullScreenConfig } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
-  border: 6,
-  bgColor: '#84a5e9',
-  borderColor: '#84a5e9'
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = FullScreenConfig.key
-  public attr = { ...chartInitConfig, w: 150, h: 150, zIndex: -1 }
-  public chartConfig = cloneDeep(FullScreenConfig)
-  public option = cloneDeep(option)
-}

src/packages/components/Decorates/Mores/FullScreen/config.vue

@@ -1,28 +0,0 @@
-<template>
-  <CollapseItem name="全屏按钮" expanded>
-    <SettingItemBox name="按钮">
-      <SettingItem name="背景色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.bgColor"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="边框色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.borderColor"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="边框大小">
-        <n-input-number v-model:value="optionData.border" size="small" :step="0.5" :min="0"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-</script>

src/packages/components/Decorates/Mores/FullScreen/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const FullScreenConfig: ConfigType = {
-  key: 'FullScreen',
-  chartKey: 'VFullScreen',
-  conKey: 'VCFullScreen',
-  title: '全屏按钮',
-  category: ChatCategoryEnum.MORE,
-  categoryName: ChatCategoryEnumName.MORE,
-  package: PackagesCategoryEnum.DECORATES,
-  chartFrame: ChartFrameEnum.STATIC,
-  image: 'fullScreen.png'
-}

src/packages/components/Decorates/Mores/FullScreen/index.vue

@@ -1,111 +0,0 @@
-<template>
-  <svg @click="toggleFullscreen" v-if="!isFullscreen" viewBox="0 0 1024 1024">
-    <path
-      d="M665.6 1017.6c-19.2 0-38.4-19.2-38.4-38.4s19.2-38.4 38.4-38.4h268.8l6.4-268.8c0-19.2 19.2-38.4 38.4-38.4s38.4 19.2 38.4 38.4v294.4c0 32-25.6 51.2-51.2 51.2h-300.8zM51.2 396.8c-19.2 0-38.4-19.2-38.4-38.4V64C12.8 32 38.4 12.8 64 12.8h294.4c19.2 0 38.4 19.2 38.4 38.4s-19.2 38.4-38.4 38.4H89.6v268.8c0 19.2-19.2 38.4-38.4 38.4zM64 1017.6c-32 0-51.2-25.6-51.2-51.2v-294.4c0-19.2 19.2-38.4 38.4-38.4s38.4 19.2 38.4 38.4v217.6l198.4-198.4c6.4-6.4 19.2-12.8 25.6-12.8s19.2 6.4 25.6 12.8c6.4 6.4 12.8 19.2 12.8 25.6 0 12.8-6.4 19.2-12.8 25.6l-198.4 198.4h217.6c19.2 0 38.4 19.2 38.4 38.4s-19.2 38.4-38.4 38.4H64z m915.2-620.8c-19.2 0-38.4-19.2-38.4-38.4V140.8l-198.4 198.4c-6.4 6.4-19.2 12.8-25.6 12.8-12.8 0-19.2-6.4-25.6-12.8-12.8-12.8-12.8-38.4 0-51.2l198.4-198.4h-217.6c-19.2 0-38.4-19.2-38.4-38.4s19.2-38.4 38.4-38.4h294.4c32 0 51.2 25.6 51.2 51.2v294.4c0 19.2-19.2 38.4-38.4 38.4z"
-      class="fullScreen-border"
-    ></path>
-  </svg>
-  <svg @click="toggleFullscreen" v-else viewBox="0 0 1024 1024">
-    <path
-      d="M379.336 697.237L153.362 921.55c-14.11 14.007-36.905 13.922-50.912-0.188-14.007-14.11-13.922-36.905 0.188-50.912l227.6-225.927H138.645c-18.99 0-34.385-15.446-34.385-34.5 0-19.053 15.395-34.5 34.385-34.5H413.72c18.99 0 34.384 15.447 34.384 34.5v276c0 9.15-3.622 17.926-10.07 24.396a34.326 34.326 0 0 1-24.314 10.104 34.326 34.326 0 0 1-24.314-10.104 34.559 34.559 0 0 1-10.071-24.396V697.237z m263.395-366.88l227.813-227.813c14.059-14.059 36.853-14.059 50.912 0 14.059 14.059 14.059 36.853 0 50.912l-225.18 225.18h187.147c18.99 0 34.385 15.445 34.385 34.5 0 19.053-15.395 34.5-34.385 34.5H608.346c-18.99 0-34.384-15.447-34.384-34.5v-276c0-9.15 3.622-17.926 10.07-24.396a34.326 34.326 0 0 1 24.314-10.105c9.12 0 17.865 3.635 24.314 10.105a34.559 34.559 0 0 1 10.07 24.395v193.223zM99.385 410a34.326 34.326 0 0 1-24.314-10.105A34.559 34.559 0 0 1 65 375.5v-276C65 80.446 80.395 65 99.385 65h275.077c18.99 0 34.384 15.446 34.384 34.5 0 19.054-15.394 34.5-34.384 34.5H133.769v241.5c0 9.15-3.622 17.925-10.07 24.395A34.326 34.326 0 0 1 99.384 410z m825.23 552H649.538c-18.99 0-34.384-15.446-34.384-34.5 0-19.054 15.394-34.5 34.384-34.5h240.693V651.5c0-19.054 15.394-34.5 34.384-34.5 18.99 0 34.385 15.446 34.385 34.5v276c0 19.054-15.395 34.5-34.385 34.5z"
-      class="fullScreen-border"
-    ></path>
-  </svg>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs, ref, onMounted, onUnmounted } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-import { option } from './config'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType & typeof option>,
-    required: true
-  }
-})
-
-let { border, bgColor, borderColor } = toRefs(props.chartConfig.option)
-const isFullscreen = ref(false)
-const checkFullscreen = () => {
-  isFullscreen.value = !!(
-    document.fullscreenElement ||
-    (document as any).webkitFullscreenElement ||
-    (document as any).mozFullScreenElement ||
-    (document as any).msFullscreenElement
-  )
-}
-checkFullscreen()
-
-const requestFullscreen = (element: Element) => {
-  if (element.requestFullscreen) {
-    element.requestFullscreen()
-  } else if ((document as any).mozRequestFullScreen) {
-    /* Firefox */
-    (document as any).mozRequestFullScreen()
-  } else if ((document as any).webkitRequestFullscreen) {
-    /* Chrome, Safari and Opera */
-    (document as any).webkitRequestFullscreen()
-  } else if ((document as any).msRequestFullscreen) {
-    /* IE/Edge */
-    (document as any).msRequestFullscreen()
-  }
-}
-
-const exitFullscreen = () => {
-  if (document.fullscreenElement && document.exitFullscreen) {
-    document.exitFullscreen()
-  } else if ((document as any).mozFullScreenElement && (document as any).mozCancelFullScreen) {
-    /* Firefox */
-    (document as any).mozCancelFullScreen()
-  } else if ((document as any).webkitFullscreenElement && (document as any).webkitExitFullscreen) {
-    /* Chrome, Safari and Opera */
-    (document as any).webkitExitFullscreen()
-  } else if ((document as any).msFullscreenElement && (document as any).msExitFullscreen) {
-    /* IE/Edge */
-    (document as any).msExitFullscreen()
-  }
-}
-
-const toggleFullscreen = () => {
-  if (!isFullscreen.value) {
-    requestFullscreen(document.documentElement)
-  } else {
-    exitFullscreen()
-  }
-  isFullscreen.value = !isFullscreen.value
-  // 由于全屏状态的改变不会立即生效，所以需要延迟一段时间再去获取全屏状态
-  setTimeout(() => {
-    checkFullscreen()
-  }, 1000)
-}
-
-// 监听全屏状态的改变，保证多个全屏组件的状态一致
-onMounted(() => {
-  document.addEventListener('fullscreenchange', checkFullscreen)
-  document.addEventListener('webkitfullscreenchange', checkFullscreen)
-  document.addEventListener('mozfullscreenchange', checkFullscreen)
-  document.addEventListener('MSFullscreenChange', checkFullscreen)
-})
-
-onUnmounted(() => {
-  document.removeEventListener('fullscreenchange', checkFullscreen)
-  document.removeEventListener('webkitfullscreenchange', checkFullscreen)
-  document.removeEventListener('mozfullscreenchange', checkFullscreen)
-  document.removeEventListener('MSFullscreenChange', checkFullscreen)
-})
-</script>
-
-<style lang="scss" scoped>
-svg {
-  display: block;
-  width: 100%;
-  height: 100%;
-  cursor: pointer;
-}
-.fullScreen-border {
-  stroke: v-bind('borderColor');
-  stroke-width: v-bind('border+"px"');
-  fill: v-bind('bgColor');
-}
-</style>

src/packages/components/Decorates/Mores/index.ts

@@ -1,19 +1,9 @@
 import { NumberConfig } from './Number/index'
 import { TimeCommonConfig } from './TimeCommon/index'
 import { ClockConfig } from './Clock/index'
-import { FullScreenConfig } from './FullScreen/index'
 import { CountDownConfig } from './CountDown/index'
 import { FlipperNumberConfig } from './FlipperNumber'
 import { PipelineHConfig } from './PipelineH/index'
 import { PipelineVConfig } from './PipelineV/index'
 
-export default [
-  NumberConfig,
-  FlipperNumberConfig,
-  TimeCommonConfig,
-  CountDownConfig,
-  ClockConfig,
-  FullScreenConfig,
-  PipelineHConfig,
-  PipelineVConfig
-]
+export default [NumberConfig, FlipperNumberConfig, TimeCommonConfig, CountDownConfig, ClockConfig, PipelineHConfig, PipelineVConfig]

src/packages/components/Decorates/Three/ThreeEarth01/code/world/Basic.ts

@@ -1,63 +1,62 @@
-/**
- * 创建 threejs 四大天王
- * 场景、相机、渲染器、控制器
- */
-
-import * as THREE from 'three'
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
-
-export class Basic {
-  public scene!: THREE.Scene
-  public camera!: THREE.PerspectiveCamera
-  public renderer!: THREE.WebGLRenderer
-  public controls!: OrbitControls
-  public dom: HTMLElement
-
-  constructor(dom: HTMLElement) {
-    this.dom = dom
-    this.initScenes()
-    this.setControls()
-  }
-
-  /**
-   * 初始化场景
-   */
-  initScenes() {
-    this.scene = new THREE.Scene()
-
-    this.camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 100000)
-    this.camera.position.set(0, 30, -250)
-
-    this.renderer = new THREE.WebGLRenderer({
-      // canvas: this.dom,
-      alpha: true, // 透明
-      antialias: true, // 抗锯齿
-      preserveDrawingBuffer: true
-    })
-    this.renderer.setPixelRatio(window.devicePixelRatio) // 设置屏幕像素比
-    this.renderer.setSize(window.innerWidth, window.innerHeight) // 设置渲染器宽高
-    this.dom.appendChild(this.renderer.domElement) // 添加到dom中
-  }
-
-  /**
-   * 设置控制器
-   */
-  setControls() {
-    // 鼠标控制      相机，渲染dom
-    this.controls = new OrbitControls(this.camera, this.renderer.domElement)
-
-    this.controls.autoRotateSpeed = 3
-    // 使动画循环使用时阻尼或自转 意思是否有惯性
-    this.controls.enableDamping = true
-    // 动态阻尼系数 就是鼠标拖拽旋转灵敏度
-    this.controls.dampingFactor = 0.05
-    // 是否可以缩放
-    this.controls.enableZoom = true
-    // 设置相机距离原点的最远距离
-    this.controls.minDistance = 100
-    // 设置相机距离原点的最远距离
-    this.controls.maxDistance = 300
-    // 是否开启右键拖拽
-    this.controls.enablePan = false
-  }
-}
+/**
+ * 创建 threejs 四大天王
+ * 场景、相机、渲染器、控制器
+ */
+
+import * as THREE from 'three'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+
+export class Basic {
+  public scene!: THREE.Scene
+  public camera!: THREE.PerspectiveCamera
+  public renderer!: THREE.WebGLRenderer
+  public controls!: OrbitControls
+  public dom: HTMLElement
+
+  constructor(dom: HTMLElement) {
+    this.dom = dom
+    this.initScenes()
+    this.setControls()
+  }
+
+  /**
+   * 初始化场景
+   */
+  initScenes() {
+    this.scene = new THREE.Scene()
+
+    this.camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 100000)
+    this.camera.position.set(0, 30, -250)
+
+    this.renderer = new THREE.WebGLRenderer({
+      // canvas: this.dom,
+      alpha: true, // 透明
+      antialias: true // 抗锯齿
+    })
+    this.renderer.setPixelRatio(window.devicePixelRatio) // 设置屏幕像素比
+    this.renderer.setSize(window.innerWidth, window.innerHeight) // 设置渲染器宽高
+    this.dom.appendChild(this.renderer.domElement) // 添加到dom中
+  }
+
+  /**
+   * 设置控制器
+   */
+  setControls() {
+    // 鼠标控制      相机，渲染dom
+    this.controls = new OrbitControls(this.camera, this.renderer.domElement)
+
+    this.controls.autoRotateSpeed = 3
+    // 使动画循环使用时阻尼或自转 意思是否有惯性
+    this.controls.enableDamping = true
+    // 动态阻尼系数 就是鼠标拖拽旋转灵敏度
+    this.controls.dampingFactor = 0.05
+    // 是否可以缩放
+    this.controls.enableZoom = true
+    // 设置相机距离原点的最远距离
+    this.controls.minDistance = 100
+    // 设置相机距离原点的最远距离
+    this.controls.maxDistance = 300
+    // 是否开启右键拖拽
+    this.controls.enablePan = false
+  }
+}

src/packages/components/Icons/Default/Icon/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="go-icon-box">
-    <GoIconify :icon="((dataset || '') as string)" :color="color" :width="size" :rotate="rotate" />
+    <Icon :icon="((dataset || '') as string)" :color="color" :width="size" :rotate="rotate" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
-import { GoIconify } from '@/components/GoIconify'
+import { Icon } from '@iconify/vue'
 
 const props = defineProps({
   chartConfig: {

src/packages/components/Informations/Inputs/InputsDate/config.ts

@@ -4,7 +4,7 @@ import { PublicConfigClass } from '@/packages/public'
 import { CreateComponentType } from '@/packages/index.d'
 import { chartInitConfig } from '@/settings/designSetting'
 import { COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum'
-import { interactActions, ComponentInteractEventEnum, DefaultTypeEnum, DifferUnitEnum } from './interact'
+import { interactActions, ComponentInteractEventEnum } from './interact'
 import { InputsDateConfig } from './index'
 
 export const option = {
@@ -12,14 +12,9 @@ export const option = {
   [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATE,
   // 下拉展示
   isPanel: 0,
-  // 默认值
-  dataset: dayjs().valueOf() as number | number[] | null,
-  // 默认值类型
-  defaultType: DefaultTypeEnum.STATIC,
-  // 动态默认值偏移单位
-  differUnit: [DifferUnitEnum.DAY, DifferUnitEnum.DAY],
-  // 动态默认值偏移值
-  differValue: [0, 0]
+  dataset: dayjs().valueOf(),
+  differValue: 0
+
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

src/packages/components/Informations/Inputs/InputsDate/config.vue

@@ -8,67 +8,39 @@
   <collapse-item name="时间配置" :expanded="true">
     <setting-item-box name="基础">
       <setting-item name="类型">
-        <n-select v-model:value="optionData.componentInteractEventKey" size="small" :options="datePickerTypeOptions"
-                  @update:value="datePickerTypeUpdate"/>
+        <n-select v-model:value="optionData.componentInteractEventKey" size="small" :options="datePickerTypeOptions" />
       </setting-item>
     </setting-item-box>
 
-    <setting-item-box name="默认值">
-      <setting-item name="类型">
-        <n-select v-model:value="optionData.defaultType" size="small" :options="defaultTypeOptions"
-                  @update:value="defaultTypeUpdate" />
-      </setting-item>
+    <setting-item-box name="默认值" :alone="true">
+      <n-date-picker size="small" v-model:value="optionData.dataset" :type="optionData.componentInteractEventKey" />
+    </setting-item-box>
 
-    </setting-item-box>
-    <setting-item-box v-if="optionData.defaultType === DefaultTypeEnum.STATIC" :alone="true">
-      <setting-item name="静态默认值">
-        <n-date-picker size="small" clearable v-model:value="optionData.dataset" :type="optionData.componentInteractEventKey" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box v-if="optionData.defaultType === DefaultTypeEnum.DYNAMIC" >
+    <setting-item-box :alone="true">
       <template #name>
-        <n-text></n-text>
+        <n-text>动态</n-text>
         <n-tooltip trigger="hover">
           <template #trigger>
             <n-icon size="21" :depth="3">
               <help-outline-icon></help-outline-icon>
             </n-icon>
           </template>
-          <span>打开页面时浏览器操作系统的系统时间+偏移量(单位)</span>
+          <n-text>动态值不为0时，默认值:取当天时间相加当前值</n-text>
         </n-tooltip>
       </template>
-      <setting-item :name="differValueName">
-        <n-input-number v-model:value="optionData.differValue[0]" class="input-num-width" size="small">
-          <template #suffix>
-            {{DifferUnitObject[optionData.differUnit[0]]}}
-          </template>
-        </n-input-number>
-      </setting-item>
-      <setting-item :name="differUnitName">
-        <n-select v-model:value="optionData.differUnit[0]" size="small" :options="differUnitOptions" />
-      </setting-item>
-      <setting-item v-if="isRange" name="结束值动态偏移量">
-        <n-input-number v-model:value="optionData.differValue[1]" class="input-num-width" size="small">
-          <template #suffix>
-            {{DifferUnitObject[optionData.differUnit[1]]}}
-          </template>
-        </n-input-number>
-      </setting-item>
-      <setting-item v-if="isRange" name="结束值偏移单位">
-        <n-select v-model:value="optionData.differUnit[1]" size="small" :options="differUnitOptions" />
-      </setting-item>
+      <n-input-number v-model:value="optionData.differValue" class="input-num-width" size="small" :min="-40" :max="40">
+        <template #suffix> 天 </template>
+      </n-input-number>
     </setting-item-box>
-
   </collapse-item>
 </template>
 
 <script lang="ts" setup>
-import { PropType, computed } from 'vue'
+import { PropType } from 'vue'
 import { icon } from '@/plugins'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { option } from './config'
-import { ComponentInteractEventEnum, DefaultTypeEnum, DifferUnitEnum, DifferUnitObject } from './interact'
-import dayjs from "dayjs";
+import { ComponentInteractEventEnum } from './interact'
 
 const { HelpOutlineIcon } = icon.ionicons5
 
@@ -128,87 +100,4 @@ const datePickerTypeOptions = [
     value: ComponentInteractEventEnum.QUARTER_RANGE
   }
 ]
-
-const defaultTypeOptions = [
-  {
-    label: '静态',
-    value: DefaultTypeEnum.STATIC
-  },
-  {
-    label: '动态',
-    value: DefaultTypeEnum.DYNAMIC
-  },
-  {
-    label: '无',
-    value: DefaultTypeEnum.NONE
-  }
-]
-
-
-const differUnitOptions = [
-  // ManipulateType
-  {
-    value: DifferUnitEnum.DAY,
-    label: DifferUnitObject[DifferUnitEnum.DAY]
-  },
-  {
-    value: DifferUnitEnum.WEEK,
-    label: DifferUnitObject[DifferUnitEnum.WEEK]
-  },
-  {
-    value: DifferUnitEnum.MONTH,
-    label: DifferUnitObject[DifferUnitEnum.MONTH]
-  },
-  {
-    value: DifferUnitEnum.QUARTER,
-    label: DifferUnitObject[DifferUnitEnum.QUARTER]
-  },
-  {
-    value: DifferUnitEnum.YEAR,
-    label: DifferUnitObject[DifferUnitEnum.YEAR]
-  },
-  {
-    value: DifferUnitEnum.HOUR,
-    label: DifferUnitObject[DifferUnitEnum.HOUR]
-  },
-  {
-    value: DifferUnitEnum.MINUTE,
-    label: DifferUnitObject[DifferUnitEnum.MINUTE]
-  },
-  {
-    value: DifferUnitEnum.SECOND,
-    label: DifferUnitObject[DifferUnitEnum.SECOND]
-  },
-  {
-    value: DifferUnitEnum.MILLISECOND,
-    label: DifferUnitObject[DifferUnitEnum.MILLISECOND]
-  }
-]
-
-
-const isRange = computed(() => {
-  return props.optionData.componentInteractEventKey.endsWith('range')
-})
-
-const differValueName = computed(() => {
-  return isRange.value ? '开始值动态偏移量' : '动态偏移量'
-})
-
-const differUnitName = computed(() => {
-  return isRange.value ? '开始值偏移单位' : '偏移单位'
-})
-
-const datePickerTypeUpdate = () => {
-  props.optionData.dataset = isRange.value ? [dayjs().valueOf(), dayjs().valueOf()] : dayjs().valueOf()
-}
-
-const defaultTypeUpdate = (v: string) => {
-  if (v === DefaultTypeEnum.STATIC) {
-    datePickerTypeUpdate()
-  } else {
-    // DefaultTypeEnum.
-    props.optionData.dataset = null
-  }
-}
-
 </script>

src/packages/components/Informations/Inputs/InputsDate/index.vue

@@ -1,7 +1,6 @@
 <template>
   <n-date-picker
     v-model:value="option.dataset"
-    clearable
     :panel="!!chartConfig.option.isPanel"
     :type="chartConfig.option.componentInteractEventKey"
     :style="`width:${w}px;`"
@@ -10,15 +9,13 @@
 </template>
 
 <script setup lang="ts">
-import { computed, PropType, ref, shallowReactive, toRefs, watch } from 'vue'
+import { PropType, toRefs, ref, shallowReactive, watch } from 'vue'
+import dayjs from 'dayjs'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useChartInteract } from '@/hooks'
 import { InteractEventOn } from '@/enums/eventEnum'
-import {ComponentInteractEventEnum, ComponentInteractParamsEnum, DefaultTypeEnum} from './interact'
-import dayjs, {ManipulateType} from 'dayjs'
-import quarterOfYear from 'dayjs/plugin/quarterOfYear';
-
+import { ComponentInteractParamsEnum } from './interact'
 
 const props = defineProps({
   chartConfig: {
@@ -34,107 +31,61 @@ const option = shallowReactive({
   dataset: props.chartConfig.option.dataset
 })
 
-const isRange = computed(() => {
-  return props.chartConfig.option.componentInteractEventKey.endsWith('range')
-})
-
 // 监听事件改变
-const onChange = (v: number | number[] | null) => {
-  if (isRange.value) {
-    let dateStart = null
-    let dateEnd = null
-    let daterange = null
-    if(v instanceof Array){
-      dateStart = v[0]
-      dateEnd = v[1]
-      daterange = `${v[0]}-${v[1]}`
-    }
+const onChange = (v: number | number[]) => {
+  if (v instanceof Array) {
     // 存储到联动数据
     useChartInteract(
-        props.chartConfig,
-        useChartEditStore,
-        {
-          [ComponentInteractParamsEnum.DATE_START]: dateStart,
-          [ComponentInteractParamsEnum.DATE_END]: dateEnd,
-          [ComponentInteractParamsEnum.DATE_RANGE]: daterange
-        },
-        InteractEventOn.CHANGE
+      props.chartConfig,
+      useChartEditStore,
+      {
+        [ComponentInteractParamsEnum.DATE_START]: v[0] || dayjs().valueOf(),
+        [ComponentInteractParamsEnum.DATE_END]: v[1] || dayjs().valueOf(),
+        [ComponentInteractParamsEnum.DATE_RANGE]: `${v[0] || dayjs().valueOf()}-${v[1] || dayjs().valueOf()}`
+      },
+      InteractEventOn.CHANGE
     )
   } else {
     // 存储到联动数据
     useChartInteract(
-        props.chartConfig,
-        useChartEditStore,
-        { [ComponentInteractParamsEnum.DATE]: v },
-        InteractEventOn.CHANGE
+      props.chartConfig,
+      useChartEditStore,
+      { [ComponentInteractParamsEnum.DATE]: v || dayjs().valueOf() },
+      InteractEventOn.CHANGE
     )
   }
 }
 
-const getDiffDate = (type: ComponentInteractEventEnum, date: dayjs.Dayjs) => {
-  // 注册 quarterOfYear 插件
-  dayjs.extend(quarterOfYear)
-  switch (type) {
-    case ComponentInteractEventEnum.DATE:
-    case ComponentInteractEventEnum.DATE_RANGE:
-      date = date.startOf('day')
-      break
-    case ComponentInteractEventEnum.MONTH:
-    case ComponentInteractEventEnum.MONTH_RANGE:
-      date = date.startOf('month')
-      break
-    case ComponentInteractEventEnum.YEAR:
-    case ComponentInteractEventEnum.YEAR_RANGE:
-      date = date.startOf('year')
-        break
-    case ComponentInteractEventEnum.QUARTER:
-    case ComponentInteractEventEnum.QUARTER_RANGE:
-      date = date.startOf('quarter')
-      break
-    default:
-      break
-  }
-  return date
-}
-
 watch(
-    () => {
-      return {
-        type: props.chartConfig.option.componentInteractEventKey as ComponentInteractEventEnum,
-        defaultType: props.chartConfig.option.defaultType as string,
-        differValue: props.chartConfig.option.differValue as number[],
-        differUnit: props.chartConfig.option.differUnit as ManipulateType[],
-        dataset: props.chartConfig.option.dataset as number | number[] | null,
-      };
-    },
-    (newData, oldData) => {
-      const hasTypeChanged = newData.type !== oldData?.type;
-      const hasDefaultTypeChanged = newData.defaultType !== oldData?.defaultType;
-      const hasDifferValueChanged = newData.differValue !== oldData?.differValue;
-      const hasDifferUnitChanged = newData.differUnit !== oldData?.differUnit;
+  () => props.chartConfig.option.dataset,
+  (newData: number | number[]) => {
+    option.dataset = newData
+    // 关联目标组件首次请求带上默认内容
+    onChange(newData)
+  },
+  {
+    immediate: true
+  }
+)
 
-      if (hasTypeChanged || hasDefaultTypeChanged || hasDifferValueChanged || hasDifferUnitChanged) {
-        if (newData.defaultType === DefaultTypeEnum.NONE) {
-          props.chartConfig.option.dataset = null;
-        } else if (newData.defaultType === DefaultTypeEnum.DYNAMIC) {
-          let date = dayjs();
-          if (isRange.value) {
-            props.chartConfig.option.dataset = [
-             getDiffDate(newData.type,date.add(newData.differValue[0], newData.differUnit[0])).valueOf(),
-             getDiffDate(newData.type,date.add(newData.differValue[1], newData.differUnit[1])).valueOf(),
-            ];
-          } else {
-            props.chartConfig.option.dataset = getDiffDate(newData.type,date.add(newData.differValue[0], newData.differUnit[0])).valueOf()
-          }
-        }
-      }
-      option.dataset = props.chartConfig.option.dataset;
-      onChange(option.dataset);
-    },
-    {
-      immediate: true,
+// 手动更新
+watch(
+  () => props.chartConfig.option.differValue,
+  (newData: number) => {
+    if (props.chartConfig.option.differValue === 0) return
+    if (typeof option.dataset === 'object') {
+      option.dataset[0] = dayjs().add(newData, 'day').valueOf()
+      option.dataset[1] = dayjs().add(newData, 'day').valueOf()
+    } else {
+      option.dataset = dayjs().add(newData, 'day').valueOf()
     }
-);
+    // 关联目标组件首次请求带上默认内容
+    onChange(newData)
+  },
+  {
+    immediate: true
+  }
+)
 </script>
 
 <style lang="scss" scoped>

src/packages/components/Informations/Inputs/InputsDate/interact.ts

@@ -22,37 +22,6 @@ export enum ComponentInteractParamsEnum {
   DATE_RANGE = 'daterange'
 }
 
-export enum DefaultTypeEnum {
-  NONE = "none",
-  STATIC = "static",
-  DYNAMIC = "dynamic"
-}
-
-export enum DifferUnitEnum {
-  DAY = 'd',
-  WEEK = 'w',
-  MONTH = 'M',
-  QUARTER = 'Q',
-  YEAR = 'y',
-  HOUR = 'h',
-  MINUTE = 'm',
-  SECOND = 's',
-  MILLISECOND = 'ms',
-}
-
-export const DifferUnitObject = {
-  // https://day.js.org/docs/en/manipulate/add
-  [DifferUnitEnum.DAY]: '天',
-  [DifferUnitEnum.WEEK]: '周',
-  [DifferUnitEnum.MONTH]: '月',
-  [DifferUnitEnum.QUARTER]: '季度',
-  [DifferUnitEnum.YEAR]: '年',
-  [DifferUnitEnum.HOUR]: '小时',
-  [DifferUnitEnum.MINUTE]: '分钟',
-  [DifferUnitEnum.SECOND]: '秒',
-  [DifferUnitEnum.MILLISECOND]: '毫秒',
-}
-
 const time = [
   {
     value: ComponentInteractParamsEnum.DATE,

src/packages/components/Informations/Inputs/InputsInput/config.ts

@@ -1,24 +0,0 @@
-import cloneDeep from 'lodash/cloneDeep'
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum'
-import { interactActions, ComponentInteractEventEnum } from './interact'
-import {InputsInputConfig} from "./index";
-
-export const option = {
-    // 时间组件展示类型，必须和 interactActions 中定义的数据一致
-    [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATA,
-    // 默认值
-    inputValue: "0",
-    // 暴露配置内容给用户
-    dataset: ""
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-    public key = InputsInputConfig.key
-    public attr = { ...chartInitConfig, w: 260, h: 32, zIndex: -1 }
-    public chartConfig = cloneDeep(InputsInputConfig)
-    public interactActions = interactActions
-    public option = cloneDeep(option)
-}

src/packages/components/Informations/Inputs/InputsInput/config.vue

@@ -1,18 +0,0 @@
-<template>
-  <collapse-item name="输入框配置" :expanded="true">
-    <setting-item-box name="默认值" :alone="true">
-      <n-input  v-model:value="optionData.dataset"  placeholder="若未输入，则默认值为0"/>
-    </setting-item-box>
-  </collapse-item>
-</template>
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { CollapseItem, SettingItemBox } from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-</script>

src/packages/components/Informations/Inputs/InputsInput/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const InputsInputConfig: ConfigType = {
-    key: 'InputsInput',
-    chartKey: 'VInputsInput',
-    conKey: 'VCInputsInput',
-    title: '输入框',
-    category: ChatCategoryEnum.INPUTS,
-    categoryName: ChatCategoryEnumName.INPUTS,
-    package: PackagesCategoryEnum.INFORMATIONS,
-    chartFrame: ChartFrameEnum.STATIC,
-    image: 'inputs_select.png'
-}

src/packages/components/Informations/Inputs/InputsInput/index.vue

@@ -1,64 +0,0 @@
-<template>
-  <div>
-    <n-input :style="`width:${w}px;`" type="text"
-             v-model:value="option.value.dataset"
-             placeholder="请输入"
-             @change="onChange">
-
-    </n-input>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { PropType, toRefs, shallowReactive, watch } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { useChartInteract } from '@/hooks'
-import { InteractEventOn } from '@/enums/eventEnum'
-import { ComponentInteractParamsEnum } from './interact'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const { w, h } = toRefs(props.chartConfig.attr)
-const option = shallowReactive({
-  value: {
-    inputValue: props.chartConfig.option.inputValue,
-    dataset: props.chartConfig.option.dataset
-  }
-})
-
-const onChange = (v: string) => {
-  if(v == undefined) return;
-  // 存储到联动数据
-  useChartInteract(
-      props.chartConfig,
-      useChartEditStore,
-      { [ComponentInteractParamsEnum.DATA]: v },
-      InteractEventOn.CHANGE
-  )
-}
-
-// 手动更新
-watch(
-    () => props.chartConfig.option,
-    (newData: any) => {
-      option.value = newData
-      onChange(newData.inputValue)
-    },
-    {
-      immediate: true,
-      deep: true
-    }
-)
-
-</script>
-
-
-
-
-

src/packages/components/Informations/Inputs/InputsInput/interact.ts

@@ -1,27 +0,0 @@
-import { InteractEventOn, InteractActionsType } from '@/enums/eventEnum'
-
-// 时间组件类型
-export enum ComponentInteractEventEnum {
-    DATA = 'data'
-}
-
-// 联动参数
-export enum ComponentInteractParamsEnum {
-    DATA = 'data'
-}
-
-// 定义组件触发回调事件
-export const interactActions: InteractActionsType[] = [
-    {
-        interactType: InteractEventOn.CHANGE,
-        interactName: '选择完成',
-        componentEmitEvents: {
-            [ComponentInteractEventEnum.DATA]: [
-                {
-                    value: ComponentInteractParamsEnum.DATA,
-                    label: '选择项'
-                }
-            ]
-        }
-    }
-]

src/packages/components/Informations/Inputs/InputsPagination/config.ts

@@ -1,26 +0,0 @@
-import cloneDeep from 'lodash/cloneDeep'
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum'
-import { interactActions, ComponentInteractEventEnum } from './interact'
-import {InputsPaginationConfig} from "./index";
-
-export const option = {
-    // 时间组件展示类型，必须和 interactActions 中定义的数据一致
-    [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATA,
-    // 默认值
-    pageValue:1,
-    sizeValue:[2,4,8,10,20],
-    pageSize:4,
-    // 暴露配置内容给用户
-    dataset: 10
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-    public key = InputsPaginationConfig.key
-    public attr = { ...chartInitConfig, w: 395, h: 32, zIndex: -1 }
-    public chartConfig = cloneDeep(InputsPaginationConfig)
-    public interactActions = interactActions
-    public option = cloneDeep(option)
-}

src/packages/components/Informations/Inputs/InputsPagination/config.vue

@@ -1,35 +0,0 @@
-<template>
-    <collapse-item name="分页配置" :expanded="true">
-      <setting-item-box :alone="false" name="分页设置">
-        <setting-item  name="默认页码" :alone="true">
-          <n-input-number v-model:value="optionData.pageValue" size="small" placeholder="字体大小"></n-input-number>
-        </setting-item>
-        <setting-item  name="分页" :alone="true">
-          <n-select v-model:value="optionData.pageSize" size="small"
-                    :options="page" />
-        </setting-item>
-        <setting-item  name="页数" :alone="true">
-          <n-input-number v-model:value="optionData.dataset" size="small" placeholder="字体大小"></n-input-number>
-        </setting-item>
-      </setting-item-box>
-    </collapse-item>
-</template>
-<script setup lang="ts">
-import { PropType } from 'vue'
-import {CollapseItem, SettingItem, SettingItemBox} from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-
-const page = [
-  {label:'2',value:2},
-  {label:'4',value:4},
-  {label:'8',value:8},
-  {label:'10',value:10},
-  {label:'20',value:20}
-]
-defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-</script>

src/packages/components/Informations/Inputs/InputsPagination/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const InputsPaginationConfig: ConfigType = {
-    key: 'InputsPagination',
-    chartKey: 'VInputsPagination',
-    conKey: 'VCInputsPagination',
-    title: '分页',
-    category: ChatCategoryEnum.INPUTS,
-    categoryName: ChatCategoryEnumName.INPUTS,
-    package: PackagesCategoryEnum.INFORMATIONS,
-    chartFrame: ChartFrameEnum.STATIC,
-    image: 'inputs_pagination.png'
-}

src/packages/components/Informations/Inputs/InputsPagination/index.vue

@@ -1,66 +0,0 @@
-<template>
-  <div>
-    <n-pagination
-        @on-update:page="onChange" :style="`width:${w}px;`"
-        v-model:page="option.value.pageValue"
-        :page-count="option.value.dataset"
-        :page-slot="7"
-        show-size-picker
-        :page-sizes="option.value.sizeValue"
-        v-model:page-size="option.value.pageSize"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { PropType, toRefs, shallowReactive, watch } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { useChartInteract } from '@/hooks'
-import { InteractEventOn } from '@/enums/eventEnum'
-import { ComponentInteractParamsEnum } from './interact'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const { w, h } = toRefs(props.chartConfig.attr)
-const option = shallowReactive({
-  value: {
-    pageValue: props.chartConfig.option.pageValue,
-    dataset:props.chartConfig.option.dataset,
-    sizeValue:props.chartConfig.option.sizeValue,
-    pageSize:props.chartConfig.option.pageSize
-  }
-})
-
-const onChange = (v: number,v2:number) => {
-  if(v == undefined) return;
-  // 存储到联动数据
-  useChartInteract(
-      props.chartConfig,
-      useChartEditStore,
-      {
-        [ComponentInteractParamsEnum.DATA]: v ,
-        [ComponentInteractParamsEnum.DATA2]:v2
-      },
-      InteractEventOn.CHANGE
-  )
-}
-
-// 手动更新
-watch(
-    () => props.chartConfig.option,
-    (newData: any) => {
-      option.value = newData
-      onChange(newData.pageValue,newData.pageSize)
-    },
-    {
-      immediate: true,
-      deep: true
-    }
-)
-</script>

src/packages/components/Informations/Inputs/InputsPagination/interact.ts

@@ -1,32 +0,0 @@
-import { InteractEventOn, InteractActionsType } from '@/enums/eventEnum'
-
-// 时间组件类型
-export enum ComponentInteractEventEnum {
-    DATA = 'data'
-}
-
-// 联动参数
-export enum ComponentInteractParamsEnum {
-    DATA = 'data',
-    DATA2 = 'data2'
-}
-
-// 定义组件触发回调事件
-export const interactActions: InteractActionsType[] = [
-    {
-        interactType: InteractEventOn.CHANGE,
-        interactName: '选择完成',
-        componentEmitEvents: {
-            [ComponentInteractEventEnum.DATA]: [
-                {
-                    value: ComponentInteractParamsEnum.DATA,
-                    label: '页数'
-                },
-                {
-                    value: ComponentInteractParamsEnum.DATA2,
-                    label: '每页条数'
-                }
-            ]
-        }
-    }
-]

src/packages/components/Informations/Inputs/InputsTab/config.vue

@@ -1,10 +1,7 @@
 <template>
   <collapse-item name="标签页配置" :expanded="true">
-    <setting-item-box name="标签类型" :alone="true">
-      <n-select size="small" v-model:value="optionData.tabType" :options="tabTypeOptions" />
-    </setting-item-box>
     <setting-item-box name="默认值" :alone="true">
-       <n-select size="small" v-model:value="optionData.tabLabel" value-field="label" :options="optionData.dataset" />
+      <n-select size="small" v-model:value="optionData.tabType" :options="tabTypeOptions" />
     </setting-item-box>
   </collapse-item>
 </template>

src/packages/components/Informations/Inputs/InputsTab/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <n-tabs :type="option.value.tabType" @update:value="onChange" :default-value="option.value.tabLabel">
+  <n-tabs :type="option.value.tabType" @update:value="onChange">
     <n-tab v-for="(item, index) in option.value.dataset" :name="item.label" :key="index"> {{ item.label }} </n-tab>
   </n-tabs>
 </template>

src/packages/components/Informations/Inputs/index.ts

@@ -1,7 +1,5 @@
 import { InputsDateConfig } from './InputsDate/index'
 import { InputsSelectConfig } from './InputsSelect/index'
 import { InputsTabConfig } from './InputsTab/index'
-import { InputsPaginationConfig } from "./InputsPagination/index";
-import { InputsInputConfig} from "./InputsInput/index";
 
-export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig,InputsPaginationConfig,InputsInputConfig]
+export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig]

src/packages/components/Informations/Texts/TextBarrage/config.vue

@@ -1,89 +1,89 @@
-<template>
-  <collapse-item name="信息" :expanded="true">
-    <setting-item-box name="文字" :alone="true">
-      <setting-item>
-        <n-input v-model:value="optionData.dataset" type="textarea" size="small"></n-input>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-
-  <collapse-item name="样式" :expanded="true">
-    <setting-item-box name="文字">
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.fontColor"></n-color-picker>
-      </setting-item>
-      <setting-item name="字体大小">
-        <n-input-number v-model:value="optionData.fontSize" size="small" placeholder="字体大小"></n-input-number>
-      </setting-item>
-      <setting-item name="字体粗细">
-        <n-select v-model:value="optionData.fontWeight" size="small" :options="fontWeightOptions" />
-      </setting-item>
-
-      <setting-item name="字间距">
-        <n-input-number v-model:value="optionData.letterSpacing" size="small" placeholder="输入字间距"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="阴影">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="optionData.showShadow" size="small" />
-          <n-text>展示阴影</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.colorShadow"></n-color-picker
-      ></setting-item>
-      <setting-item name="x">
-        <n-input-number v-model:value="optionData.hShadow" size="small"></n-input-number
-      ></setting-item>
-      <setting-item name="y">
-        <n-input-number v-model:value="optionData.vShadow" size="small"></n-input-number
-      ></setting-item>
-      <setting-item name="模糊">
-        <n-input-number v-model:value="optionData.blurShadow" size="small"></n-input-number
-      ></setting-item>
-    </setting-item-box>
-
-    <setting-item-box name="动画">
-      <setting-item name="动画速度">
-        <n-input-number
-          v-model:value="optionData.animationSpeed"
-          size="small"
-          placeholder="动画速度"
-          :min="0"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="动画间隔">
-        <n-input-number
-          v-model:value="optionData.animationTime"
-          size="small"
-          placeholder="动画间隔"
-          :min="0"
-        ></n-input-number>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { option, FontWeightEnum, FontWeightObject } from './config'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-const fontWeightOptions = [
-  {
-    label: FontWeightEnum.NORMAL,
-    value: FontWeightObject[FontWeightEnum.NORMAL]
-  },
-  {
-    label: FontWeightEnum.BOLD,
-    value: FontWeightObject[FontWeightEnum.BOLD]
-  }
-]
-</script>
+<template>
+  <collapse-item name="信息" :expanded="true">
+    <setting-item-box name="文字" :alone="true">
+      <setting-item>
+        <n-input v-model:value="optionData.dataset" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+
+  <collapse-item name="样式" :expanded="true">
+    <setting-item-box name="文字">
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.fontColor"></n-color-picker>
+      </setting-item>
+      <setting-item name="字体大小">
+        <n-input-number v-model:value="optionData.fontSize" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+      <setting-item name="字体粗细">
+        <n-select v-model:value="optionData.fontWeight" size="small" :options="fontWeightOptions" />
+      </setting-item>
+
+      <setting-item name="字间距">
+        <n-input-number v-model:value="optionData.letterSpacing" size="small" placeholder="输入字间距"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="阴影">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="optionData.showShadow" size="small" />
+          <n-text>展示阴影</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.colorShadow"></n-color-picker
+      ></setting-item>
+      <setting-item name="x">
+        <n-input-number v-model:value="optionData.hShadow" size="small"></n-input-number
+      ></setting-item>
+      <setting-item name="y">
+        <n-input-number v-model:value="optionData.vShadow" size="small"></n-input-number
+      ></setting-item>
+      <setting-item name="模糊">
+        <n-input-number v-model:value="optionData.blurShadow" size="small"></n-input-number
+      ></setting-item>
+    </setting-item-box>
+
+    <setting-item-box name="动画">
+      <setting-item name="动画速度">
+        <n-input-number
+          v-model:value="optionData.animationSpeed"
+          size="small"
+          placeholder="动画速度"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="动画间隔">
+        <n-input-number
+          v-model:value="optionData.animationTime"
+          size="small"
+          placeholder="动画间隔"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { option, FontWeightEnum, FontWeightObject } from './config'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+
+const fontWeightOptions = [
+  {
+    label: FontWeightEnum.NORMAL,
+    value: FontWeightObject[FontWeightEnum.NORMAL]
+  },
+  {
+    label: FontWeightEnum.BOLD,
+    value: FontWeightObject[FontWeightEnum.BOLD]
+  }
+]
+</script>

src/packages/components/Informations/Texts/TextCommon/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="go-text-box">
     <div class="content">
-      <span style="cursor: pointer; white-space: pre-wrap" v-if="link" @click="click">{{ option.dataset }}</span>
+      <span style="cursor: pointer; white-space: pre-wrap" v-if="link" @click="click"></span>
       <span style="white-space: pre-wrap" v-else>{{ option.dataset }}</span>
     </div>
   </div>
@@ -70,7 +70,6 @@ const click = () => {
   display: flex;
   align-items: center;
   justify-content: v-bind('textAlign');
-  overflow: hidden;
 
   .content {
     color: v-bind('fontColor');

src/packages/components/Informations/Texts/TextGradient/config.vue

@@ -1,45 +1,45 @@
-<template>
-  <collapse-item name="信息" :expanded="true">
-    <setting-item-box name="文字" :alone="true">
-      <setting-item>
-        <n-input v-model:value="optionData.dataset" type="textarea" size="small"></n-input>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-  <collapse-item name="样式" :expanded="true">
-    <setting-item-box name="文字">
-      <setting-item name="字体大小">
-        <n-input-number v-model:value="optionData.size" size="small" placeholder="字体大小"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="渐变色参数">
-      <setting-item name="起始值">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.from"></n-color-picker>
-      </setting-item>
-      <setting-item name="结束值">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.to"></n-color-picker>
-      </setting-item>
-      <setting-item name="偏移角度">
-        <n-input-number v-model:value="optionData.gradient.deg" size="small" placeholder="颜色旋转"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { option } from './config'
-import {
-  CollapseItem,
-  SettingItemBox,
-  SettingItem
-} from '@/components/Pages/ChartItemSetting'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-</script>
+<template>
+  <collapse-item name="信息" :expanded="true">
+    <setting-item-box name="文字" :alone="true">
+      <setting-item>
+        <n-input v-model:value="optionData.dataset" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+  <collapse-item name="样式" :expanded="true">
+    <setting-item-box name="文字">
+      <setting-item name="字体大小">
+        <n-input-number v-model:value="optionData.size" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="渐变色参数">
+      <setting-item name="起始值">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.from"></n-color-picker>
+      </setting-item>
+      <setting-item name="结束值">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.to"></n-color-picker>
+      </setting-item>
+      <setting-item name="偏移角度">
+        <n-input-number v-model:value="optionData.gradient.deg" size="small" placeholder="颜色旋转"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { option } from './config'
+import {
+  CollapseItem,
+  SettingItemBox,
+  SettingItem
+} from '@/components/Pages/ChartItemSetting'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+</script>

src/packages/components/Tables/Tables/TablesBasic/config.ts

@@ -1,35 +0,0 @@
-import cloneDeep from 'lodash/cloneDeep'
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { TablesBasicConfig } from './index'
-import dataJson from './data.json'
-
-const { dimensions, source } = dataJson
-export const option = {
-  dataset: { dimensions, source },
-  pagination: {
-    page: 1,
-    pageSize: 5
-  },
-  align: 'center',
-  style: {
-    border: 'on',
-    singleColumn: 'off',
-    singleLine: 'off',
-    bottomBordered: 'on',
-    striped: 'on',
-    fontSize: 16,
-    borderWidth: 0,
-    borderColor: 'black',
-    borderStyle: 'solid'
-  },
-  inputShow: 'none'
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = TablesBasicConfig.key
-  public attr = { ...chartInitConfig, w: 600, h: 300, zIndex: -1 }
-  public chartConfig = cloneDeep(TablesBasicConfig)
-  public option = cloneDeep(option)
-}

src/packages/components/Tables/Tables/TablesBasic/config.vue

@@ -1,162 +0,0 @@
-<template>
-  <collapse-item name="表格设置" :expanded="true">
-    <n-tag type="primary">若配置无响应，请在预览页面查看效果</n-tag>
-    <setting-item-box :alone="true" name="对齐方式">
-      <setting-item :alone="true">
-        <n-select
-          v-model:value="optionData.align"
-          size="small"
-          :options="[
-            { label: '靠左', value: 'left' },
-            { label: '居中', value: 'center' },
-            { label: '靠右', value: 'right' }
-          ]"
-        />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box :alone="false" name="分页设置">
-      <setting-item name="默认页码" :alone="true">
-        <n-input-number v-model:value="optionData.pagination.page" size="small" placeholder="字体大小"></n-input-number>
-      </setting-item>
-      <setting-item name="分页" :alone="true">
-        <n-select v-model:value="optionData.pagination.pageSize" size="small" :options="page" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box :alone="false" name="表格数据">
-      <SettingItem name="表头名称" class="form_name">
-        <div style="width: 260px">
-          <n-input v-model:value="header" size="small" placeholder="表头数据(英文','分割)"></n-input>
-        </div>
-      </SettingItem>
-    </setting-item-box>
-    <setting-item-box :alone="false" name="表格样式">
-      <SettingItem name="显示边框" :alone="true">
-        <n-select v-model:value="(optionData as any).style.border" size="small" :options="borderFlag" />
-      </SettingItem>
-      <SettingItem name="底部边框" :alone="true">
-        <n-select
-          v-model:value="(optionData as any).style.bottomBordered"
-          size="small"
-          :options="bottom_borderedFlag"
-        />
-      </SettingItem>
-      <SettingItem name="列分割线" :alone="true">
-        <n-select v-model:value="(optionData as any).style.singleLine" size="small" :options="columnFlag" />
-      </SettingItem>
-      <SettingItem name="行分割线" :alone="true">
-        <n-select v-model:value="(optionData as any).style.singleColumn" size="small" :options="lineFlag" />
-      </SettingItem>
-      <SettingItem name="斑马条纹" :alone="true">
-        <n-select v-model:value="(optionData as any).style.striped" size="small" :options="stripedFlag" />
-      </SettingItem>
-      <setting-item name="字体大小" :alone="true">
-        <n-input-number
-          v-model:value="optionData.style.fontSize"
-          :min="12"
-          size="small"
-          placeholder="字体大小"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="边框宽度" :alone="true">
-        <n-input-number
-          v-model:value="optionData.style.borderWidth"
-          :min="0"
-          size="small"
-          placeholder="字体大小"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="边框颜色" :alone="true">
-        <n-color-picker size="small" :modes="['rgb']" v-model:value="optionData.style.borderColor"></n-color-picker>
-      </setting-item>
-      <setting-item name="边框样式" :alone="true">
-        <n-select v-model:value="optionData.style.borderStyle" size="small" :options="borderStyleFlag" />
-      </setting-item>
-      <SettingItem name="表格搜索（前端静态搜索）" :alone="true">
-        <n-select v-model:value="optionData.inputShow" size="small" :options="inputSelect" />
-      </SettingItem>
-    </setting-item-box>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType, watch, ref } from 'vue'
-import { option } from './config'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-const page = [
-  { label: '2', value: 2 },
-  { label: '5', value: 5 },
-  { label: '10', value: 10 },
-  { label: '15', value: 15 },
-  { label: '30', value: 30 }
-]
-const borderFlag = [
-  { label: '显示', value: 'on' },
-  { label: '不显示', value: 'off' }
-]
-const columnFlag = [
-  { label: '显示', value: 'off' },
-  { label: '不显示', value: 'on' }
-]
-const lineFlag = [
-  { label: '显示', value: 'off' },
-  { label: '不显示', value: 'on' }
-]
-const bottom_borderedFlag = [
-  { label: '显示', value: 'on' },
-  { label: '不显示', value: 'off' }
-]
-const stripedFlag = [
-  { label: '显示', value: 'on' },
-  { label: '不显示', value: 'off' }
-]
-const borderStyleFlag = [
-  { label: '实线边框', value: 'solid' },
-  { label: '虚线边框', value: 'dashed' },
-  { label: '点状边框', value: 'dotted' },
-  { label: '双线边框', value: 'double' }
-]
-const inputSelect = [
-  { label: '停用', value: 'none' },
-  { label: '启用', value: 'flex' }
-]
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-const header = ref()
-const median = ref<string[]>([])
-props.optionData.dataset.dimensions.forEach(item => {
-  median.value.push(item.title)
-})
-
-//转string
-watch(
-  () => props.optionData,
-  () => {
-    median.value = []
-    props.optionData.dataset.dimensions.forEach(item => {
-      median.value.push(item.title)
-    })
-    header.value = median.value.toString()
-  },
-  {
-    deep: false,
-    immediate: true
-  }
-)
-
-//更新columns
-watch([header], ([headerNew], [headerOld]) => {
-  if (headerNew !== headerOld) {
-    headerNew.split(',').forEach((item: string, index: number) => {
-      if (index + 1 <= props.optionData.dataset.dimensions.length) {
-        props.optionData.dataset.dimensions[index].title = headerNew.split(',')[index]
-      }
-    })
-  }
-})
-</script>

src/packages/components/Tables/Tables/TablesBasic/data.json

@@ -1,60 +0,0 @@
-{
-  "dimensions": [
-    {
-      "title": "产品名称",
-      "key": "productName"
-    },
-    {
-      "title": "产品销量（万）",
-      "key": "totalSum"
-    },
-    {
-      "title": "销售额（万）",
-      "key": "totalAmount"
-    }
-  ],
-  "source": [
-    {
-      "key": 0,
-      "productName": "产品A1",
-      "totalSum": 10,
-      "totalAmount": 10
-    },
-    {
-      "key": 1,
-      "productName": "产品B1",
-      "totalSum": 10,
-      "totalAmount": 10
-    },
-    {
-      "key": 2,
-      "productName": "产品C1",
-      "totalSum": 10,
-      "totalAmount": 10
-    },
-    {
-      "key": 3,
-      "productName": "产品D1",
-      "totalSum": 10,
-      "totalAmount": 10
-    },
-    {
-      "key": 4,
-      "productName": "产品A2",
-      "totalSum": 10,
-      "totalAmount": 10
-    },
-    {
-      "key": 5,
-      "productName": "产品D2",
-      "totalSum": 10,
-      "totalAmount": 10
-    },
-    {
-      "key": 6,
-      "productName": "产品A3",
-      "totalSum": 10,
-      "totalAmount": 10
-    }
-  ]
-}

src/packages/components/Tables/Tables/TablesBasic/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const TablesBasicConfig: ConfigType = {
-  key: 'TablesBasic',
-  chartKey: 'VTablesBasic',
-  conKey: 'VCTablesBasic',
-  title: '基础分页表格',
-  category: ChatCategoryEnum.TABLE,
-  categoryName: ChatCategoryEnumName.TABLE,
-  package: PackagesCategoryEnum.TABLES,
-  chartFrame: ChartFrameEnum.COMMON,
-  image: 'tables_basic.png'
-}

src/packages/components/Tables/Tables/TablesBasic/index.vue

@@ -1,95 +0,0 @@
-<template>
-  <div class="go-tables-basic">
-    <n-input
-      v-model:value="inputData"
-      placeholder="请输入信息"
-      :style="`display: ${inputShow}`"
-      style="margin-bottom: 5px; float: right; width: 240px"
-    >
-      <template #prefix>
-        <n-icon :component="SearchIcon" />
-      </template>
-    </n-input>
-    <n-data-table
-      :style="`
-      width: ${w}px;
-      height: ${h}px;
-      font-size: ${option.style.fontSize}px;
-      border-width: ${option.style.border === 'on' ? option.style.borderWidth : 0}px;
-      border-color: ${option.style.borderColor};
-      border-style: ${option.style.borderStyle}`"
-      :bordered="option.style.border === 'on'"
-      :single-column="option.style.singleColumn === 'on'"
-      :single-line="option.style.singleLine === 'on'"
-      :bottom-bordered="option.style.bottomBordered === 'on'"
-      :striped="option.style.striped === 'on'"
-      :max-height="h"
-      size="small"
-      :columns="option.dataset.dimensions"
-      :data="filterData"
-      :pagination="pagination"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, PropType, toRefs, watch, reactive, ref } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-import { icon } from '@/plugins'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const { SearchIcon } = icon.ionicons5
-
-//查询字段
-const inputData = ref('')
-//前台过滤
-const filterData = computed(() => {
-  return option?.dataset?.source?.filter((item: any) => {
-    return Object.values(item).some(val => {
-      return String(val).toLowerCase().includes(inputData.value.toLowerCase())
-    })
-  })
-})
-
-const { align, pagination, inputShow } = toRefs(props.chartConfig.option)
-
-pagination.value.onChange = (page: number) => {
-  pagination.value.page = page
-}
-
-const { w, h } = toRefs(props.chartConfig.attr)
-
-const option = reactive({
-  dataset: props.chartConfig.option.dataset,
-  style: props.chartConfig.option.style
-})
-
-watch(
-  () => props.chartConfig.option.dataset,
-  (newData: any) => {
-    option.dataset = newData
-    option?.dataset?.dimensions?.forEach((header: any) => {
-      header.align = align.value
-    })
-  },
-  {
-    immediate: true,
-    deep: true
-  }
-)
-</script>
-
-<style lang="scss" scoped>
-@include go('tables-basic') {
-  display: flex;
-  flex-direction: column;
-  gap: 15px;
-  align-items: flex-end;
-}
-</style>

src/packages/components/Tables/Tables/index.ts

@@ -1,5 +1,4 @@
 import { TableListConfig } from './TableList'
 import { TableScrollBoardConfig } from './TableScrollBoard'
-import { TablesBasicConfig } from "./TablesBasic/index";
 
-export default [TableListConfig, TableScrollBoardConfig,TablesBasicConfig]
+export default [TableListConfig, TableScrollBoardConfig]

src/packages/index.ts

@@ -26,16 +26,6 @@ export let packagesList: PackagesType = {
   [PackagesCategoryEnum.ICONS]: IconList
 }
 
-// 组件缓存, 可以大幅度提升组件加载速度
-const componentCacheMap = new Map<string, any>()
-const loadConfig = (packageName: string, categoryName: string, keyName: string) => {
-  const key = packageName + categoryName + keyName
-  if (!componentCacheMap.has(key)) {
-    componentCacheMap.set(key, import(`./components/${packageName}/${categoryName}/${keyName}/config.ts`))
-  }
-  return componentCacheMap.get(key)
-}
-
 /**
  * * 获取目标组件配置信息
  * @param targetData
@@ -45,10 +35,10 @@ export const createComponent = async (targetData: ConfigType) => {
   // redirectComponent 是给图片组件库和图标组件库使用的
   if (redirectComponent) {
     const [packageName, categoryName, keyName] = redirectComponent.split('/')
-    const redirectChart = await loadConfig(packageName, categoryName, keyName)
+    const redirectChart = await import(`./components/${packageName}/${categoryName}/${keyName}/config.ts`)
     return new redirectChart.default()
   }
-  const chart = await loadConfig(targetData.package, category, key)
+  const chart = await import(`./components/${targetData.package}/${category}/${key}/config.ts`)
   return new chart.default()
 }
 
@@ -94,7 +84,7 @@ export const fetchImages = async (targetData?: ConfigType) => {
   // 正则判断图片是否为 url，是则直接返回该 url
   if (/^(http|https):\/\/([\w.]+\/?)\S*/.test(targetData.image)) return targetData.image
   // 新数据动态处理
-  const { image } = targetData
+  const { image, package: targetDataPackage } = targetData
   // 兼容旧数据
   if (image.includes('@') || image.includes('base64')) return image
 

src/store/modules/chartEditStore/chartEditStore.ts

@@ -182,16 +182,20 @@ export const useChartEditStore = defineStore({
     },
     getComponentList(): Array<CreateComponentType | CreateComponentGroupType> {
       return this.componentList
-    }
-  },
-  actions: {
-    // * 获取需要存储的数据项
+    },
+    // 获取需要存储的数据项
     getStorageInfo(): ChartEditStorage {
       return {
         [ChartEditStoreEnum.EDIT_CANVAS_CONFIG]: this.getEditCanvasConfig,
         [ChartEditStoreEnum.COMPONENT_LIST]: this.getComponentList,
         [ChartEditStoreEnum.REQUEST_GLOBAL_CONFIG]: this.getRequestGlobalConfig
       }
+    }
+  },
+  actions: {
+    // * 设置 peojectInfo 数据项
+    setProjectInfo<T extends keyof ProjectInfoType,  K extends ProjectInfoType[T]>(key: T, value: K) {
+      this.projectInfo[key] = value
     },
     // * 设置 editCanvas 数据项
     setEditCanvas<T extends keyof EditCanvasType, K extends EditCanvasType[T]>(key: T, value: K) {
@@ -201,10 +205,6 @@ export const useChartEditStore = defineStore({
     setEditCanvasConfig<T extends keyof EditCanvasConfigType, K extends EditCanvasConfigType[T]>(key: T, value: K) {
       this.editCanvasConfig[key] = value
     },
-    // * 设置 peojectInfo 数据项
-    setProjectInfo<T extends keyof ProjectInfoType, K extends ProjectInfoType[T]>(key: T, value: K) {
-      this.projectInfo[key] = value
-    },
     // * 设置右键菜单
     setRightMenuShow(value: boolean) {
       this.rightMenuShow = value
@@ -525,8 +525,8 @@ export const useChartEditStore = defineStore({
         }
         const parseHandle = (e: CreateComponentType | CreateComponentGroupType) => {
           e = cloneDeep(e)
-          e.attr.x = this.getMousePosition.startX
-          e.attr.y = this.getMousePosition.startY
+          e.attr.x = this.getMousePosition.x + 30
+          e.attr.y = this.getMousePosition.y + 30
           // 外层生成新 id
           e.id = getUUID()
           // 分组列表生成新 id
@@ -535,11 +535,11 @@ export const useChartEditStore = defineStore({
               item.id = getUUID()
             })
           }
-
+        
           return e
         }
         const isCut = recordCharts.type === HistoryActionTypeEnum.CUT
-        const targetList = Array.isArray(recordCharts.charts) ? recordCharts.charts : [recordCharts.charts]
+        const targetList = Array.isArray(recordCharts.charts) ? recordCharts.charts : [ recordCharts.charts ]
         // 多项
         targetList.forEach((e: CreateComponentType | CreateComponentGroupType) => {
           this.addComponentList(parseHandle(e), undefined, true)
@@ -639,7 +639,7 @@ export const useChartEditStore = defineStore({
           } else {
             const group = historyData[0] as CreateComponentGroupType
             group.groupList.forEach(item => {
-              ids.unshift(item.id)
+              ids.push(item.id)
             })
           }
           this.setGroup(ids, false)
@@ -788,7 +788,7 @@ export const useChartEditStore = defineStore({
           // 高
           groupAttr.b = b < y + h ? y + h : b
 
-          targetList.unshift(item)
+          targetList.push(item)
           historyList.push(toRaw(item))
         })
 
@@ -834,7 +834,7 @@ export const useChartEditStore = defineStore({
           if (isHistory) chartHistoryStore.createUnGroupHistory(cloneDeep([targetGroup]))
 
           // 分离组件并还原位置属性
-          targetGroup.groupList.reverse().forEach(item => {
+          targetGroup.groupList.forEach(item => {
             item.attr.x = item.attr.x + targetGroup.attr.x
             item.attr.y = item.attr.y + targetGroup.attr.y
             if (!callBack) {

src/styles/common/mixins/mixins.scss

@@ -1,84 +1,78 @@
-@import './config.scss';
-@import './function.scss';
-@import '../theme.scss';
-
-@mixin go($block) {
-  $B: $namespace + '-' + $block;
-  .#{$B} {
-    @content;
-  }
-}
-
-@mixin dark {
-  [data-theme='dark'] {
-    @content;
-  }
-}
-
-@mixin goId($block) {
-  $B: $namespace + '-' + $block;
-  ##{$B} {
-    @content;
-  }
-}
-
-@mixin deep() {
-  :deep() {
-    @content;
-  }
-}
-
-@mixin when($state) {
-  @at-root {
-    &.#{$state-prefix + $state} {
-      @content;
-    }
-  }
-}
-
-@mixin themeify {
-  @each $theme-name, $theme-map in $themes {
-    $theme-map: $theme-map !global;
-    [data-theme='#{$theme-name}'] & {
-      @content;
-    }
-  }
-}
-
-@mixin fetch-theme($param) {
-  @include themeify {
-    #{$param}: themed($param);
-  }
-}
-
-@mixin fetch-theme-custom ($key, $value) {
-  @include themeify {
-    #{$key}: themed($value);
-  }
-}
-
-//获取背景颜色
-@mixin fetch-bg-color($target) {
-  @include themeify {
-    background-color: themed($target);
-  }
-}
-
-//获取背景渐变颜色
-@mixin background-image($target) {
-  @include themeify {
-    background-image: themed($target);
-  }
-}
-
-//设置边框颜色
-@mixin fetch-border-color($target) {
-  @include themeify {
-    border-color: themed($target);
-  }
-}
-@mixin hover-border-color($target) {
-  @include themeify {
-    border: 1px solid themed($target);
-  }
-}
+@import './config.scss';
+@import './function.scss';
+@import '../theme.scss';
+
+@mixin go($block) {
+  $B: $namespace + '-' + $block;
+  .#{$B} {
+    @content;
+  }
+}
+
+@mixin goId($block) {
+  $B: $namespace + '-' + $block;
+  ##{$B} {
+    @content;
+  }
+}
+
+@mixin deep() {
+  :deep() {
+    @content;
+  }
+}
+
+@mixin when($state) {
+  @at-root {
+    &.#{$state-prefix + $state} {
+      @content;
+    }
+  }
+}
+
+@mixin themeify {
+  @each $theme-name, $theme-map in $themes {
+    $theme-map: $theme-map !global;
+    [data-theme='#{$theme-name}'] & {
+      @content;
+    }
+  }
+}
+
+@mixin fetch-theme($param) {
+  @include themeify {
+    #{$param}: themed($param);
+  }
+}
+
+@mixin fetch-theme-custom ($key, $value) {
+  @include themeify {
+    #{$key}: themed($value);
+  }
+}
+
+//获取背景颜色
+@mixin fetch-bg-color($target) {
+  @include themeify {
+    background-color: themed($target);
+  }
+}
+
+//获取背景渐变颜色
+@mixin background-image($target) {
+  @include themeify {
+    background-image: themed($target);
+  }
+}
+
+//设置边框颜色
+@mixin fetch-border-color($target) {
+  @include themeify {
+    border-color: themed($target);
+  }
+}
+@mixin hover-border-color($target) {
+  @include themeify {
+    border: 1px solid themed($target);
+  }
+}

src/styles/pages/index.scss

@@ -1,15 +1,9 @@
-// 页面全局样式
-// 去除高德地图 logo
-.amap-logo {
-  display: none !important;
-  opacity: 0 !important;
-}
-.amap-copyright {
-  opacity: 0 !important;
-}
-
-[data-theme='dark'] {
-  body {
-    background-color: #18181c;
-  }
-}
+// 页面全局样式
+// 去除高德地图 logo
+.amap-logo {
+  display: none !important;
+  opacity: 0 !important;
+}
+.amap-copyright {
+  opacity: 0 !important;
+}

src/utils/utils.ts

@@ -330,23 +330,3 @@ export const JSONParse = (data: string) => {
 export const setTitle = (title?: string) => {
   title && (document.title = title)
 }
-
-/**
- * 处理网页关闭事件
- */
-export const addWindowUnload = () => {
-  // 关闭网页出现离开提示
-  window.onbeforeunload = function (e) {
-    e = e || window.event
-    // 兼容IE8和Firefox 4之前的版本
-    if (e) {
-      e.returnValue = '您确定要离开当前页面吗？请确认是否保存数据！'
-    }
-    // Chrome, Safari, Firefox 4+, Opera 12+ , IE 9+
-    return '您确定要离开当前页面吗？请确认是否保存数据！'
-  }
-  // 返回销毁事件函数
-  return () => {
-    window.onbeforeunload = null
-  }
-}

src/views/chart/ContentCharts/components/ChartsItemBox/index.vue

@@ -23,7 +23,7 @@
           </n-text>
         </div>
         <div class="list-center go-flex-center go-transition" draggable="true">
-          <GoIconify v-if="item.icon" class="list-img" :icon="item.icon" color="#999" width="48" style="height: auto" />
+          <Icon v-if="item.icon" class="list-img" :icon="item.icon" color="#999" width="48" />
           <chart-glob-image v-else class="list-img" :chartConfig="item" />
         </div>
         <div class="list-bottom">
@@ -64,7 +64,7 @@ import { createComponent } from '@/packages'
 import { ConfigType, CreateComponentType, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChatCategoryEnum } from '@/packages/components/Photos/index.d'
 import { fetchConfigComponent, fetchChartComponent } from '@/packages/index'
-import { GoIconify } from '@/components/GoIconify'
+import { Icon } from '@iconify/vue'
 import { icon } from '@/plugins'
 
 import omit from 'lodash/omit'

src/views/chart/ContentCharts/components/ChartsSearch/index.vue

@@ -37,7 +37,7 @@
               :title="item.title"
               @click="selectChartHandle(item)"
             >
-              <GoIconify v-if="item.icon" class="list-img" :icon="item.icon" color="#999" width="20" />
+              <Icon v-if="item.icon" class="list-img" :icon="item.icon" color="#999" width="20" />
               <chart-glob-image v-else class="list-item-img" :chartConfig="item" />
               <n-text class="list-item-fs" depth="2">{{ item.title }}</n-text>
             </div>
@@ -79,7 +79,7 @@ import { isString, addEventListener, removeEventListener } from '@/utils'
 import { fetchConfigComponent, fetchChartComponent } from '@/packages/index'
 import { componentInstall, loadingStart, loadingFinish, loadingError } from '@/utils'
 import { ChartGlobImage } from '@/components/Pages/ChartGlobImage'
-import { GoIconify } from '@/components/GoIconify'
+import { Icon } from '@iconify/vue'
 
 const props = defineProps({
   menuOptions: {

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue

@@ -131,11 +131,7 @@ const sendHandle = async () => {
     loading.value = false
     if (res) {
       const { data } = res
-      if (!data && !targetData.value.filter) {
-        window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
-        showMatching.value = true
-        return
-      }
+      if (!data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
       targetData.value.option.dataset = newFunctionHandle(data, res, targetData.value.filter)
       showMatching.value = true
       return

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/index.vue

@@ -117,11 +117,7 @@ const sendHandle = async () => {
     const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
     loading.value = false
     if (res) {
-      if (!res?.data && !targetData.value.filter) {
-        window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
-        showMatching.value = true
-        return
-      }
+      if (!res?.data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
       targetData.value.option.dataset = newFunctionHandle(res?.data, res, targetData.value.filter)
       showMatching.value = true
       return

src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventBaseHandle/index.vue

@@ -16,7 +16,7 @@
         <p>
           <span class="func-annotate">// {{ EventTypeName[eventName] }}</span>
           <br />
-          <span class="func-keyword">async {{ eventName }}</span> (mouseEvent,components) {
+          <span class="func-keyword">async {{ eventName }}</span> (mouseEvent) {
         </p>
         <p class="go-ml-4">
           <n-code :code="(targetData.events.baseEvent || {})[eventName] || ''" language="typescript"></n-code>
@@ -52,7 +52,7 @@
               <!-- 函数名称 -->
               <p class="go-pl-3">
                 <span class="func-keyword">async function &nbsp;&nbsp;</span>
-                <span class="func-keyNameWord">{{ eventName }}(mouseEvent,components)&nbsp;&nbsp;{</span>
+                <span class="func-keyNameWord">{{ eventName }}(mouseEvent)&nbsp;&nbsp;{</span>
               </p>
               <!-- 编辑主体 -->
               <monaco-editor v-model:modelValue="baseEvent[eventName]" height="480px" language="javascript" />

src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteraction/index.vue

@@ -58,7 +58,7 @@
                 <help-outline-icon></help-outline-icon>
               </n-icon>
             </template>
-            <n-text>不支持「静态组件」支持「组件」「公共APi」</n-text>
+            <n-text>不支持「静态组件」</n-text>
           </n-tooltip>
         </template>
         <n-select
@@ -89,7 +89,7 @@
         </n-table>
       </setting-item-box>
 
-      <n-tag :bordered="false" type="primary"> 关联目标请求参数 </n-tag>
+      <n-tag :bordered="false" type="primary"> 关联目标组件请求参数 </n-tag>
 
       <setting-item-box
         :name="requestParamsItem"
@@ -125,7 +125,7 @@ import { VNodeChild, computed } from 'vue'
 import { SelectOption, SelectGroupOption } from 'naive-ui'
 import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
 import { CreateComponentType, CreateComponentGroupType, ChartFrameEnum } from '@/packages/index.d'
-import { RequestParamsTypeEnum, RequestDataTypeEnum } from '@/enums/httpEnum'
+import { RequestParamsTypeEnum } from '@/enums/httpEnum'
 import { InteractEventOn, COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum'
 import { icon } from '@/plugins'
 import noData from '@/assets/images/canvas/noData.png'
@@ -154,11 +154,6 @@ const option = computed(() => {
 // 绑定组件数据 request
 const fnGetRequest = (id: string | undefined, key: RequestParamsTypeEnum) => {
   if (!id) return {}
-  const globalConfigPindApr = chartEditStore.requestGlobalConfig.requestDataPond.find(item => {
-    return item.dataPondId === id
-  })?.dataPondRequestConfig.requestParams
-
-  if (globalConfigPindApr) return globalConfigPindApr[key]
   return chartEditStore.componentList[chartEditStore.fetchTargetIndex(id)]?.request.requestParams[key]
 }
 
@@ -183,10 +178,12 @@ const fnEventsOptions = (): Array<SelectOption | SelectGroupOption> => {
         iter: Array<CreateComponentType | CreateComponentGroupType>,
         val: CreateComponentType | CreateComponentGroupType
       ) => {
-        if (!val.groupList && val.request.requestDataType === RequestDataTypeEnum.AJAX && val.request.requestUrl) {
+        if (val.groupList && val.groupList.length > 0) {
+          iter.push(val)
+        } else {
           iter.push(val)
         }
-        return val.groupList && val.groupList.length > 0 ? [...iter, ...fnFlattern(val.groupList)] : iter
+        return val.groupList ? [...iter, ...fnFlattern(val.groupList)] : iter
       },
       []
     )
@@ -206,26 +203,18 @@ const fnEventsOptions = (): Array<SelectOption | SelectGroupOption> => {
   const mapOptionList = filterOptionList.map(item => ({
     id: item.id,
     title: item.chartConfig.title,
-    disabled: false,
-    type: 'componentList'
+    disabled: false
   }))
 
-  const requestDataPond = chartEditStore.requestGlobalConfig.requestDataPond.map(item => ({
-    id: item.dataPondId,
-    title: item.dataPondName,
-    disabled: false,
-    type: 'requestDataPond'
-  }))
-  const tarArr = requestDataPond.concat(mapOptionList)
   targetData.value.events.interactEvents?.forEach(iaItem => {
-    tarArr.forEach(optionItem => {
+    mapOptionList.forEach(optionItem => {
       if (optionItem.id === iaItem.interactComponentId) {
         optionItem.disabled = true
       }
     })
   })
 
-  return tarArr
+  return mapOptionList
 }
 
 // 新增模块

src/views/chart/ContentEdit/components/EditRule/index.vue

@@ -27,7 +27,7 @@
       </div>
     </div>
     <!-- 修复右下角白点用的 -->
-    <!-- <div v-if="designStore.getDarkTheme" class="fix-edit-screens-block"></div> -->
+    <div v-if="designStore.getDarkTheme" class="fix-edit-screens-block"></div>
   </div>
 </template>
 <script setup lang="ts">
@@ -159,11 +159,9 @@ const dragCanvas = (e: any) => {
 const canvasBox = () => {
   const layoutDom = document.getElementById('go-chart-edit-layout')
   if (layoutDom) {
-    // 此处减去滚动条的宽度和高度 
-    const scrollW = 20
     return {
-      height: layoutDom.clientHeight - scrollW,
-      width: layoutDom.clientWidth - scrollW
+      height: layoutDom.clientHeight - 25,
+      width: layoutDom.clientWidth
     }
   }
   return {
@@ -290,6 +288,7 @@ window.onKeySpacePressHold = (isHold: boolean) => {
 
 <style lang="scss" scoped>
 @include go('sketch-rule') {
+  position: relative;
   overflow: hidden;
   width: 100%;
   height: 100%;
@@ -320,10 +319,6 @@ window.onKeySpacePressHold = (isHold: boolean) => {
       border-radius: 5px;
       background-color: rgba(144, 146, 152, 0.3);
     }
-    // 修复右下角白点用的
-    &::-webkit-scrollbar-corner {
-      background-color: transparent;
-    }
   }
 
   .fix-edit-screens-block {
@@ -344,7 +339,7 @@ window.onKeySpacePressHold = (isHold: boolean) => {
 
   .canvas {
     position: absolute;
-    top:50%;
+    top: 50%;
     left: 50%;
     transform-origin: 50% 0;
     transform: translateY(-50%);

src/views/chart/ContentEdit/components/EditTools/hooks/useSyncUpdate.hook.ts

@@ -20,14 +20,14 @@ export const syncData = () => {
     onPositiveCallback: async () => {
       window['$message'].success('正在同步编辑器...')
       dataSyncUpdate && (await dataSyncUpdate())
-      dispatchEvent(new CustomEvent(SavePageEnum.CHART, { detail: chartEditStore.getStorageInfo() }))
+      dispatchEvent(new CustomEvent(SavePageEnum.CHART, { detail: chartEditStore.getStorageInfo }))
     }
   })
 }
 
 // 同步数据到预览页
 export const syncDataToPreview = () => {
-  dispatchEvent(new CustomEvent(SavePageEnum.CHART_TO_PREVIEW, { detail: chartEditStore.getStorageInfo() }))
+  dispatchEvent(new CustomEvent(SavePageEnum.CHART_TO_PREVIEW, { detail: chartEditStore.getStorageInfo }))
 }
 
 // 侦听器更新

src/views/chart/ContentEdit/components/EditTools/index.vue

@@ -158,7 +158,7 @@ const editHandle = () => {
 
 // 把内存中的数据同步到SessionStorage 便于传递给新窗口初始化数据
 const updateToSession = (id: string) => {
-  const storageInfo = chartEditStore.getStorageInfo()
+  const storageInfo = chartEditStore.getStorageInfo
   const sessionStorageInfo = getLocalStorage(StorageEnum.GO_CHART_STORAGE_LIST) || []
 
   if (sessionStorageInfo?.length) {

src/views/chart/ContentEdit/components/EditTools/utils/index.ts

@@ -1,41 +1,41 @@
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { canvasCut, downloadTextFile, JSONStringify } from '@/utils'
-const chartEditStore = useChartEditStore()
-
-// 导出
-export const exportHandle = () => {
-  // 取消选中
-  chartEditStore.setTargetSelectChart(undefined)
-
-  // 导出数据
-  downloadTextFile(
-    JSONStringify(chartEditStore.getStorageInfo() || []),
-    undefined,
-    'json'
-  )
-
-  // 导出图片
-  const range = document.querySelector('.go-edit-range') as HTMLElement
-  const watermark = document.getElementById('go-edit-watermark')
-  // 隐藏边距线
-  if (!range || !watermark) {
-    window['$message'].error('导出失败！')
-    return
-  }
-
-  // 记录缩放比例
-  const scaleTemp = chartEditStore.getEditCanvas.scale
-  // 百分百展示页面
-  chartEditStore.setScale(1, true)
-  // 展示水印
-  watermark.style.display = 'block'
-
-  setTimeout(() => {
-    canvasCut(range, () => {
-      // 隐藏水印
-      if (watermark) watermark.style.display = 'none'
-      // 还原页面大小
-      chartEditStore.setScale(scaleTemp, true)
-    })
-  }, 600)
-}
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { canvasCut, downloadTextFile, JSONStringify } from '@/utils'
+const chartEditStore = useChartEditStore()
+
+// 导出
+export const exportHandle = () => {
+  // 取消选中
+  chartEditStore.setTargetSelectChart(undefined)
+
+  // 导出数据
+  downloadTextFile(
+    JSONStringify(chartEditStore.getStorageInfo || []),
+    undefined,
+    'json'
+  )
+
+  // 导出图片
+  const range = document.querySelector('.go-edit-range') as HTMLElement
+  const watermark = document.getElementById('go-edit-watermark')
+  // 隐藏边距线
+  if (!range || !watermark) {
+    window['$message'].error('导出失败！')
+    return
+  }
+
+  // 记录缩放比例
+  const scaleTemp = chartEditStore.getEditCanvas.scale
+  // 百分百展示页面
+  chartEditStore.setScale(1, true)
+  // 展示水印
+  watermark.style.display = 'block'
+
+  setTimeout(() => {
+    canvasCut(range, () => {
+      // 隐藏水印
+      if (watermark) watermark.style.display = 'none'
+      // 还原页面大小
+      chartEditStore.setScale(scaleTemp, true)
+    })
+  }, 600)
+}

src/views/chart/ContentEdit/index.vue

@@ -87,14 +87,7 @@ import { onMounted, computed, provide } from 'vue'
 import { chartColors } from '@/settings/chartThemes/index'
 import { MenuEnum } from '@/enums/editPageEnum'
 import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
-import {
-  animationsClass,
-  getFilterStyle,
-  getTransformStyle,
-  getBlendModeStyle,
-  colorCustomMerge,
-  addWindowUnload
-} from '@/utils'
+import { animationsClass, getFilterStyle, getTransformStyle, getBlendModeStyle, colorCustomMerge } from '@/utils'
 import { useContextMenu } from '@/views/chart/hooks/useContextMenu.hook'
 import { MenuOptionsItemType } from '@/views/chart/hooks/useContextMenu.hook.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -117,9 +110,6 @@ const chartEditStore = useChartEditStore()
 const { handleContextMenu } = useContextMenu()
 const { dataSyncFetch, intervalDataSyncUpdate } = useSync()
 
-// 加入网页关闭提示
-addWindowUnload()
-
 // 编辑时注入scale变量，消除警告
 provide(SCALE_KEY, null)
 
@@ -196,7 +186,7 @@ onMounted(() => {
   // 获取数据
   dataSyncFetch()
   // 定时更新数据
-  // intervalDataSyncUpdate()
+  intervalDataSyncUpdate()
 })
 </script>
 

src/views/chart/ContentHeader/headerRightBtn/index.vue

@@ -94,7 +94,7 @@ const previewHandle = () => {
   const { id } = routerParamsInfo.params
   // id 标识
   const previewId = typeof id === 'string' ? id : id[0]
-  const storageInfo = chartEditStore.getStorageInfo()
+  const storageInfo = chartEditStore.getStorageInfo
   const sessionStorageInfo = getLocalStorage(StorageEnum.GO_CHART_STORAGE_LIST) || []
 
   if (sessionStorageInfo?.length) {

src/views/chart/hooks/useSync.hook.ts

@@ -209,7 +209,9 @@ export const useSync = () => {
             chartHistoryStore.clearForwardStack()
           }
         }
-      } else if (key === ChartEditStoreEnum.EDIT_CANVAS_CONFIG || key === ChartEditStoreEnum.REQUEST_GLOBAL_CONFIG) {
+      } else {
+        // 非组件(顺便排除脏数据)
+        if (key !== 'editCanvasConfig' && key !== 'requestGlobalConfig') return
         componentMerge(chartEditStore[key], projectData[key], true)
       }
     }
@@ -322,7 +324,7 @@ export const useSync = () => {
     // 保存数据
     let params = new FormData()
     params.append('projectId', projectId)
-    params.append('content', JSONStringify(chartEditStore.getStorageInfo() || {}))
+    params.append('content', JSONStringify(chartEditStore.getStorageInfo || {}))
     const res= await saveProjectApi(params)
 
     if (res && res.code === ResultEnum.SUCCESS) {

src/views/preview/components/PreviewRenderGroup/index.vue

@@ -1,37 +1,27 @@
 <template>
   <div
-    :class="animationsClass(groupData.styles.animations)"
+    class="chart-item"
+    v-for="item in groupData.groupList"
+    :class="animationsClass(item.styles.animations)"
+    :key="item.id"
     :style="{
-      ...getSizeStyle(groupData.attr),
-      ...getFilterStyle(groupData.styles),
-    }"
-  >
-    <div
-      class="chart-item"
-      v-for="item in groupData.groupList"
-      :class="animationsClass(item.styles.animations)"
-      :key="item.id"
-      :style="{
       ...getComponentAttrStyle(item.attr, groupIndex),
+      ...getFilterStyle(item.styles),
+      ...getTransformStyle(item.styles),
       ...getStatusStyle(item.status),
       ...getPreviewConfigStyle(item.preview),
       ...getBlendModeStyle(item.styles) as any
     }"
-    >
-      <component
-        :is="item.chartConfig.chartKey"
-        :id="item.id"
-        :chartConfig="item"
-        :themeSetting="themeSetting"
-        :themeColor="themeColor"
-        :style="{
-          ...getSizeStyle(item.attr),
-          ...getFilterStyle(item.styles),
-          ...getTransformStyle(item.styles)
-        }"
-        v-on="useLifeHandler(item)"
-      ></component>
-    </div>
+  >
+    <component
+      :is="item.chartConfig.chartKey"
+      :id="item.id"
+      :chartConfig="item"
+      :themeSetting="themeSetting"
+      :themeColor="themeColor"
+      :style="{ ...getSizeStyle(item.attr) }"
+      v-on="useLifeHandler(item)"
+    ></component>
   </div>
 </template>
 

src/views/preview/components/PreviewRenderList/index.vue

@@ -6,11 +6,11 @@
     :key="item.id"
     :style="{
       ...getComponentAttrStyle(item.attr, index),
+      ...getFilterStyle(item.styles),
       ...getTransformStyle(item.styles),
       ...getStatusStyle(item.status),
       ...getPreviewConfigStyle(item.preview),
-      ...getBlendModeStyle(item.styles) as any,
-      ...getSizeStyle(item.attr)
+      ...getBlendModeStyle(item.styles) as any
     }"
   >
     <!-- 分组 -->
@@ -30,10 +30,7 @@
       :chartConfig="item"
       :themeSetting="themeSetting"
       :themeColor="themeColor"
-      :style="{ 
-        ...getSizeStyle(item.attr),
-        ...getFilterStyle(item.styles)
-      }"
+      :style="{ ...getSizeStyle(item.attr) }"
       v-on="useLifeHandler(item)"
     ></component>
   </div>
@@ -77,7 +74,7 @@ const themeColor = computed(() => {
 // 组件渲染结束初始化数据池
 clearMittDataPondMap()
 onMounted(() => {
-  initDataPond(useChartEditStore)
+  initDataPond(chartEditStore.requestGlobalConfig)
 })
 </script>
 

src/views/preview/hooks/useScale.hook.ts

@@ -13,42 +13,7 @@ export const useScale = (localStorageInfo: ChartEditStorageType) => {
   const height = ref(localStorageInfo.editCanvasConfig.height)
   const scaleRef = ref({ width: 1, height: 1 })
 
-  provide(SCALE_KEY, scaleRef)
-
-  // 监听鼠标滚轮 +ctrl 键
-  const useAddWheelHandle = (removeEvent: Function) => {
-    addEventListener(
-      'wheel',
-      (e: any) => {
-        if (window?.$KeyboardActive?.ctrl) {
-          e.preventDefault()
-          e.stopPropagation()
-          removeEvent()
-          const transform = previewRef.value?.style.transform
-          const regRes = transform.match(/scale\((\d+\.?\d*)*/) as RegExpMatchArray
-          const width = regRes[1]
-          const previewBoxDom = document.querySelector('.go-preview') as HTMLElement
-          const entityDom = document.querySelector('.go-preview-entity') as HTMLElement
-          if (previewBoxDom) {
-            previewBoxDom.style.overflow = 'unset'
-            previewBoxDom.style.position = 'absolute'
-          }
-          if (entityDom) {
-            entityDom.style.overflow = 'unset'
-          }
-
-          if (e.wheelDelta > 0) {
-            const resNum = parseFloat(Number(width).toFixed(2))
-            previewRef.value.style.transform = `scale(${resNum > 5 ? 5 : resNum + 0.1})`
-          } else {
-            const resNum = parseFloat(Number(width).toFixed(2))
-            previewRef.value.style.transform = `scale(${resNum < 0.2 ? 0.2 : resNum - 0.1})`
-          }
-        }
-      },
-      { passive: false }
-    )
-  }
+  provide(SCALE_KEY, scaleRef);
 
   const updateScaleRef = (scale: { width: number; height: number }) => {
     // 这里需要解构，保证赋值给scaleRef的为一个新对象
@@ -59,82 +24,74 @@ export const useScale = (localStorageInfo: ChartEditStorageType) => {
   // 屏幕适配
   onMounted(() => {
     switch (localStorageInfo.editCanvasConfig.previewScaleType) {
-      case PreviewScaleEnum.FIT:
-        ;(() => {
-          const { calcRate, windowResize, unWindowResize } = usePreviewFitScale(
-            width.value as number,
-            height.value as number,
-            previewRef.value,
-            updateScaleRef
-          )
-          calcRate()
-          windowResize()
-          useAddWheelHandle(unWindowResize)
-          onUnmounted(() => {
-            unWindowResize()
-          })
-        })()
-        break
-      case PreviewScaleEnum.SCROLL_Y:
-        ;(() => {
-          const { calcRate, windowResize, unWindowResize } = usePreviewScrollYScale(
-            width.value as number,
-            height.value as number,
-            previewRef.value,
-            scale => {
-              const dom = entityRef.value
-              dom.style.width = `${width.value * scale.width}px`
-              dom.style.height = `${height.value * scale.height}px`
-              updateScaleRef(scale)
-            }
-          )
-          calcRate()
-          windowResize()
-          useAddWheelHandle(unWindowResize)
-          onUnmounted(() => {
-            unWindowResize()
-          })
-        })()
+      case PreviewScaleEnum.FIT: (() => {
+        const { calcRate, windowResize, unWindowResize } = usePreviewFitScale(
+          width.value as number,
+          height.value as number,
+          previewRef.value,
+          updateScaleRef
+        )
+        calcRate()
+        windowResize()
+        onUnmounted(() => {
+          unWindowResize()
+        })
+      })()
+        break;
+      case PreviewScaleEnum.SCROLL_Y: (() => {
+        const { calcRate, windowResize, unWindowResize } = usePreviewScrollYScale(
+          width.value as number,
+          height.value as number,
+          previewRef.value,
+          (scale) => {
+            const dom = entityRef.value
+            dom.style.width = `${width.value * scale.width}px`
+            dom.style.height = `${height.value * scale.height}px`
+            updateScaleRef(scale)
+          }
+        )
+        calcRate()
+        windowResize()
+        onUnmounted(() => {
+          unWindowResize()
+        })
+      })()
 
-        break
-      case PreviewScaleEnum.SCROLL_X:
-        ;(() => {
-          const { calcRate, windowResize, unWindowResize } = usePreviewScrollXScale(
-            width.value as number,
-            height.value as number,
-            previewRef.value,
-            scale => {
-              const dom = entityRef.value
-              dom.style.width = `${width.value * scale.width}px`
-              dom.style.height = `${height.value * scale.height}px`
-              updateScaleRef(scale)
-            }
-          )
-          calcRate()
-          windowResize()
-          useAddWheelHandle(unWindowResize)
-          onUnmounted(() => {
-            unWindowResize()
-          })
-        })()
+        break;
+      case PreviewScaleEnum.SCROLL_X: (() => {
+        const { calcRate, windowResize, unWindowResize } = usePreviewScrollXScale(
+          width.value as number,
+          height.value as number,
+          previewRef.value,
+          (scale) => {
+            const dom = entityRef.value
+            dom.style.width = `${width.value * scale.width}px`
+            dom.style.height = `${height.value * scale.height}px`
+            updateScaleRef(scale)
+          }
+        )
+        calcRate()
+        windowResize()
+        onUnmounted(() => {
+          unWindowResize()
+        })
+      })()
 
-        break
-      case PreviewScaleEnum.FULL:
-        ;(() => {
-          const { calcRate, windowResize, unWindowResize } = usePreviewFullScale(
-            width.value as number,
-            height.value as number,
-            previewRef.value,
-            updateScaleRef
-          )
-          calcRate()
-          windowResize()
-          useAddWheelHandle(unWindowResize)
-          onUnmounted(() => {
-            unWindowResize()
-          })
-        })()
-        break
+        break;
+      case PreviewScaleEnum.FULL: (() => {
+        const { calcRate, windowResize, unWindowResize } = usePreviewFullScale(
+          width.value as number,
+          height.value as number,
+          previewRef.value,
+          updateScaleRef
+        )
+        calcRate()
+        windowResize()
+        onUnmounted(() => {
+          unWindowResize()
+        })
+      })()
+        break;
     }
   })
 

src/views/preview/suspenseIndex.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="`go-preview ${chartEditStore.editCanvasConfig.previewScaleType}`" @mousedown="dragCanvas">
+  <div :class="`go-preview ${chartEditStore.editCanvasConfig.previewScaleType}`">
     <template v-if="showEntity">
       <!-- 实体区域 -->
       <div ref="entityRef" class="go-preview-entity">
@@ -30,7 +30,7 @@
 import { computed } from 'vue'
 import { PreviewRenderList } from './components/PreviewRenderList'
 import { getFilterStyle, setTitle } from '@/utils'
-import { getEditCanvasConfigStyle, getSessionStorageInfo, keyRecordHandle, dragCanvas } from './utils'
+import { getEditCanvasConfigStyle, getSessionStorageInfo } from './utils'
 import { useComInstall } from './hooks/useComInstall.hook'
 import { useScale } from './hooks/useScale.hook'
 import { useStore } from './hooks/useStore.hook'
@@ -47,7 +47,6 @@ setTitle(`预览-${chartEditStore.editCanvasConfig.projectName}`)
 
 const previewRefStyle = computed(() => {
   return {
-    overflow: 'hidden',
     ...getEditCanvasConfigStyle(chartEditStore.editCanvasConfig),
     ...getFilterStyle(chartEditStore.editCanvasConfig)
   }
@@ -61,9 +60,6 @@ const showEntity = computed(() => {
 useStore(chartEditStore)
 const { entityRef, previewRef } = useScale(chartEditStore)
 const { show } = useComInstall(chartEditStore)
-
-// 开启键盘监听
-keyRecordHandle()
 </script>
 
 <style lang="scss" scoped>

src/views/preview/utils/drag.ts

@@ -1,55 +0,0 @@
-import { listen } from 'dom-helpers'
-import throttle from 'lodash/throttle'
-
-let prevMoveXValue = [0, 0]
-let prevMoveYValue = [0, 0]
-
-// 拖拽处理
-export const dragCanvas = (e: MouseEvent) => {
-  const previewBoxDom = document.querySelector('.go-preview') as HTMLElement
-  if (!previewBoxDom || previewBoxDom.style.position !== 'absolute') return
-  if (!window.$KeyboardActive?.space) return
-
-  e.preventDefault()
-  e.stopPropagation()
-  // @ts-ignore
-  document.activeElement?.blur()
-  const startX = e.screenX
-  const startY = e.screenY
-
-  const listenMousemove = listen(
-    window,
-    'mousemove',
-    throttle((moveEvent: MouseEvent) => {
-      const nx = moveEvent.screenX - startX
-      const ny = moveEvent.screenY - startY
-
-      const [prevMoveX1, prevMoveX2] = prevMoveXValue
-      const [prevMoveY1, prevMoveY2] = prevMoveYValue
-
-      prevMoveXValue = [prevMoveX2, nx]
-      prevMoveYValue = [prevMoveY2, ny]
-
-      // 去除小数部分
-      if (previewBoxDom) {
-        const oldLeft = previewBoxDom.style.left ? Number(previewBoxDom.style.left.split('px')[0]) : 0
-        const oldTop = previewBoxDom.style.top ? Number(previewBoxDom.style.top.split('px')[0]) : 0
-        previewBoxDom.style.left =
-          oldLeft +
-          (prevMoveX2 > prevMoveX1 ? Math.abs(prevMoveX2 - prevMoveX1) : -Math.abs(prevMoveX2 - prevMoveX1)) +
-          'px'
-        previewBoxDom.style.top =
-          oldTop +
-          (prevMoveY2 > prevMoveY1 ? Math.abs(prevMoveY2 - prevMoveY1) : -Math.abs(prevMoveY2 - prevMoveY1)) +
-          'px'
-      }
-    }, 20)
-  )
-
-  const listenMouseup = listen(window, 'mouseup', () => {
-    prevMoveXValue = [0, 0]
-    prevMoveYValue = [0, 0]
-    listenMousemove()
-    listenMouseup()
-  })
-}

src/views/preview/utils/index.ts

@@ -1,4 +1,2 @@
-export * from './style'
-export * from './storage'
-export * from './keyboard'
-export * from './drag'
+export * from './style'
+export * from './storage'