Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

packages/bigscreen/designer/components/componentConfig.vue

@@ -103,6 +103,15 @@
               </el-select>
             </div>
           </div>
+          <div class="layout-config__item" v-if="config.type === 'AiDvTable'">
+            <label>简易样式</label>
+            <div class="layout-config__item--right">
+              <el-select size="mini" v-model="config.simple" placeholder="请选择" clearable>
+                <el-option label="是" value="1"/>
+                <el-option label="否" value="0"/>
+              </el-select>
+            </div>
+          </div>
           <div class="layout-config__item" v-if="config.type !== 'AiDvTable'">
             <label>表格行数</label>
             <div class="layout-config__item--right">
@@ -207,12 +216,25 @@
         </div>
       </div>
     </div>
+    <div class="layout-right__content--wrapper">
+      <div class="layout-config__group">
+        <h2>进阶设置</h2>
+        <config-item label="设置弹窗">
+          <config-item label="标题">
+<!--            <el-input v-model="config.dialog.title" clearable/>-->
+          </config-item>
+        </config-item>
+      </div>
+    </div>
   </section>
 </template>
 
 <script>
+import ConfigItem from "./configItem.vue";
+
 export default {
   name: 'componentConfig',
+  components: {ConfigItem},
 
   props: {
     config: {default: () => ({})},
@@ -226,7 +248,7 @@ export default {
         'border11', 'border12', 'border13'],//边框待选项
       summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5',
         'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14',
-        'summary15', 'summary16', 'summary17', 'summary18'],//汇总待选项
+        'summary15', 'summary16', 'summary17', 'summary18', 'summary19'],//汇总待选项
       //是否显示排名
       tableStatus: [
         {label: '是', value: '1'},

packages/bigscreen/designer/config.js

@@ -426,76 +426,78 @@ const components = [{
     }]
   }]
 }, {
-  type: 'table', label: '表格', list: [{
-    label: '表格', type: 'table', list: [{
-      type: 'table',
-      label: '表格',
-      title: '表格',
-      border: 'border6',
-      width: 650,
-      height: 400,
-      zIndex: 1,
-      thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/table.png',
-      dataX: '',
-      dataY: [],
-      rowNum: 7,
-      isShowIndex: '1',
-      sourceDataId: '',
-      api: '',
-      apiData: [],
-      dataType: 'staticData',
-      dynamicData: [],
-      staticData: [{name: '列1', v: 23, v2: 3}, {name: '列2', v: 12, v2: 4}, {name: '列2', v: 12, v2: 4}]
-    }, {
-      type: 'AiDvTable',
-      label: '新版表格',
-      title: '新版表格',
-      border: 'border6',
-      width: 650,
-      height: 400,
-      zIndex: 1,
-      thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/table.png',
-      dataX: '',
-      dataY: [],
-      rowNum: 7,
-      stripe: '1',
-      isShowIndex: '1',
-      sourceDataId: '',
-      api: '',
-      config: [{
-        width: '', color: '', align: ''
+  label: '表格', list: [
+    {
+      label: '单表格', list: [{
+        type: 'table',
+        label: '表格',
+        title: '表格',
+        border: 'border6',
+        width: 650,
+        height: 400,
+        zIndex: 1,
+        thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/table.png',
+        dataX: '',
+        dataY: [],
+        rowNum: 7,
+        isShowIndex: '1',
+        sourceDataId: '',
+        api: '',
+        apiData: [],
+        dataType: 'staticData',
+        dynamicData: [],
+        staticData: [{name: '列1', v: 23, v2: 3}, {name: '列2', v: 12, v2: 4}, {name: '列2', v: 12, v2: 4}]
       }, {
-        width: '', color: '', align: ''
+        type: 'AiDvTable',
+        label: '新版表格',
+        title: '新版表格',
+        border: 'border6',
+        width: 650,
+        height: 400,
+        zIndex: 1,
+        thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/table.png',
+        dataX: '',
+        dataY: [],
+        rowNum: 7,
+        stripe: '1',
+        isShowIndex: '1',
+        sourceDataId: '',
+        api: '',
+        config: [{
+          width: '', color: '', align: ''
+        }, {
+          width: '', color: '', align: ''
+        }, {
+          width: '', color: '', align: ''
+        }],
+        apiData: [],
+        dataType: 'staticData',
+        dynamicData: [],
+        staticData: [{name: '列1', v: 23, v2: 3}, {name: '列2', v: 12, v2: 4}, {name: '列2', v: 12, v2: 4}]
       }, {
-        width: '', color: '', align: ''
-      }],
-      apiData: [],
-      dataType: 'staticData',
-      dynamicData: [],
-      staticData: [{name: '列1', v: 23, v2: 3}, {name: '列2', v: 12, v2: 4}, {name: '列2', v: 12, v2: 4}]
-    }, {
-      type: 'AiRanking',
-      label: '排行榜',
-      title: '排行榜',
-      border: 'border6',
-      width: 523,
-      height: 400,
-      zIndex: 1,
-      thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/table.png',
-      dataX: '',
-      dataY: [],
-      rowNum: 7,
-      subType: 'Ranking1',
-      stripe: '1',
-      isShowIndex: '1',
-      sourceDataId: '',
-      api: '',
-      apiData: [],
-      dataType: 'staticData',
-      dynamicData: [],
-      staticData: [{name: '列1', value: 23}, {name: '列2', value: 12}, {name: '列2', value: 12}]
-    }]
-  }]
+        type: 'AiRanking',
+        label: '排行榜',
+        title: '排行榜',
+        border: 'border6',
+        width: 523,
+        height: 400,
+        zIndex: 1,
+        thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/table.png',
+        dataX: '',
+        dataY: [],
+        rowNum: 7,
+        subType: 'Ranking1',
+        stripe: '1',
+        isShowIndex: '1',
+        sourceDataId: '',
+        api: '',
+        apiData: [],
+        dataType: 'staticData',
+        dynamicData: [],
+        staticData: [{name: '列1', value: 23}, {name: '列2', value: 12}, {name: '列2', value: 12}]
+      }]
+    },
+  ]
 }, {
   type: 'ai3d', label: "3D", list: [{
     label: "3D楼栋", type: 'building', list: [{