Merge branch 'dev' into master-fetch-dev

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-box name="快捷旋转">
-      <setting-item 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>