lambo-design-bi 0.0.222 → 0.0.224

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

@@ -2,7 +2,8 @@
   <lambo-indicator-card-bi
     :has-title="(widget.options && widget.options.title && widget.options.title.length > 0) ? true : false">
     <template slot="content-title" v-if="(widget.options.title && widget.options.title.length > 0)">
-      {{ widget.options.title }}
+      <div>{{ widget.options.title }}</div>
+      <div class="card-subtitle" v-if="subTitle">{{ subTitle }}</div>
     </template>
     <div :style="containerStyle || {}">
       <div v-for="(item, index) in widget.widgets" :key="index">
@@ -36,13 +37,20 @@ export default {
   data() {
     return {
       containerStyle: {},
+      subTitle: null
     }
   },
   methods: {
     getWidgetName,
     initConfig() {
-      this.containerStyle = parseStyleStr(this.widget.options.style || {}) || {}
-      console.log("ContainerCard this.containerStyle:", this.containerStyle)
+      if (this.widget.options) {
+        if (Object.prototype.hasOwnProperty.call(this.widget.options, "subTitle")) {
+          this.subTitle = this.widget.options["subTitle"] || ''
+        }
+        if (Object.prototype.hasOwnProperty.call(this.widget.options, "style")) {
+          this.containerStyle = parseStyleStr(this.widget.options["style"] || {}) || {}
+        }
+      }
     }
   },
   created() {
@@ -54,4 +62,11 @@ export default {
   }
 }
 </script>
-<style scoped></style>
+<style scoped>
+.card-subtitle {
+  margin-top: 2px;
+  color: #999;
+  font-size: 12px;
+  line-height: 1.4;
+}
+</style>

package/bi/widget/table/paging-table.vue

@@ -1,10 +1,10 @@
 <template>
   <div style="width: 100%">
     <LamboPagingTableBi ref="table" :auto-search="false" :columns="columns" :dataUrl="widget.options.url"
-      :show-table-option="true" :exportName="widget.name" :page-disable="widget.options.isPaging === '0'"
-      :page-size="widget.options.pageSize" :export-request-limit="200" :isSingleSelectModel="true"
-      :showSummary="widget.options.isAllSum === '1'" :summary-method="handleSummary" @on-data-load="onDataLoad"
-      :searchParams="tableSearchParams" :show-right-context-menu="hasRightContextMenu">
+      :border="tableBorder" :show-table-option="true" :exportName="widget.name"
+      :page-disable="widget.options.isPaging === '0'" :page-size="widget.options.pageSize" :export-request-limit="200"
+      :isSingleSelectModel="true" :showSummary="widget.options.isAllSum === '1'" :summary-method="handleSummary"
+      @on-data-load="onDataLoad" :searchParams="tableSearchParams" :show-right-context-menu="hasRightContextMenu">
       <div slot="search"></div>
     </LamboPagingTableBi>
     <Modal v-model="boxShow" :title="previewFileName" :width="modelWidth" :styles="{ top: '60px' }"
@@ -54,7 +54,8 @@ export default {
       previewFileType: '',
       previewFileName: '',
       boxShow: false,
-      modelWidth: '78%'
+      modelWidth: '78%',
+      tableBorder: true
     }
   },
   methods: {
@@ -185,12 +186,42 @@ export default {
       link.click();
       document.body.removeChild(link);
     },
+    renderCellContent(h, params) {
+      const key = params.column.key
+      const children = [params.row[key]]
+      if (params.column.isTrend) {
+        const increaseValue = params.row[key + '_increase']
+        const positiveValue = params.row[key + '_positive']
+        const trendText = increaseValue === '1' ? '↑' : increaseValue === '0' ? '↓' : ''
+        if (trendText) {
+          const trendStyle = {
+            marginLeft: '4px',
+            fontWeight: 'bold'
+          }
+          if (positiveValue === 1 || positiveValue === '1') {
+            trendStyle.color = '#19be6b'
+          } else if (positiveValue === 0 || positiveValue === '0') {
+            trendStyle.color = '#ed4014'
+          }
+          children.push(h('span', { style: trendStyle }, trendText))
+        }
+      }
+      return children
+    },
     onClose() {
       this.boxShow = false
+    },
+    initConfig() {
+      if (this.widget && this.widget.options && Object.prototype.hasOwnProperty.call(this.widget.options, "tableType")) {
+        if (this.widget.options["tableType"] !== '0') {
+          this.tableBorder = false
+        }
+      }
     }
   },
   created() {
     console.log("BiPagingTable -- created() -- this.widget:", this.widget)
+    this.initConfig()
   },
   mounted() {
     this.doSearch()
@@ -215,7 +246,7 @@ export default {
                         },
                       },
                     },
-                    params.row[params.column.key]
+                    self.renderCellContent(h, params)
                   )
                 }
               } else if (column.isFile) {
@@ -231,9 +262,14 @@ export default {
                         },
                       },
                     },
-                    params.row[params.column.key]
+                    self.renderCellContent(h, params)
                   )
                 }
+              } else if (column.isTrend) {
+                let self = this
+                column.render = function (h, params) {
+                  return h('span', self.renderCellContent(h, params))
+                }
               }
             })
           } catch (e) {

package/package.json

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