lambo-design-bi 0.0.178 → 0.0.180

package/bi/widget/container/card/card-widget.vue

@@ -4,18 +4,21 @@
     <template slot="content-title" v-if="(widget.options.title && widget.options.title.length > 0)">
       {{ widget.options.title }}
     </template>
-    <template v-for="(item, index) in widget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index" :params="params">
-        <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-          <slot :name="slot" v-bind="scope" />
-        </template>
-      </component>
-    </template>
+    <div :style="containerStyle || {}">
+      <div v-for="(item, index) in widget.widgets" :key="index">
+        <component :is="getWidgetName(item)" :widget="item" :params="params">
+          <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+            <slot :name="slot" v-bind="scope" />
+          </template>
+        </component>
+      </div>
+    </div>
   </lambo-indicator-card-bi>
 </template>
 <script>
 import LamboIndicatorCardBi from './comps/indicator-card/src/indicator-card-bi.vue'
 import { getWidgetName } from '../../util/widget-map'
+import { parseStyleStr } from '../../util/css-util'
 
 export default {
   name: "BiContainerCard",
@@ -32,11 +35,14 @@ export default {
   },
   data() {
     return {
-
+      containerStyle: {},
     }
   },
   methods: {
-    getWidgetName
+    getWidgetName,
+    initConfig() {
+      this.containerStyle = parseStyleStr(this.widget.options.style) || {}
+    }
   },
   created() {
     console.log("ContainerCard params:", this.params)

package/bi/widget/layout/col.vue

@@ -1,12 +1,12 @@
 <template>
   <el-col :span="(widget.options && widget.options.span) ? parseInt(widget.options.span) : 24">
-    <template v-for="(item, index) in widget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index" :params="params">
+    <div v-for="(item, index) in widget.widgets" :key="index" >
+      <component :is="getWidgetName(item)" :widget="item" :params="params">
         <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
           <slot :name="slot" v-bind="scope" />
         </template>
       </component>
-    </template>
+    </div>
   </el-col>
 </template>
 <script>

package/bi/widget/layout/row.vue

@@ -1,12 +1,12 @@
 <template>
   <el-row class="custom-row" :gutter="(widget.options && widget.options.gutter) ? parseInt(widget.options.gutter) : 0">
-    <template v-for="(item, index) in widget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index" :params="params">
+    <div v-for="(item, index) in widget.widgets" :key="index" >
+      <component :is="getWidgetName(item)" :widget="item" :params="params">
         <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
           <slot :name="slot" v-bind="scope" />
         </template>
       </component>
-    </template>
+    </div>
   </el-row>
 </template>
 <script>

package/bi/widget/layout/row2.vue

@@ -1,12 +1,12 @@
 <template>
   <el-row class="custom-row" :gutter="(widget.options && widget.options.gutter) ? parseInt(widget.options.gutter) : 0">
-    <template v-for="(item, index) in widget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index" :params="params">
+    <div v-for="(item, index) in widget.widgets" :key="index">
+      <component :is="getWidgetName(item)" :widget="item" :params="params">
         <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
           <slot :name="slot" v-bind="scope" />
         </template>
       </component>
-    </template>
+    </div>
   </el-row>
 </template>
 <script>

package/bi/widget/page/child-page-tm.vue

@@ -11,13 +11,13 @@
       </BiSearchForm>
     </LamboIndicatorCardBiSearch>
 
-    <template v-for="(item, index) in childPageWidget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index" :params="params">
+    <div v-for="(item, index) in childPageWidget.widgets" :key="index">
+      <component :is="getWidgetName(item)" :widget="item" :params="params">
         <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
           <slot :name="slot" v-bind="scope" />
         </template>
       </component>
-    </template>
+    </div>
 
   </LamboPageContainer>
 </template>

package/bi/widget/page/index-page-tm.vue

@@ -8,13 +8,13 @@
       </BiSearchForm>
     </LamboIndicatorCardBiSearch>
 
-    <template v-for="(item, index) in pageWidget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index" :params="params">
+    <div v-for="(item, index) in pageWidget.widgets" :key="index">
+      <component :is="getWidgetName(item)" :widget="item" :params="params">
         <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
           <slot :name="slot" v-bind="scope" />
         </template>
       </component>
-    </template>
+    </div>
 
   </LamboPageContainer>
 </template>

package/bi/widget/text/text-group.vue

@@ -4,6 +4,7 @@
 <script>
 import LamboTextObjGroupBi from "../../../pub/text/text-obj-group.vue"
 import { getListMapData } from "../api/data"
+import { parseStyleStr } from '../util/css-util'
 
 export default {
   name: 'BiTextGroup',
@@ -28,8 +29,8 @@ export default {
       let oldTextList = this.widget.options.textList || []
       let newTextList = oldTextList.map(item => ({
         ...item,
-        titleStyle: parseStyleString(item.titleStyle),
-        valStyle: parseStyleString(item.valStyle)
+        titleStyle: parseStyleStr(item.titleStyle),
+        valStyle: parseStyleStr(item.valStyle)
       }))
       this.textList = newTextList
     },
@@ -72,17 +73,6 @@ export default {
       } catch (error) {
         console.error("文字卡片批量请求异常：", error)
       }
-    },
-    parseStyleString(styleStr) {
-      if (typeof styleStr === 'string') {
-        try {
-          return JSON.parse(styleStr)
-        } catch (e) {
-          console.warn('样式字符串解析失败:', styleStr)
-          return {}
-        }
-      }
-      return styleStr || {}
     }
   },
   created() {

package/bi/widget/util/css-util.js

@@ -0,0 +1,23 @@
+/**
+ * css样式字符串转样式对象
+ * 字符串{"backgroundColor":"#F3F8FE","margin-top": "0px"} 转 
+ * 样式对象
+ * {
+    backgroundColor: '#F3F8FE',
+    margin-top: '0px',
+   }
+    
+ * @param {*} styleStr 
+ * @returns 
+ */
+export function parseStyleStr(styleStr) {
+  if (typeof styleStr === 'string') {
+    try {
+      return JSON.parse(styleStr)
+    } catch (e) {
+      console.warn('样式字符串解析失败:', styleStr)
+      return {}
+    }
+  }
+  return styleStr || {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambo-design-bi",
-  "version": "0.0.178",
+  "version": "0.0.180",
   "description": "Vue2 BI 数据可视化组件库",
   "main": "index.js",
   "author": "finch",