From 3f522cc7a051e07205d2392463a1c2abed506006 Mon Sep 17 00:00:00 2001
From: wangxue08 <wangxue08@corp.netease.com>
Date: Mon, 25 Mar 2024 15:45:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=9B=BE=E8=A1=A8=E7=9A=84=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E5=92=8C=E9=AB=98=E5=BA=A6=E6=A0=B9=E6=8D=AE=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=AE=B9=E5=99=A8=E5=AE=BD=E9=AB=98=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cw/cw_echarts_library/CHANGELOG.md      |  8 ++++++++
 .../components/cw-echart-bar-view/api.yaml       | 12 ------------
 .../components/cw-echart-bar-view/index.vue      | 16 ++++++----------
 .../components/cw-echart-basic-view/api.yaml     | 12 ------------
 .../components/cw-echart-basic-view/index.vue    | 14 +++-----------
 .../components/cw-echart-line-view/api.yaml      | 12 ------------
 .../components/cw-echart-line-view/index.vue     | 14 +++++---------
 .../components/cw-echart-pie-view/api.yaml       | 12 ------------
 packages/cw/cw_echarts_library/manifest          |  6 +++---
 packages/cw/cw_echarts_library/package.json      |  2 +-
 10 files changed, 26 insertions(+), 82 deletions(-)

diff --git a/packages/cw/cw_echarts_library/CHANGELOG.md b/packages/cw/cw_echarts_library/CHANGELOG.md
index 8c916963..db97c588 100644
--- a/packages/cw/cw_echarts_library/CHANGELOG.md
+++ b/packages/cw/cw_echarts_library/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.5
+
+Associated Task: [#283415](https://projectmanage.netease-official.lcap.163yun.com/dashboard/TaskDetail?id=2834156332085760)
+
+### ✨Features
+
+- [c4b5bd9](https://github.com/vusion/cloud-ui-materials/commit/c4b5bd953fa23ff9f591ef09d84bfaa27e35d6bd) Thanks [wangxue08](https://github.com/wangxue08) ! - 图表的宽度和高度根据外部容器宽高自适应
+
 ## 1.0.4
 
 Associated Task: [#281100](https://projectmanage.netease-official.lcap.163yun.com/dashboard/TaskDetail?id=2811004089143552)
diff --git a/packages/cw/cw_echarts_library/components/cw-echart-bar-view/api.yaml b/packages/cw/cw_echarts_library/components/cw-echart-bar-view/api.yaml
index 4fb153c7..2aab9726 100644
--- a/packages/cw/cw_echarts_library/components/cw-echart-bar-view/api.yaml
+++ b/packages/cw/cw_echarts_library/components/cw-echart-bar-view/api.yaml
@@ -209,18 +209,6 @@
         default: true
         description: 允许用户设置保存图片
         group: 图表功能
-      - name: width
-        title: 宽度
-        type: string
-        default: 380px
-        description: 设置图宽度
-        group: 图表基础
-      - name: height
-        title: 高度
-        type: string
-        default: 300px
-        description: 设置图高度
-        group: 图表基础
       - name: formatter
         title: 标签内容格式器
         type: string
diff --git a/packages/cw/cw_echarts_library/components/cw-echart-bar-view/index.vue b/packages/cw/cw_echarts_library/components/cw-echart-bar-view/index.vue
index 455dc3b4..fd2f01a8 100644
--- a/packages/cw/cw_echarts_library/components/cw-echart-bar-view/index.vue
+++ b/packages/cw/cw_echarts_library/components/cw-echart-bar-view/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="$style.root" ref="room">
-    <div :class="$style.container" border :style="size">
+    <div :class="$style.container" border>
       <echart-bar
         v-if="!loading"
         :axisData="axisData"
@@ -11,7 +11,7 @@
         ref="echart"
         @clickItem="$emit('clickItem', $event)"
       ></echart-bar>
-      <div v-else :style="size">
+      <div v-else>
         <img :src="require('../../assets/barEmpty.png')" :class="$style.emptyImage">
       </div>
     </div>
@@ -33,8 +33,6 @@ export default {
   props: {
     dataSource: [Function, Array, Object],
     theme: {type: String, default: 'theme1'},
-    width: {type: String, default: '340px'},
-    height: {type: String, default: '300px'},
     xAxis: {type: String, default: ''},
     yAxis: {type: String, default: ''},
     xAxisTitle: {type: String, default: 'X轴标题'},
@@ -108,12 +106,6 @@ export default {
     }
   },
   computed: {
-    size() {
-      return {
-        width: this.width,
-        height: this.height,
-      }
-    },
     axisData() {
       return {
         xAxis: this.xAxis,
@@ -222,6 +214,10 @@ export default {
 <style module>
 .root {
   display: inline-block;
+  > div {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .container[border] {
diff --git a/packages/cw/cw_echarts_library/components/cw-echart-basic-view/api.yaml b/packages/cw/cw_echarts_library/components/cw-echart-basic-view/api.yaml
index e63aaeb5..db9d2ab5 100644
--- a/packages/cw/cw_echarts_library/components/cw-echart-basic-view/api.yaml
+++ b/packages/cw/cw_echarts_library/components/cw-echart-basic-view/api.yaml
@@ -13,18 +13,6 @@
         type: Array<Item> | Function | object | DataSource
         designer-value: '[{}, {}, {}]'
         description: 表格的数据源，数据集对象或者返回数据集的逻辑
-      - name: width
-        title: 宽度
-        type: string
-        default: 380px
-        description: 设置图宽度
-        group: 图表基础
-      - name: height
-        title: 高度
-        type: string
-        default: 300px
-        description: 设置图高度
-        group: 图表基础
       - name: formatter
         title: 标签内容格式器
         type: string
diff --git a/packages/cw/cw_echarts_library/components/cw-echart-basic-view/index.vue b/packages/cw/cw_echarts_library/components/cw-echart-basic-view/index.vue
index 35146575..8c66c749 100644
--- a/packages/cw/cw_echarts_library/components/cw-echart-basic-view/index.vue
+++ b/packages/cw/cw_echarts_library/components/cw-echart-basic-view/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="$style.root" ref="room"> 
-    <div :class="$style.container" border :style="size">
+    <div :class="$style.container" border>
       <echart-basic
         v-if="!loading"
         :sourceData="sourceData"
@@ -31,8 +31,6 @@ export default {
   props: {
     dataSource: [Function, Array, Object],
     options: {type: Object, default: () => ({})},
-    width: {type: String, default: '380px'},
-    height: {type: String, default: '300px'},
   },
   data() {
     return {
@@ -43,14 +41,6 @@ export default {
   created() {
     this.init();
   },
-  computed: {
-    size() {
-      return {
-        width: this.width,
-        height: this.height,
-      }
-    },
-  },
   mounted(){
     this.resizeObserver = new ResizeObserver(()=>{
       this.$refs.echart.resize();
@@ -116,6 +106,8 @@ export default {
 .container[border] {
   border: 1px solid var(--border-color-base);
   padding: 15px;
+  width: 100%;
+  height: 100%;
 }
 
 .emptyImage {
diff --git a/packages/cw/cw_echarts_library/components/cw-echart-line-view/api.yaml b/packages/cw/cw_echarts_library/components/cw-echart-line-view/api.yaml
index 6d9e6f85..62f9aafb 100644
--- a/packages/cw/cw_echarts_library/components/cw-echart-line-view/api.yaml
+++ b/packages/cw/cw_echarts_library/components/cw-echart-line-view/api.yaml
@@ -251,18 +251,6 @@
         default: true
         description: 允许用户设置保存图片
         group: 图表功能
-      - name: width
-        title: 宽度
-        type: string
-        default: 380px
-        description: 设置图宽度
-        group: 图表基础
-      - name: height
-        title: 高度
-        type: string
-        default: 300px
-        description: 设置图高度
-        group: 图表基础
       - name: formatter
         title: 标签内容格式器
         type: string
diff --git a/packages/cw/cw_echarts_library/components/cw-echart-line-view/index.vue b/packages/cw/cw_echarts_library/components/cw-echart-line-view/index.vue
index 7d28d053..1e2ceee0 100644
--- a/packages/cw/cw_echarts_library/components/cw-echart-line-view/index.vue
+++ b/packages/cw/cw_echarts_library/components/cw-echart-line-view/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="$style.root" ref="room">
-    <div :class="$style.container" border :style="size">
+    <div :class="$style.container" border >
       <echart-line
         v-if="!loading"
         :axisData="axisData"
@@ -34,8 +34,6 @@ export default {
   props: {
     dataSource: [Function, Array, Object],
     theme: {type: String, default: 'theme1'},
-    width: {type: String, default: '340px'},
-    height: {type: String, default: '300px'},
     xAxis: {type: String, default: ''},
     yAxis: {type: String, default: ''},
     xAxisTitle: {type: String, default: 'X轴标题'},
@@ -111,12 +109,6 @@ export default {
     }
   },
   computed: {
-    size() {
-      return {
-        width: this.width,
-        height: this.height,
-      }
-    },
     axisData() {
       return {
         xAxis: this.xAxis,
@@ -213,6 +205,10 @@ export default {
 <style module>
 .root {
   display: inline-block;
+  > div {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .container[border] {
diff --git a/packages/cw/cw_echarts_library/components/cw-echart-pie-view/api.yaml b/packages/cw/cw_echarts_library/components/cw-echart-pie-view/api.yaml
index dfa12712..aed3fe1b 100644
--- a/packages/cw/cw_echarts_library/components/cw-echart-pie-view/api.yaml
+++ b/packages/cw/cw_echarts_library/components/cw-echart-pie-view/api.yaml
@@ -150,18 +150,6 @@
         default: true
         description: 允许用户设置保存图片
         group: 图表功能
-      - name: width
-        title: 宽度
-        type: string
-        default: 340px
-        description: 设置图宽度
-        group: 图表基础
-      - name: height
-        title: 高度
-        type: string
-        default: 300px
-        description: 设置图高度
-        group: 图表基础
       - name: formatter
         title: 标签内容格式器
         type: string
diff --git a/packages/cw/cw_echarts_library/manifest b/packages/cw/cw_echarts_library/manifest
index f4181394..1d1b77e0 100644
--- a/packages/cw/cw_echarts_library/manifest
+++ b/packages/cw/cw_echarts_library/manifest
@@ -1,6 +1,6 @@
 Plugin-Version: 1.0.0
 Library-Type: Frontend
 Metadata-File: usage.json
-packages/extension/cw_echarts_library@1.0.4/dist-theme/demo.html: dist-theme/demo.html
-packages/extension/cw_echarts_library@1.0.4/dist-theme/index.js: dist-theme/index.js
-packages/extension/cw_echarts_library@1.0.4/dist-theme/index.js.map: dist-theme/index.js.map
\ No newline at end of file
+packages/extension/cw_echarts_library@1.0.5/dist-theme/demo.html: dist-theme/demo.html
+packages/extension/cw_echarts_library@1.0.5/dist-theme/index.js: dist-theme/index.js
+packages/extension/cw_echarts_library@1.0.5/dist-theme/index.js.map: dist-theme/index.js.map
\ No newline at end of file
diff --git a/packages/cw/cw_echarts_library/package.json b/packages/cw/cw_echarts_library/package.json
index e191e9f2..82b2a2a1 100644
--- a/packages/cw/cw_echarts_library/package.json
+++ b/packages/cw/cw_echarts_library/package.json
@@ -2,7 +2,7 @@
   "name": "cw_echarts_library",
   "title": "echarts依赖库",
   "description": "",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "./index.js",
   "author": "",
   "repository": "",