Merge branch 'dev' of gitee.com:dromara/go-view into dev

Signed-off-by: Baboon <changfan.xu.up@qq.com>

pnpm-lock.yaml

@@ -1154,6 +1154,15 @@ packages:
   /@types/node@17.0.43:
     resolution: {integrity: sha512-jnUpgw8fL9kP2iszfIDyBQtw5Mf4/XSqy0Loc1J9pI14ejL83XcCEvSf50Gs/4ET0I9VCCDoOfufQysj0S66xA==}
     dev: false
+    resolution: {integrity: sha512-jnUpgw8fL9kP2iszfIDyBQtw5Mf4/XSqy0Loc1J9pI14ejL83XcCEvSf50Gs/4ET0I9VCCDoOfufQysj0S66xA==, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.43.tgz}
+
+  /@types/normalize-package-data@2.4.1:
+    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
+    dev: true
+
+  /@types/parse-json@4.0.0:
+    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
+    dev: true
 
   /@types/node@22.9.0:
     resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}
@@ -2161,7 +2170,7 @@ packages:
     dev: false
 
   /echarts-wordcloud@2.0.0(echarts@5.3.3):
-    resolution: {integrity: sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==}
+    resolution: {integrity: sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==, tarball: https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz}
     peerDependencies:
       echarts: ^5.0.1
     dependencies:

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

@@ -8,8 +8,8 @@
         <n-input-number v-model:value="optionData.size" size="small" :min="0" placeholder="尺寸"></n-input-number>
       </setting-item>
     </setting-item-box>
-    <setting-item-box name="旋转">
-      <setting-item name="旋转">
+    <setting-item-box name="快捷旋转">
+      <setting-item name="也可使用通用的【变换】来旋转">
         <n-select v-model:value="optionData.rotate" size="small" :options="rotateMode"></n-select>
       </setting-item>
     </setting-item-box>
@@ -35,15 +35,15 @@ const rotateMode = [
     label: '0°'
   },
   {
-    value: 1,
+    value: 90,
     label: '90°'
   },
   {
-    value: 2,
+    value: 180,
     label: '180°'
   },
   {
-    value: 3,
+    value: 270,
     label: '270°'
   }
 ]

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

@@ -36,6 +36,8 @@
 import { computed, PropType, toRefs, watch, reactive, ref } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { icon } from '@/plugins'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
 
 const props = defineProps({
   chartConfig: {
@@ -83,6 +85,13 @@ watch(
     deep: true
   }
 )
+
+// setdata 数据监听与更改
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+  props.chartConfig.option.dataset = newData
+})
+
+
 </script>
 
 <style lang="scss" scoped>

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

@@ -170,6 +170,7 @@ watch(
       dimensions: any
     } | null
   ) => {
+    noData.value = false
     if (newData && targetData?.value?.chartConfig?.chartFrame === ChartFrameEnum.ECHARTS) {
       // 只有 DataSet 数据才有对应的格式
       source.value = newData