From 23fae774430e70abc84931fdf4acae85df239f22 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 14 Mar 2023 16:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=A1=A8=E6=A0=BC=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigscreen/designer/components/Layout.vue  |  3 +-
 .../components/form/componentConfig.vue       | 71 +++++++++++++++----
 packages/bigscreen/designer/config.js         |  1 +
 3 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index b55957a4..c6c73ff3 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -997,11 +997,12 @@ export default {
         }
 
         .el-select, .el-cascader {
+          width: 232px;
           color: #fff;
           background: transparent;
 
           input {
-            width: 232px;
+            width: 100%;
             background: #262C33;
             font-size: 12px;
             color: #fff;
diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue
index 98424aa6..fb7569f3 100644
--- a/packages/bigscreen/designer/components/form/componentConfig.vue
+++ b/packages/bigscreen/designer/components/form/componentConfig.vue
@@ -39,10 +39,10 @@
           <div class="layout-config__item--right">
             <el-select size="mini" v-model="config.border" placeholder="请选择边框" clearable>
               <el-option
-                  v-for="(item, index) in borderList"
-                  :key="index"
-                  :label="item"
-                  :value="item">
+                v-for="(item, index) in borderList"
+                :key="index"
+                :label="item"
+                :value="item">
               </el-option>
             </el-select>
           </div>
@@ -93,12 +93,24 @@
               </el-select>
             </div>
           </div>
-          <div class="layout-config__item">
+          <div class="layout-config__item" v-if="config.type !== 'AiDvTable'">
             <label>表格行数</label>
             <div class="layout-config__item--right">
               <el-input-number size="mini" style="width: 232px" :min="0" v-model="config.rowNum" controls-position="right"></el-input-number>
             </div>
           </div>
+          <div class="layout-config__item table-config" v-if="config.type === 'AiDvTable'" v-for="(item, index) in data" :key="index">
+            <label>第{{ index + 1 }}列</label>
+            <div class="layout-config__item--right">
+              <el-select size="mini" style="width: 80px;" v-model="item.align" placeholder="请选择" clearable>
+                <el-option label="居中" value="center"></el-option>
+                <el-option label="居左" value="left"></el-option>
+                <el-option label="居右" value="right"></el-option>
+              </el-select>
+              <el-color-picker v-model="item.color" style="margin: 0 10px;"></el-color-picker>
+              <el-input-number v-model="item.width" :min="1" label="描述文字" controls-position="right"></el-input-number>
+            </div>
+          </div>
         </template>
         <template v-if="config.type === 'map'">
           <div class="layout-config__item">
@@ -158,10 +170,10 @@
           <div class="layout-config__item--right">
             <el-select size="mini" v-model="config.display" placeholder="请选择类型" clearable>
               <el-option
-                  v-for="(item, index) in summaryList"
-                  :key="index"
-                  :label="item"
-                  :value="item">
+                v-for="(item, index) in summaryList"
+                :key="index"
+                :label="item"
+                :value="item">
               </el-option>
             </el-select>
           </div>
@@ -173,13 +185,15 @@
 
 <script>
 export default {
-  name: "componentConfig",
+  name: 'componentConfig',
+
   props: {
     config: {default: () => ({})},
     instance: Function,
     dict: Object,
   },
-  data() {
+
+  data () {
     return {
       borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5', 'border6'],//边框待选项
       summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5',
@@ -189,15 +203,44 @@ export default {
         {label: '是', value: '1'},
         {label: '否', value: '0'}
       ],
+      data: []
     }
   },
-  methods: {},
+
   created() {
+    this.data = this.config[this.config.dataType]
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.componentConfig {
-}
+  .componentConfig {
+    .table-config {
+      & > div {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 232px;
+
+        :deep( .el-select ) {
+          width: 80px
+          input {
+            width: 80px;
+          }
+        }
+
+        .el-select {
+          width: 100%;
+
+          .el-input {
+            width: 100%;
+
+            :deep( input ) {
+              width: 80px
+            }
+          }
+        }
+      }
+    }
+  }
 </style>
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 1053bb49..6b3d1c6f 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -505,6 +505,7 @@ const components = [
             isShowIndex: '1',
             sourceDataId: '',
             api: '',
+            config: [],
             apiData: [],
             dataType: 'staticData',
             dynamicData: [],