From 268f72e3f35bde5f58bc30e9ea4a4fca68c7b444 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Tue, 17 Oct 2023 13:38:17 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=80=89=E9=A1=B9=E4=BF=9D=E5=AD=98=E5=88=B0=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RightSetting/DataSetting.vue              | 20 +++++++++----------
 .../packages/js/config/commonConfig.js        |  1 +
 data-room-ui/packages/js/store/actions.js     |  4 ++++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index d297967e..21eac27a 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -27,7 +27,7 @@
               label="数据来源"
             >
               <el-radio-group
-                v-model="dataSourceStyle"
+                v-model="config.dataSource.source "
                 class="bs-el-radio-group"
               >
                 <el-radio label="dataset">
@@ -39,7 +39,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item
-              v-if="dataSourceStyle === 'dataset'"
+              v-if="config.dataSource.source === 'dataset'"
               label="数据集"
             >
               <data-set-select
@@ -56,7 +56,7 @@
               </data-set-select>
             </el-form-item>
             <el-form-item
-              v-if="dataSourceStyle === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
+              v-if="config.dataSource.source === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
               label="表达式"
             >
               <i
@@ -102,7 +102,7 @@ data.forEach(item => {
           </div>
         </div>
         <div
-          v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && dataSourceStyle !== 'expression'"
+          v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && config.dataSource.source !== 'expression'"
           class="data-setting-data-box"
         >
           <div class="lc-field-head">
@@ -300,7 +300,7 @@ data.forEach(item => {
               <el-table-column
                 prop="width"
                 label="列宽"
-                width='90'
+                width="90"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -470,7 +470,7 @@ data.forEach(item => {
           </div>
         </div>
         <div
-          v-if="config.option.displayOption.params.enable && dataSourceStyle !== 'expression'"
+          v-if="config.option.displayOption.params.enable && config.dataSource.source !== 'expression'"
           class="data-setting-data-box"
         >
           <div class="lc-field-head">
@@ -642,7 +642,6 @@ export default {
   },
   data () {
     return {
-      dataSourceStyle: 'dataset', // 数据来源方式
       fieldsList: [],
       params: [], // 参数配置
       datasetName: '',
@@ -764,11 +763,10 @@ export default {
     }
   },
   methods: {
-    changeDsid(dsId){
-       this.clearVerify()
-      this.config.customize.columnConfig=[]
+    changeDsid (dsId) {
+      this.clearVerify()
+      this.config.customize.columnConfig = []
       this.getDataSetDetailsById(dsId, 'treeTable')
-
     },
     // 打开表达式弹窗
     openExpression () {
diff --git a/data-room-ui/packages/js/config/commonConfig.js b/data-room-ui/packages/js/config/commonConfig.js
index 597a1a04..2213f743 100644
--- a/data-room-ui/packages/js/config/commonConfig.js
+++ b/data-room-ui/packages/js/config/commonConfig.js
@@ -67,6 +67,7 @@ export default function (customConfig) {
       className:
         'com.gccloud.dataroom.core.module.chart.components.datasource.DataSetDataSource',
       dataSourceKey: '', // 数据源，选择不同数据库
+      source: 'dataset',
       businessKey: '', // 数据集标识
       dimensionField: '', // 维度
       metricField: '', // 指标
diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js
index 3da88517..f2df60f8 100644
--- a/data-room-ui/packages/js/store/actions.js
+++ b/data-room-ui/packages/js/store/actions.js
@@ -18,6 +18,10 @@ export default {
         const pageInfo = handleResData(data)
         // 兼容边框配置
         pageInfo.chartList.forEach((item) => {
+          if (item.dataSource) {
+            item.dataSource.source = item.dataSource?.source || 'dataset'
+          }
+
           if (!item.border) {
             item.border = { type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [0, 0, 0, 0] }
           }

From a470b192a2e61f721b9842178a6bf5170271faf8 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Tue, 17 Oct 2023 14:08:39 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=E7=82=B9=E4=B9=9D=E5=9B=BE=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/package-lock.json                |  86 +++---
 .../RightSetting/BorderSetting.vue            |  21 +-
 .../RightSetting/MoveDialog/index.vue         | 278 ++++++++++++++++++
 .../BorderComponents/GcBorder16/index.vue     |  11 +-
 data-room-ui/packages/BorderSelect/index.vue  |   1 -
 5 files changed, 350 insertions(+), 47 deletions(-)
 create mode 100644 data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue

diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json
index b7368cb4..b6ee77d2 100644
--- a/data-room-ui/package-lock.json
+++ b/data-room-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "2.0.0-RELEASE",
+  "version": "2.0.1-2023101601-Alpha",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3392,27 +3392,6 @@
         "whatwg-fetch": "^3.6.2"
       },
       "dependencies": {
-        "@vue/vue-loader-v15": {
-          "version": "npm:vue-loader@15.10.2",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.2.tgz",
-          "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
-          "dev": true,
-          "requires": {
-            "@vue/component-compiler-utils": "^3.1.0",
-            "hash-sum": "^1.0.2",
-            "loader-utils": "^1.1.0",
-            "vue-hot-reload-api": "^2.3.0",
-            "vue-style-loader": "^4.1.0"
-          },
-          "dependencies": {
-            "hash-sum": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-              "dev": true
-            }
-          }
-        },
         "acorn-walk": {
           "version": "8.2.0",
           "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
@@ -3484,26 +3463,6 @@
             "tapable": "^2.0.0"
           }
         },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3738,6 +3697,47 @@
         "lodash": "^4.17.4"
       }
     },
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.10.2",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
+      "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
     "@vue/vue2-jest": {
       "version": "27.0.0",
       "resolved": "https://registry.npmjs.org/@vue/vue2-jest/-/vue2-jest-27.0.0.tgz",
@@ -20142,7 +20142,7 @@
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
       "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
index d2db4a86..cbf486cf 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
@@ -151,7 +151,7 @@
           v-model="config[setting.field]"
           v-else-if="setting.type === 'background'"
           clearable
-          placeholder="请选择图片"
+          placeholder="选择或输入链接"
         >
           <template slot="append">
             <el-button
@@ -163,6 +163,13 @@
             </el-button>
           </template>
         </el-input>
+        <el-button
+          v-else-if="setting.type === 'move'"
+          type="primary"
+          @click="initMove(config.imgUrl)"
+        >
+          图形切割
+        </el-button>
         <el-select
           v-else-if="setting.type === 'select'"
           v-model="config[setting.field]"
@@ -267,6 +274,7 @@
       </el-form-item>
       </div>
       <SourceDialog ref="SourceDialog" @getImg='changeImg'  />
+      <MoveDialog @getArray='changeBorder' ref="MoveDialog"/>
     </div>
   </div>
 </template>
@@ -277,13 +285,15 @@ import BorderColorSetting from 'data-room-ui/BigScreenDesign/RightSetting/Border
 import ColorSelect from 'data-room-ui/ColorMultipleSelect/index.vue'
 import BorderSelect from 'data-room-ui/BorderSelect/index.vue'
 import SourceDialog from '../SourceDialog/index.vue'
+import MoveDialog from './MoveDialog/index.vue'
 export default {
   name: '',
   components: {
     BorderSelect,
     ColorSelect,
     BorderColorSetting,
-    SourceDialog
+    SourceDialog,
+    MoveDialog
   },
   props: {
     bigTitle:{
@@ -381,6 +391,9 @@ export default {
     // }
   },
   methods: {
+    changeBorder(val){
+      this.$set(this.config,'borderArray',val)
+    },
     changeImg(val){
       this.$set(this.config,'imgUrl',val.url)
     },
@@ -389,6 +402,10 @@ export default {
     },
     initCard(){
       this.$refs.SourceDialog.init()
+    },
+    initMove(val){
+      console.log(val)
+      this.$refs.MoveDialog.init(val,this.config.borderArray)
     }
 
   }
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
new file mode 100644
index 00000000..d627d0a1
--- /dev/null
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -0,0 +1,278 @@
+<template>
+  <el-dialog
+    title="资源库"
+    :visible.sync="dialogVisible"
+    :modal="true"
+    :modal-append-to-body="false"
+    :appen-to-body="false"
+    class="bs-dialog-wrap bs-el-dialog"
+    @closed="close"
+    @opened='getDom'
+  >
+    <div class="content">
+      <div class="img">
+        <span class="toptitle">
+            <el-input-number
+            @change='changeTop'
+            controls-position="right"
+            v-model="top"
+            class="bs-el-input-number"
+            :step=" 1"
+            :min="0"
+            :max="100000"
+            />
+        </span>
+        <span class="righttitle">
+            <el-input-number
+            @change='changeRight'
+            controls-position="right"
+            v-model="right"
+            class="bs-el-input-number"
+            :step=" 1"
+            :min="0"
+            :max="100000"
+            />
+        </span>
+        <span class="bottomtitle">
+            <el-input-number
+            @change='changeBottom'
+            controls-position="right"
+            v-model="bottom"
+            class="bs-el-input-number"
+            :step=" 1"
+            :min="0"
+            :max="100000"
+            />
+        </span>
+        <span class="lefttitle">
+            <el-input-number
+            @change='changeLeft'
+            controls-position="right"
+            v-model="left"
+            class="bs-el-input-number"
+            :step=" 1"
+            :min="0"
+            :max="100000"
+            />
+        </span>
+          <el-image
+          :src="this.imgUrl||url"
+          fit="none"></el-image>
+          <div
+           @mousedown="onMouseDown"
+           @mouseup="onMouseUp"
+           @mousemove="onMousemove"
+           @click="changeSymbol('top')"
+           id="top"
+           class="top">
+
+          </div>
+          <div @click="changeSymbol('right')" id="right" class="right">
+          </div>
+          <div @click="changeSymbol('bottom')" id="bottom" class="bottom">
+          </div>
+          <div @click="changeSymbol('left')" id="left" class="left">
+          </div>
+      </div>
+    </div>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button
+        class="bs-el-button-default"
+        @click="dialogVisible = false"
+      >
+        取消
+      </el-button>
+      <el-button
+        type="primary"
+        @click="confirm"
+      >
+        确定
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { right } from '@antv/g2plot/lib/plots/sankey/sankey'
+
+export default {
+  name: 'SourceDialog',
+  data () {
+    return {
+      dialogVisible: false,
+      imgUrl:'',
+      top:0,
+      right:0,
+      bottom:0,
+      left:0,
+      symbol:'',
+      isDown:false,
+      x:0,
+      y:0,
+      l:0,
+      t:0
+    }
+  },
+  computed: {
+    url(){
+      return require('data-room-ui/BorderComponents/GcBorder16/component.png')
+    }
+  },
+  mounted () {
+   },
+  methods: {
+    confirm(){
+      this.$emit('getArray',[this.top,this.right,this.bottom,this.left])
+      this.dialogVisible = false
+    },
+    getDom(){
+      //  const a=document.getElementById('top')
+      //  const b=document.getElementById('right')
+      //  const c=document.getElementById('bottom')
+      //  const d=document.getElementById('left')
+      //  this.top=getComputedStyle(a).top.slice(0,-2)
+      //  this.right=getComputedStyle(b).right.slice(0,-2)
+      //  this.bottom=getComputedStyle(c).bottom.slice(0,-2)
+      //  this.left=getComputedStyle(d).left.slice(0,-2)
+    },
+    onMouseUp(){
+      // this.isDown=false;
+    },
+    onMousemove(e){
+      // const a=document.getElementById('top')
+      // if(this.isDown==false){
+      //   return
+      // }
+      // console.log(e)
+      // let ny=e.clientY-194;
+      // let nt=ny-(this.y-this.t);
+      // a.style.top=nt+"px"
+      // this.top=a.style.top
+    },
+    onMouseDown(e){
+      // this.y=e.layerY
+	    // this.t=this.top;
+      // this.isDown=true
+      // console.log(this.x,this.l)
+    },
+    changeSymbol(val){
+      this.symbol=val
+    },
+
+    close(){
+
+    },
+    changeTop(val){
+      const a=document.getElementById('top')
+      a.style.top=val+"px"
+    },
+    changeRight(val){
+      const a=document.getElementById('right')
+      a.style.right=val+"px"
+    },
+     changeBottom(val){
+      const a=document.getElementById('bottom')
+      a.style.bottom=val+"px"
+    },
+     changeLeft(val){
+      const a=document.getElementById('left')
+      a.style.left=val+"px"
+    },
+    init (val,array) {
+      this.imgUrl=val
+      if(array){
+        [this.top,this.right,this.bottom,this.left]=array
+        this.$nextTick(()=>{
+          this.changeTop(this.top)
+          this.changeRight(this.right)
+          this.changeBottom(this.bottom)
+          this.changeLeft(this.left)
+        })
+      }
+      this.dialogVisible = true
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+// @import '../../assets/style/bsTheme.scss';
+::v-deep .el-dialog__body{
+  background-color: #232832;
+  position: relative;
+  min-height: 400px;
+  align-items: center;
+  justify-content: center;
+  display: flex;
+  padding: 16px 16px 16px 16px !important;
+}
+.content{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .img{
+    position: relative;
+    .toptitle{
+        position: absolute;
+        top: -30px;
+        left: 42%;
+      }
+    .righttitle{
+      position: absolute;
+      top: 50%;
+      right: -75px;
+    }
+    .bottomtitle{
+      position: absolute;
+      bottom: -30px;
+      left: 42%;
+    }
+    .lefttitle{
+      position: absolute;
+      top: 50%;
+      left: -75px;
+    }
+    // height: 100%;
+    .top{
+      position: absolute;
+      top: 0;
+      height: 1px;
+      background-color: #fff;
+      width: 100%;
+    }
+    .right{
+      position: absolute;
+      right: 0;
+      top: 0;
+      height: 100%;
+      background-color: #fff;
+      width: 1px;
+    }
+    .bottom{
+      position: absolute;
+      bottom: 0;
+      height: 1px;
+      background-color: #fff;
+      width: 100%;
+    }
+    .left{
+      position: absolute;
+      left: 0;
+      top: 0;
+      height: 100%;
+      background-color: #fff;
+      width: 1px;
+    }
+  }
+
+}
+::v-deep .el-input-number--mini{
+  width: 70px;
+  .el-input__inner{
+    padding-right: 30px;
+  }
+}
+
+</style>
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
index ac4205e0..f86ee0de 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
@@ -33,6 +33,9 @@ export default {
     }
   },
   computed: {
+    url(){
+      return require('data-room-ui/BorderComponents/GcBorder16/component.png')
+    },
     borderArray(){
       return this.config.border.borderArray ? this.config.border.borderArray
         : [100,100,100,100]
@@ -44,6 +47,9 @@ export default {
         if(val){
           const a =document.getElementById('border'+ this.config.code)
           a.style['border-image-source']=`url(${val})`
+        }else{
+          const a =document.getElementById('border'+ this.config.code)
+          a.style['border-image-source']=`url(${this.url})`
         }
       }
     }
@@ -52,6 +58,9 @@ export default {
     if(this.config.border.imgUrl){
       const a =document.getElementById('border'+ this.config.code)
           a.style['border-image-source']=`url(${this.config.border.imgUrl})`
+    }else{
+      const a =document.getElementById('border'+ this.config.code)
+          a.style['border-image-source']=`url(${this.url})`
     }
   },
   methods: {
@@ -61,7 +70,7 @@ export default {
 
 <style lang="scss" scoped>
 .bs-design-wrap {
-  border-image-source:url(component.png);
+  // border-image-source:url(component.png);
   width: 100%;
   height: 100%;
   position: absolute;
diff --git a/data-room-ui/packages/BorderSelect/index.vue b/data-room-ui/packages/BorderSelect/index.vue
index a613fb95..e3b30f6d 100644
--- a/data-room-ui/packages/BorderSelect/index.vue
+++ b/data-room-ui/packages/BorderSelect/index.vue
@@ -29,7 +29,6 @@
             @click="chooseComponent(component)"
           >
             <div
-              v-if="component.title!='GcBorder16'"
               :class="component.title == focus.title ? 'focus' : ''"
               class="big-screen-card-inner"
             >

From e0c9b1d67a7287f97db69f6fef7353c73e7b5593 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Tue, 17 Oct 2023 17:07:59 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/PlotRender/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data-room-ui/packages/PlotRender/index.vue b/data-room-ui/packages/PlotRender/index.vue
index a326f7a0..b67a2f38 100644
--- a/data-room-ui/packages/PlotRender/index.vue
+++ b/data-room-ui/packages/PlotRender/index.vue
@@ -203,6 +203,10 @@ export default {
       } else {
         // 数据返回失败则赋前端的模拟数据
         config.option.data = this.plotList?.find(plot => plot.name === config.name)?.option?.data || config?.option?.data
+        const _xField = this.plotList?.find(plot => plot.name === config.name)?.option?.xField || config?.option?.xField
+        const _yField = this.plotList?.find(plot => plot.name === config.name)?.option?.yField || config?.option?.yField
+        const _seriesField = this.plotList?.find(plot => plot.name === config.name)?.option?.seriesField || config?.option?.seriesField
+        config.option = _seriesField ? { ...config.option, xField: _xField, yField: _yField, seriesField: _seriesField } : { ...config.option, xField: _xField, yField: _yField }
       }
       return config
     },

From e51342a4489b5c0b227d87e57db73d716afdfdf7 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Tue, 17 Oct 2023 17:38:01 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=89=AD=E6=9B=B2=E9=80=8F=E8=A7=86=E5=80=BC=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/package-lock.json                | 92 +++++++++----------
 data-room-ui/package.json                     |  2 +-
 .../BasicComponents/Button/setting.vue        |  4 +-
 .../BasicComponents/ChartTab/setting.vue      | 12 +--
 .../BasicComponents/CurrentTime/setting.vue   | 12 +--
 .../BasicComponents/CustomHtml/setting.vue    | 12 +--
 .../DateTimePicker/setting.vue                |  4 +-
 .../BasicComponents/DigitalFlop/setting.vue   |  4 +-
 .../BasicComponents/FlyMap/setting.vue        | 12 +--
 .../HorizontalLine/setting.vue                |  4 +-
 .../BasicComponents/IframeChart/setting.vue   | 12 +--
 .../BasicComponents/IndexCard/setting.vue     |  4 +-
 .../BasicComponents/IndexCard2/setting.vue    |  4 +-
 .../BasicComponents/IndicatorCard/setting.vue |  4 +-
 .../IndicatorCard2/setting.vue                |  4 +-
 .../BasicComponents/Input/setting.vue         |  4 +-
 .../BasicComponents/LinkChart/setting.vue     |  4 +-
 .../packages/BasicComponents/Map/setting.vue  | 12 +--
 .../BasicComponents/Marquee/setting.vue       | 12 +--
 .../BasicComponents/Numbers/setting.vue       | 12 +--
 .../BasicComponents/Picture/setting.vue       | 12 +--
 .../ScreenScrollBoard/setting.vue             |  4 +-
 .../ScreenScrollRanking/setting.vue           |  4 +-
 .../BasicComponents/Select/setting.vue        |  4 +-
 .../BasicComponents/Tables/setting.vue        | 12 +--
 .../BasicComponents/Texts/setting.vue         | 12 +--
 .../BasicComponents/ThemeSelect/setting.vue   | 12 +--
 .../BasicComponents/ThemeSwitcher/setting.vue | 12 +--
 .../BasicComponents/TimeCountDown/setting.vue | 12 +--
 .../BasicComponents/TimePicker/setting.vue    |  4 +-
 .../BasicComponents/VerticalLine/setting.vue  |  4 +-
 .../BasicComponents/Video/setting.vue         |  4 +-
 .../BigScreenDesign/BorderSetting.vue         |  4 +-
 .../RightSetting/EchartsCustomSetting.vue     | 12 +--
 .../RightSetting/G2CustomSetting.vue          | 12 +--
 .../packages/Borders/Border14/setting.vue     | 10 +-
 .../packages/Borders/Border15/setting.vue     | 10 +-
 .../Decorations/Decoration1/setting.vue       |  4 +-
 .../Decorations/Decoration10/setting.vue      |  4 +-
 .../Decorations/Decoration11/setting.vue      |  4 +-
 .../Decorations/Decoration12/setting.vue      |  4 +-
 .../Decoration2Reverse/setting.vue            |  4 +-
 .../Decorations/Decoration3/setting.vue       |  4 +-
 .../Decorations/Decoration4/setting.vue       |  4 +-
 .../Decoration4Reverse/setting.vue            |  4 +-
 .../Decorations/Decoration5/setting.vue       |  4 +-
 .../Decorations/Decoration6/setting.vue       |  4 +-
 .../Decorations/Decoration8/setting.vue       |  4 +-
 .../Decoration8Reverse/setting.vue            |  4 +-
 .../Decorations/Decoration9/setting.vue       |  4 +-
 data-room-ui/packages/Render/index.vue        |  4 +-
 51 files changed, 223 insertions(+), 207 deletions(-)

diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json
index b6ee77d2..8d4c06a5 100644
--- a/data-room-ui/package-lock.json
+++ b/data-room-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "2.0.1-2023101601-Alpha",
+  "version": "2.0.1-RELEASE",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1660,9 +1660,9 @@
       "dev": true
     },
     "@gcpaas/vue-draggable-resizable-gorkys": {
-      "version": "1.0.1-2023101602-Alpha",
-      "resolved": "https://registry.npmjs.org/@gcpaas/vue-draggable-resizable-gorkys/-/vue-draggable-resizable-gorkys-1.0.1-2023101602-Alpha.tgz",
-      "integrity": "sha512-bNC/v2B4tByl2Z7GfXXsBFkcIiHhxtaaDatjpwmz5KMpK72VzK1RPhePnePyr/yPFLhQiE2NbPpjpvDLRiz1tg==",
+      "version": "1.0.1-2023101705-Alpha",
+      "resolved": "https://registry.npmjs.org/@gcpaas/vue-draggable-resizable-gorkys/-/vue-draggable-resizable-gorkys-1.0.1-2023101705-Alpha.tgz",
+      "integrity": "sha512-y03QX0I88eM7ZJMS88cG0g+2ak9jPZdXAHZCO2bFR4L88KllMWQ3tW4jEbqbWll3Xz0npN5JwHn4V2ltSgd6ew==",
       "requires": {
         "core-js": "^2.6.11"
       },
@@ -3392,6 +3392,27 @@
         "whatwg-fetch": "^3.6.2"
       },
       "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.10.2",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
+          "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        },
         "acorn-walk": {
           "version": "8.2.0",
           "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
@@ -3463,6 +3484,26 @@
             "tapable": "^2.0.0"
           }
         },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3697,47 +3738,6 @@
         "lodash": "^4.17.4"
       }
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.10.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
-      "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
-      }
-    },
     "@vue/vue2-jest": {
       "version": "27.0.0",
       "resolved": "https://registry.npmjs.org/@vue/vue2-jest/-/vue2-jest-27.0.0.tgz",
@@ -20142,7 +20142,7 @@
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
       "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },
diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index aecfacbf..36e3433a 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -56,7 +56,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/g2plot": "2.4.0",
-    "@gcpaas/vue-draggable-resizable-gorkys": "^1.0.1-2023101602-Alpha",
+    "@gcpaas/vue-draggable-resizable-gorkys": "^1.0.1-2023101705-Alpha",
     "@jiaminghi/data-view": "2.10.0",
     "axios": "0.18.1",
     "echarts": "^5.2.2",
diff --git a/data-room-ui/packages/BasicComponents/Button/setting.vue b/data-room-ui/packages/BasicComponents/Button/setting.vue
index 90993bc6..bf974a7e 100644
--- a/data-room-ui/packages/BasicComponents/Button/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Button/setting.vue
@@ -28,12 +28,12 @@
               :bigTitle='config.title'
             />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
           <SettingTitle>基础</SettingTitle>
           <div class="lc-field-body">
             <el-form-item label="按钮名称">
diff --git a/data-room-ui/packages/BasicComponents/ChartTab/setting.vue b/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
index 4f0067c9..52bc7476 100644
--- a/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
@@ -35,12 +35,12 @@
           label-width="120px"
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue b/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
index 03e57c92..233c4ff8 100644
--- a/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
@@ -37,12 +37,12 @@
           :bigTitle='config.title'
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="setting-wrap">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue b/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
index 6a2ca0df..eee85b60 100644
--- a/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
+++ b/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
@@ -37,12 +37,12 @@
           :bigTitle='config.title'
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="setting-wrap">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
index 13630ce7..cf3582d2 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
@@ -19,12 +19,12 @@
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
           <SettingTitle>基础</SettingTitle>
           <div class="lc-field-body">
             <el-form-item label="组件类型">
diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
index 50b4075b..84eb6c38 100644
--- a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
+++ b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
@@ -36,12 +36,12 @@
               :bigTitle='config.title'
             />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
           <SettingTitle>基础</SettingTitle>
           <div class="lc-field-body">
             <el-form-item label="字体大小">
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
index e195642d..e99234c7 100644
--- a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
+++ b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
@@ -33,12 +33,12 @@
           :bigTitle='config.title'
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue
index 947be217..6ff5e582 100644
--- a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue
+++ b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue
@@ -28,12 +28,12 @@
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
           <SettingTitle v-if="config.border">边框</SettingTitle>
           <div class="lc-field-body">
             <BorderSetting
diff --git a/data-room-ui/packages/BasicComponents/IframeChart/setting.vue b/data-room-ui/packages/BasicComponents/IframeChart/setting.vue
index a96408eb..c24d933b 100644
--- a/data-room-ui/packages/BasicComponents/IframeChart/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IframeChart/setting.vue
@@ -29,12 +29,12 @@
       <div class="setting-wrap">
         <PosWhSetting :config="config" />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
        <SettingTitle v-if="config.border">边框</SettingTitle>
           <div class="lc-field-body">
             <BorderSetting
diff --git a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue
index b51c0d73..ac236a42 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
          <!-- <SettingTitle v-if="config.border">边框</SettingTitle>
           <div class="lc-field-body">
             <BorderSetting
diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue
index cac7ed95..ed6b4147 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue
@@ -36,12 +36,12 @@
             :bigTitle='config.title'
           />
         </div> -->
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
            <el-form-item label-width="100px" label="渐变背景色一">
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
index 536a227b..a0e09f1e 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
          <!-- <SettingTitle v-if="config.border">边框</SettingTitle>
           <div class="lc-field-body">
             <BorderSetting
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
index c964fee9..919bf6ef 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
          <!-- <SettingTitle v-if="config.border">边框</SettingTitle>
           <div class="lc-field-body">
             <BorderSetting
diff --git a/data-room-ui/packages/BasicComponents/Input/setting.vue b/data-room-ui/packages/BasicComponents/Input/setting.vue
index 28b6f346..61f660d8 100644
--- a/data-room-ui/packages/BasicComponents/Input/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Input/setting.vue
@@ -72,12 +72,12 @@
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
           <SettingTitle>基础</SettingTitle>
           <div class="lc-field-body">
             <el-form-item label="输入值字体大小">
diff --git a/data-room-ui/packages/BasicComponents/LinkChart/setting.vue b/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
index 6f82e2f3..c6257f42 100644
--- a/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
+++ b/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
@@ -40,12 +40,12 @@
               :bigTitle='config.title'
             />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="bs-setting-wrap">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue
index 5bad688d..9bc69513 100644
--- a/data-room-ui/packages/BasicComponents/Map/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Map/setting.vue
@@ -33,12 +33,12 @@
               :bigTitle='config.title'
             />
           </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/Marquee/setting.vue b/data-room-ui/packages/BasicComponents/Marquee/setting.vue
index ea156cb1..a3c2594f 100644
--- a/data-room-ui/packages/BasicComponents/Marquee/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Marquee/setting.vue
@@ -40,12 +40,12 @@
               :bigTitle='config.title'
             />
           </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/Numbers/setting.vue b/data-room-ui/packages/BasicComponents/Numbers/setting.vue
index f15a0e4e..60f5f1f2 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Numbers/setting.vue
@@ -42,12 +42,12 @@
           :big-title="config.title"
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/Picture/setting.vue b/data-room-ui/packages/BasicComponents/Picture/setting.vue
index c584e84f..5c83da0f 100644
--- a/data-room-ui/packages/BasicComponents/Picture/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Picture/setting.vue
@@ -40,12 +40,12 @@
           :bigTitle='config.title'
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
index 251fa23e..06c09a6e 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
@@ -36,12 +36,12 @@
               :bigTitle='config.title'
             />
           </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="表头背景色">
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue
index b05e8b54..259c05fc 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue
@@ -35,12 +35,12 @@
             :bigTitle='config.title'
           />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/Select/setting.vue b/data-room-ui/packages/BasicComponents/Select/setting.vue
index 97987c6e..1373068c 100644
--- a/data-room-ui/packages/BasicComponents/Select/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Select/setting.vue
@@ -19,12 +19,12 @@
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
           <SettingTitle>基础</SettingTitle>
           <div class="lc-field-body">
             <!-- 选择器背景颜色 -->
diff --git a/data-room-ui/packages/BasicComponents/Tables/setting.vue b/data-room-ui/packages/BasicComponents/Tables/setting.vue
index 2b30957c..d727c4db 100644
--- a/data-room-ui/packages/BasicComponents/Tables/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Tables/setting.vue
@@ -35,12 +35,12 @@
           label-width="120px"
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item label="表头颜色">
diff --git a/data-room-ui/packages/BasicComponents/Texts/setting.vue b/data-room-ui/packages/BasicComponents/Texts/setting.vue
index c7679b00..b7b62147 100644
--- a/data-room-ui/packages/BasicComponents/Texts/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Texts/setting.vue
@@ -42,12 +42,12 @@
           :big-title="config.title"
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/ThemeSelect/setting.vue b/data-room-ui/packages/BasicComponents/ThemeSelect/setting.vue
index 22ce4e85..55d2101f 100644
--- a/data-room-ui/packages/BasicComponents/ThemeSelect/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ThemeSelect/setting.vue
@@ -36,12 +36,12 @@
           :bigTitle='config.title'
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/ThemeSwitcher/setting.vue b/data-room-ui/packages/BasicComponents/ThemeSwitcher/setting.vue
index 3ce5215c..282db02c 100644
--- a/data-room-ui/packages/BasicComponents/ThemeSwitcher/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ThemeSwitcher/setting.vue
@@ -26,12 +26,12 @@
           :bigTitle='config.title'
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
index a41413e1..0cf33f93 100644
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
@@ -36,12 +36,12 @@
           :bigTitle='config.title'
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
diff --git a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
index 8e815c00..b597630e 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
+++ b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
@@ -19,12 +19,12 @@
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
           </div>
-          <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
             />
-          </div> -->
+          </div>
           <SettingTitle>基础</SettingTitle>
           <div class="lc-field-body">
             <!-- 选择器背景颜色 -->
diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
index e06ae1ea..5e64b59c 100644
--- a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
+++ b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
@@ -37,12 +37,12 @@
               :bigTitle='config.title'
             />
           </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="背景色一">
diff --git a/data-room-ui/packages/BasicComponents/Video/setting.vue b/data-room-ui/packages/BasicComponents/Video/setting.vue
index 33a01dff..53a044ca 100644
--- a/data-room-ui/packages/BasicComponents/Video/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Video/setting.vue
@@ -37,12 +37,12 @@
               :bigTitle='config.title'
             />
           </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="视频链接">
diff --git a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue
index 70d4629b..a7986a1f 100644
--- a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <slot name="top" />
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue
index 67374603..efa10623 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue
@@ -37,12 +37,12 @@
           :config="config"
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <template v-for="group in groupList">
         <div :key="group.groupName">
           <SettingTitle>   {{ group.groupName | filterGroupName }}</SettingTitle>
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue
index 36935a17..0cdff0a5 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue
@@ -37,12 +37,12 @@
           :config="config"
         />
       </div>
-      <!-- <SettingTitle>旋转</SettingTitle>
-      <div class="lc-field-body">
-        <RotateSetting
-          :config="config"
-        />
-      </div> -->
+      <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
       <template v-for="group in groupList">
         <div :key="group.groupName">
           <SettingTitle>   {{ group.groupName | filterGroupName }}</SettingTitle>
diff --git a/data-room-ui/packages/Borders/Border14/setting.vue b/data-room-ui/packages/Borders/Border14/setting.vue
index 8dcbff8d..9d41e1d7 100644
--- a/data-room-ui/packages/Borders/Border14/setting.vue
+++ b/data-room-ui/packages/Borders/Border14/setting.vue
@@ -22,6 +22,12 @@
             />
           </el-form-item>
           <PosWhSetting :config="config" />
+          <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
           <el-form-item label="边框线颜色">
             <ColorPicker
               v-model="config.customize.borderColor"
@@ -107,12 +113,14 @@
 <script>
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import {predefineColors} from 'data-room-ui/js/utils/colorList'
 export default {
   name: 'Border14Setting',
   components: {
     ColorPicker,
-    PosWhSetting
+    PosWhSetting,
+    RotateSetting
   },
   props: {
     config: {
diff --git a/data-room-ui/packages/Borders/Border15/setting.vue b/data-room-ui/packages/Borders/Border15/setting.vue
index e14b83f6..1758f3fe 100644
--- a/data-room-ui/packages/Borders/Border15/setting.vue
+++ b/data-room-ui/packages/Borders/Border15/setting.vue
@@ -22,6 +22,12 @@
             />
           </el-form-item>
           <PosWhSetting :config="config" />
+          <SettingTitle>旋转</SettingTitle>
+          <div class="lc-field-body">
+            <RotateSetting
+              :config="config"
+            />
+          </div>
           <el-form-item label="文本">
             <el-input
               v-model="config.customize.text"
@@ -109,12 +115,14 @@
 <script>
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border14Setting',
   components: {
     ColorPicker,
-    PosWhSetting
+    PosWhSetting,
+    RotateSetting
   },
   props: {
     config: {
diff --git a/data-room-ui/packages/Decorations/Decoration1/setting.vue b/data-room-ui/packages/Decorations/Decoration1/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration1/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration1/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration10/setting.vue b/data-room-ui/packages/Decorations/Decoration10/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration10/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration10/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration11/setting.vue b/data-room-ui/packages/Decorations/Decoration11/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration11/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration11/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration12/setting.vue b/data-room-ui/packages/Decorations/Decoration12/setting.vue
index 3f335e54..b80fd3de 100644
--- a/data-room-ui/packages/Decorations/Decoration12/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration12/setting.vue
@@ -53,12 +53,12 @@
             />
           </el-form-item>
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
       </el-form>
     </el-form>
   </div>
diff --git a/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue b/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue
index 18147fcb..04dc2ce7 100644
--- a/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue
@@ -24,12 +24,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration3/setting.vue b/data-room-ui/packages/Decorations/Decoration3/setting.vue
index d52118cc..27650631 100644
--- a/data-room-ui/packages/Decorations/Decoration3/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration3/setting.vue
@@ -24,12 +24,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration4/setting.vue b/data-room-ui/packages/Decorations/Decoration4/setting.vue
index 842312ca..5a28de6e 100644
--- a/data-room-ui/packages/Decorations/Decoration4/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration4/setting.vue
@@ -24,12 +24,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue b/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue
index 842312ca..5a28de6e 100644
--- a/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue
@@ -24,12 +24,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration5/setting.vue b/data-room-ui/packages/Decorations/Decoration5/setting.vue
index b3e0a14a..5e000b1f 100644
--- a/data-room-ui/packages/Decorations/Decoration5/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration5/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration6/setting.vue b/data-room-ui/packages/Decorations/Decoration6/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration6/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration6/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration8/setting.vue b/data-room-ui/packages/Decorations/Decoration8/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration8/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration8/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue b/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Decorations/Decoration9/setting.vue b/data-room-ui/packages/Decorations/Decoration9/setting.vue
index cdc420e6..f0399b68 100644
--- a/data-room-ui/packages/Decorations/Decoration9/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration9/setting.vue
@@ -27,12 +27,12 @@
         <div class="lc-field-body">
           <PosWhSetting :config="config" />
         </div>
-        <!-- <SettingTitle>旋转</SettingTitle>
+         <SettingTitle>旋转</SettingTitle>
         <div class="lc-field-body">
           <RotateSetting
             :config="config"
           />
-        </div> -->
+        </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
           <el-form-item label="装饰主颜色">
diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue
index cbea26bd..997360bc 100644
--- a/data-room-ui/packages/Render/index.vue
+++ b/data-room-ui/packages/Render/index.vue
@@ -38,7 +38,8 @@
       :style="{
         zIndex: chart.z || 0,
       }"
-      :transform="`skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg) perspective(${chart.perspective > 0? (chart.perspective + 'px') : 'none' }) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
+      :perspective="parseInt(`${chart.perspective == undefined ? 0 : chart.perspective}`)"
+      :transform="`skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
       :grid="[1,1]"
       :handles="handlesList"
       class-name-handle="bs-handle-class"
@@ -85,7 +86,6 @@ import RenderCard from './RenderCard.vue'
 import Configuration from './Configuration.vue'
 // import _ from 'lodash'
 import cloneDeep from 'lodash/cloneDeep'
-// import vdr from 'gc-vue-draggable-resizable'
 import vdr from '@gcpaas/vue-draggable-resizable-gorkys'
 import 'gc-vue-draggable-resizable/dist/VueDraggableResizable.css'
 import { randomString } from '../js/utils'

From bb723a008681a40bd743e5f9c1915df8100123b0 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 18 Oct 2023 09:23:31 +0800
Subject: [PATCH 05/11] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B72.0.1-2023101801-Alpha=20=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/package.json      | 2 +-
 data-room-ui/packages/index.js | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index 36e3433a..6b36ffe5 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "2.0.1-RELEASE",
+  "version": "2.0.1-2023101801-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",
diff --git a/data-room-ui/packages/index.js b/data-room-ui/packages/index.js
index a0c5dcdc..11fd87e1 100644
--- a/data-room-ui/packages/index.js
+++ b/data-room-ui/packages/index.js
@@ -23,6 +23,8 @@ const BigScreenDesign = () => import('./BigScreenDesign')
 const DataSetManagement = () => import('./DataSetManagement')
 // 数据源管理页面
 const DataSourceManagement = () => import('./DataSourceManagement')
+// 地图数据管理页面
+const MapDataManagement = () => import('./MapDataManagement')
 
 // 存储组件列表
 const components = [
@@ -33,7 +35,8 @@ const components = [
   BigScreenRun,
   BigScreenDesign,
   DataSetManagement,
-  DataSourceManagement
+  DataSourceManagement,
+  MapDataManagement
 ]
 
 function install (Vue) {
@@ -52,6 +55,7 @@ export {
   BigScreenDesign,
   DataSetManagement,
   DataSourceManagement,
+  MapDataManagement,
   $dataRoomStore,
   $dataRoomAxios,
   registerConfig,
@@ -68,6 +72,7 @@ export default {
   BigScreenDesign,
   DataSetManagement,
   DataSourceManagement,
+  MapDataManagement,
   $dataRoomStore,
   $dataRoomAxios,
   registerConfig,

From 75471f95c5f90210e5222b5aa4bf705a5f3d5619 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Wed, 18 Oct 2023 09:43:19 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat:=E7=82=B9=E4=B9=9D=E5=9B=BE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenDesign/RightSetting/MoveDialog/index.vue  | 1 +
 data-room-ui/packages/BorderComponents/GcBorder16/index.vue     | 2 +-
 data-room-ui/packages/BorderComponents/GcBorder16/setting.js    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
index d627d0a1..9b4f8cde 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -56,6 +56,7 @@
             />
         </span>
           <el-image
+          style="max-width:550px"
           :src="this.imgUrl||url"
           fit="none"></el-image>
           <div
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
index f86ee0de..6b842a28 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
@@ -38,7 +38,7 @@ export default {
     },
     borderArray(){
       return this.config.border.borderArray ? this.config.border.borderArray
-        : [100,100,100,100]
+        : [50,50,50,50]
     }
   },
   watch: {
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/setting.js b/data-room-ui/packages/BorderComponents/GcBorder16/setting.js
index 05445c23..96425ff9 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder16/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder16/setting.js
@@ -44,7 +44,7 @@ const setting = [
     // 是否多选
     multiple: false,
     // 绑定的值
-    value: [100,100,100,100],
+    value: [50,50,50,50],
   },
 ]
 

From 3e8132b10160babc838d2058fd5163e432bea83b Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Wed, 18 Oct 2023 10:09:24 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E7=82=B9=E4=B9=9D?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RightSetting/MoveDialog/index.vue               |  8 ++++++--
 .../packages/BorderComponents/GcBorder16/index.vue  | 13 +++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
index 9b4f8cde..1b6e86d4 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -96,7 +96,7 @@
   </el-dialog>
 </template>
 <script>
-import { right } from '@antv/g2plot/lib/plots/sankey/sankey'
+import { getFileUrl } from 'data-room-ui/js/utils/file'
 
 export default {
   name: 'SourceDialog',
@@ -182,7 +182,11 @@ export default {
       a.style.left=val+"px"
     },
     init (val,array) {
-      this.imgUrl=val
+      if(!val.startsWith('http')){
+        this.imgUrl=getFileUrl(val)
+      }else{
+        this.imgUrl=val
+      }
       if(array){
         [this.top,this.right,this.bottom,this.left]=array
         this.$nextTick(()=>{
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
index 6b842a28..b9c5d4a1 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
@@ -12,6 +12,7 @@
 </template>
 <script>
 import { refreshComponentMixin } from 'data-room-ui/js/mixins/refreshComponent'
+import { getFileUrl } from 'data-room-ui/js/utils/file'
 export default {
   name: 'Border14',
   components: {
@@ -45,8 +46,12 @@ export default {
     'config.border.imgUrl': {
       handler (val) {
         if(val){
+          let ur=val
+          if(!val.startsWith('http')){
+            ur = getFileUrl(val)
+          }
           const a =document.getElementById('border'+ this.config.code)
-          a.style['border-image-source']=`url(${val})`
+          a.style['border-image-source']=`url(${ur})`
         }else{
           const a =document.getElementById('border'+ this.config.code)
           a.style['border-image-source']=`url(${this.url})`
@@ -56,8 +61,12 @@ export default {
   },
   mounted () {
     if(this.config.border.imgUrl){
+      let ur=this.config.border.imgUrl
+      if(!this.config.border.imgUrl.startsWith('http')){
+            ur = getFileUrl(this.config.border.imgUrl)
+          }
       const a =document.getElementById('border'+ this.config.code)
-          a.style['border-image-source']=`url(${this.config.border.imgUrl})`
+          a.style['border-image-source']=`url(${ur})`
     }else{
       const a =document.getElementById('border'+ this.config.code)
           a.style['border-image-source']=`url(${this.url})`

From f8ebd56dbc5ac6a22777dd499e7144a4793ffe03 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Wed, 18 Oct 2023 10:24:39 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenDesign/RightSetting/MoveDialog/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
index 1b6e86d4..98b5447a 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="资源库"
+    title="点九图"
     :visible.sync="dialogVisible"
     :modal="true"
     :modal-append-to-body="false"
@@ -214,6 +214,7 @@ export default {
   padding: 16px 16px 16px 16px !important;
 }
 .content{
+  margin: 20px 0;
   display: flex;
   justify-content: center;
   align-items: center;

From 08667d96fac24484b171f092239ace62223e6da0 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Wed, 18 Oct 2023 12:42:48 +0800
Subject: [PATCH 09/11] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E7=82=B9=E4=B9=9D?=
 =?UTF-8?q?=E5=9B=BE=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MoveDialog/component/input.vue            |  73 ++++++++++++++++
 .../RightSetting/MoveDialog/index.vue         |  80 +++++++++++++++---
 .../BorderComponents/GcBorder16/component.png | Bin 47031 -> 6130 bytes
 .../BorderComponents/GcBorder16/index.vue     |   4 +
 .../BorderComponents/GcBorder16/setting.js    |  10 +++
 5 files changed, 156 insertions(+), 11 deletions(-)
 create mode 100644 data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue
new file mode 100644
index 00000000..4c3f87d7
--- /dev/null
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue
@@ -0,0 +1,73 @@
+<template>
+ <div class="clasfx">
+  <span @click="up" class="button">{{Fx[0]}}</span>
+   <el-input-number class="bs-el-input-number" v-model="number"></el-input-number>
+  <span @click="down" class="button">{{Fx[1]}}</span>
+ </div>
+</template>
+<script>
+export default {
+  name: 'inputNumber',
+  props: {
+    number:{
+      type: Number,
+      default: 0
+    },
+    Fx:{
+      type: Array,
+      default: []
+    },
+  },
+  data () {
+    return {
+
+    }
+  },
+  computed: {
+    // url(){
+    //   return require('data-room-ui/BorderComponents/GcBorder16/component.png')
+    // }
+  },
+  mounted () {
+   },
+  methods: {
+    up(){
+      const a=this.number--
+      this.$emit('changeStyle',a)
+    },
+    down(){
+
+    }
+
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+// @import '../../assets/style/bsTheme.scss';
+.clasfx{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.button{
+  color: #fff;
+  cursor: pointer;
+  padding: 0 4px;
+}
+// ::v-deep .el-input-number__decrease{
+//   display: none;
+// }
+
+// ::v-deep .el-input-number__increase{
+//   display: none;
+// }
+
+::v-deep .el-input-number--mini {
+ width: 120px !important
+}
+
+
+
+</style>
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
index 98b5447a..0bda30f7 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -3,6 +3,7 @@
     title="点九图"
     :visible.sync="dialogVisible"
     :modal="true"
+    width="75%"
     :modal-append-to-body="false"
     :appen-to-body="false"
     class="bs-dialog-wrap bs-el-dialog"
@@ -10,11 +11,55 @@
     @opened='getDom'
   >
     <div class="content">
+      <div>
+        <table border="1" cellspacing="0">
+          <tr>
+            <th>方向</th>
+            <th>描述</th>
+          </tr>
+          <tr>
+            <td>左上角</td>
+            <td>不能拉伸</td>
+          </tr>
+           <tr>
+            <td>右上角</td>
+            <td>不能拉伸</td>
+          </tr>
+           <tr>
+            <td>左下角</td>
+            <td>不能拉伸</td>
+          </tr>
+           <tr>
+            <td>右下角</td>
+            <td>不能拉伸</td>
+          </tr>
+           <tr>
+            <td>左侧</td>
+            <td>宽度不变，高度自动拉伸</td>
+          </tr>
+           <tr>
+            <td>右侧</td>
+            <td>宽度不变，高度自动拉伸</td>
+          </tr>
+           <tr>
+            <td>顶部</td>
+            <td>高度不变，宽度自动拉伸</td>
+          </tr>
+          <tr>
+            <td>底部</td>
+            <td>高度不变，宽度自动拉伸</td>
+          </tr>
+          <tr>
+            <td>中部</td>
+            <td>宽度，高度自动拉伸</td>
+          </tr>
+        </table>
+      </div>
       <div class="img">
         <span class="toptitle">
+          <!-- <InputCom @changeStyle='changeTop' :Fx="['上','下']" :number="top" /> -->
             <el-input-number
             @change='changeTop'
-            controls-position="right"
             v-model="top"
             class="bs-el-input-number"
             :step=" 1"
@@ -25,7 +70,6 @@
         <span class="righttitle">
             <el-input-number
             @change='changeRight'
-            controls-position="right"
             v-model="right"
             class="bs-el-input-number"
             :step=" 1"
@@ -36,7 +80,6 @@
         <span class="bottomtitle">
             <el-input-number
             @change='changeBottom'
-            controls-position="right"
             v-model="bottom"
             class="bs-el-input-number"
             :step=" 1"
@@ -47,7 +90,6 @@
         <span class="lefttitle">
             <el-input-number
             @change='changeLeft'
-            controls-position="right"
             v-model="left"
             class="bs-el-input-number"
             :step=" 1"
@@ -58,7 +100,7 @@
           <el-image
           style="max-width:550px"
           :src="this.imgUrl||url"
-          fit="none"></el-image>
+          fit="fill"></el-image>
           <div
            @mousedown="onMouseDown"
            @mouseup="onMouseUp"
@@ -97,9 +139,13 @@
 </template>
 <script>
 import { getFileUrl } from 'data-room-ui/js/utils/file'
+import InputCom from './component/input.vue'
 
 export default {
   name: 'SourceDialog',
+  components: {
+   InputCom
+  },
   data () {
     return {
       dialogVisible: false,
@@ -207,7 +253,7 @@ export default {
 ::v-deep .el-dialog__body{
   background-color: #232832;
   position: relative;
-  min-height: 400px;
+  min-height: 450px;
   align-items: center;
   justify-content: center;
   display: flex;
@@ -215,6 +261,7 @@ export default {
 }
 .content{
   margin: 20px 0;
+  width: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -223,22 +270,22 @@ export default {
     .toptitle{
         position: absolute;
         top: -30px;
-        left: 42%;
+        left: 34%;
       }
     .righttitle{
       position: absolute;
       top: 50%;
-      right: -75px;
+      right: -110px;
     }
     .bottomtitle{
       position: absolute;
       bottom: -30px;
-      left: 42%;
+      left: 34%;
     }
     .lefttitle{
       position: absolute;
       top: 50%;
-      left: -75px;
+      left: -110px;
     }
     // height: 100%;
     .top{
@@ -275,10 +322,21 @@ export default {
 
 }
 ::v-deep .el-input-number--mini{
-  width: 70px;
+  width: 100px;
   .el-input__inner{
     padding-right: 30px;
   }
 }
+table{
+  margin-right: 120px;
+  color: #fff;
+  border: 1px solid #fff;
+}
+th{
+  padding: 4px;
+}
+td{
+  padding: 8px;
+}
 
 </style>
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/component.png b/data-room-ui/packages/BorderComponents/GcBorder16/component.png
index cdbcda23f51a67f96b2a0d72f72fab7cc446495d..0bcd3434af8a3807d2560f3b45ddf9d06e900e49 100644
GIT binary patch
literal 6130
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
O<$VtLc~yN7o%KKdm)@!X

literal 47031
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

diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
index b9c5d4a1..867835fa 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
@@ -4,6 +4,7 @@
     class="bs-design-wrap"
     :id="'border'+ config.code"
     :style="{
+      opacity: opacity,
       borderImageSlice:`${borderArray[0]} ${borderArray[1]} ${borderArray[2]} ${borderArray[3]} fill`,
       borderImageWidth:`${borderArray[0]}px ${borderArray[1]}px ${borderArray[2]}px ${borderArray[3]}px`,
     }"
@@ -37,6 +38,9 @@ export default {
     url(){
       return require('data-room-ui/BorderComponents/GcBorder16/component.png')
     },
+    opacity () {
+      return this.config.border.opacity || 100
+    },
     borderArray(){
       return this.config.border.borderArray ? this.config.border.borderArray
         : [50,50,50,50]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/setting.js b/data-room-ui/packages/BorderComponents/GcBorder16/setting.js
index 96425ff9..68792fa1 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder16/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder16/setting.js
@@ -34,6 +34,16 @@ const setting = [
     // 绑定的值
     value: '',
   },
+  {
+    label: '不透明度',
+    // 设置组件类型
+    type: 'slider',
+    // 字段
+    field: 'opacity',
+    // 对应options中的字段
+    optionField: 'opacity.fillOpacity',
+    value: 1,
+  },
   {
     label:'点九图背景切割',
     // 设置组件类型， select / input / colorPicker

From 740b7053624a8d3ab158ab9dc7c2f10b50b224f7 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Wed, 18 Oct 2023 12:43:38 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MoveDialog/component/input.vue            | 73 -------------------
 .../RightSetting/MoveDialog/index.vue         |  4 -
 2 files changed, 77 deletions(-)
 delete mode 100644 data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue
deleted file mode 100644
index 4c3f87d7..00000000
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/component/input.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
- <div class="clasfx">
-  <span @click="up" class="button">{{Fx[0]}}</span>
-   <el-input-number class="bs-el-input-number" v-model="number"></el-input-number>
-  <span @click="down" class="button">{{Fx[1]}}</span>
- </div>
-</template>
-<script>
-export default {
-  name: 'inputNumber',
-  props: {
-    number:{
-      type: Number,
-      default: 0
-    },
-    Fx:{
-      type: Array,
-      default: []
-    },
-  },
-  data () {
-    return {
-
-    }
-  },
-  computed: {
-    // url(){
-    //   return require('data-room-ui/BorderComponents/GcBorder16/component.png')
-    // }
-  },
-  mounted () {
-   },
-  methods: {
-    up(){
-      const a=this.number--
-      this.$emit('changeStyle',a)
-    },
-    down(){
-
-    }
-
-
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-// @import '../../assets/style/bsTheme.scss';
-.clasfx{
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-.button{
-  color: #fff;
-  cursor: pointer;
-  padding: 0 4px;
-}
-// ::v-deep .el-input-number__decrease{
-//   display: none;
-// }
-
-// ::v-deep .el-input-number__increase{
-//   display: none;
-// }
-
-::v-deep .el-input-number--mini {
- width: 120px !important
-}
-
-
-
-</style>
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
index 0bda30f7..64b5795f 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -139,13 +139,9 @@
 </template>
 <script>
 import { getFileUrl } from 'data-room-ui/js/utils/file'
-import InputCom from './component/input.vue'
 
 export default {
   name: 'SourceDialog',
-  components: {
-   InputCom
-  },
   data () {
     return {
       dialogVisible: false,

From b1164ee1c3cb2cf769b6a6139266080b68a06b64 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Wed, 18 Oct 2023 12:48:23 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenDesign/RightSetting/MoveDialog/index.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
index 64b5795f..d9dfa503 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -324,7 +324,7 @@ export default {
   }
 }
 table{
-  margin-right: 120px;
+  margin-right: 200px;
   color: #fff;
   border: 1px solid #fff;
 }