diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue index 7790ba89..475d1119 100644 --- a/components/AiDvRender.vue +++ b/components/AiDvRender.vue @@ -33,6 +33,7 @@ diff --git a/components/AiDvViewer.vue b/components/AiDvViewer.vue index 780f0a6e..f5bba656 100644 --- a/components/AiDvViewer.vue +++ b/components/AiDvViewer.vue @@ -12,8 +12,8 @@ zIndex: item.zIndex, transform: `scale(${scale})` }" - v-for="(item, index) in componentList" - :key="index"> + v-for="(item, index) in componentList" + :key="index"> diff --git a/components/layout/AiDvTable/AiDvTable.vue b/components/layout/AiDvTable/AiDvTable.vue index ce7f3e25..c6d1c89e 100644 --- a/components/layout/AiDvTable/AiDvTable.vue +++ b/components/layout/AiDvTable/AiDvTable.vue @@ -6,17 +6,23 @@ :key="index" :style="{ width: item.width + 'px', + textAlign: item.align, flex: item.width ? 'inherit' : 1 }"> {{ item.v }}
-
+
+ :style="{ + color: column.color, + textAlign: column.align, + width: column.width + 'px', + flex: column.width ? 'inherit' : 1 + }"> {{ index + 1 }} {{ column.v }}
@@ -38,6 +44,11 @@ isShowIndex: { type: String, default: '0' + }, + + stripe: { + type: String, + default: '1' } }, @@ -77,9 +88,9 @@ }) this.header = value.map(v => { - console.log((Number(v.width))) return { v: v[headerKey], + align: v.align, width: Number(v.width || 0) ? (Number(v.width || 0) + (this.isShowIndex === '1' ? 0 : 0)) : '' } }) @@ -89,6 +100,7 @@ return { v: e[v], color: e.color, + align: e.align, width: e.width || '' } }) @@ -108,7 +120,7 @@ width: 100%; height: 40px; padding: 0 20px; - background: #252525; + background: rgba(70, 70, 70, 0.35); span { flex: 1; @@ -128,7 +140,7 @@ .body { height: calc(100% - 40px); - padding: 10px 20px; + padding: 10px 0; overflow-y: auto; box-sizing: border-box; .row { @@ -136,6 +148,12 @@ align-items: center; width: 100%; height: 52px; + padding: 0 20px; + box-sizing: border-box; + + &.stripe:nth-of-type(2n) { + background: rgba(48, 48, 48, 0.4); + } div { display: flex; diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue index c771b21b..16bb771e 100644 --- a/packages/bigscreen/designer/components/form/componentConfig.vue +++ b/packages/bigscreen/designer/components/form/componentConfig.vue @@ -78,6 +78,21 @@
+
+ +
+ + + + + + +
+
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js index b7b4cd5b..eb4abc71 100644 --- a/packages/bigscreen/designer/config.js +++ b/packages/bigscreen/designer/config.js @@ -501,6 +501,7 @@ const components = [ dataX: '', dataY: [], rowNum: 7, + stripe: '1', isShowIndex: '1', sourceDataId: '', api: '',