lambo-design-bi 0.0.1 → 0.0.107

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

@@ -5,18 +5,21 @@
       {{ widget.options.title }}
     </template>
     <template v-for="(item, index) in widget.widgets">
-      <atom-widget :widget="item" :key="index"></atom-widget>
+      <component :is="getWidgetName(item)" :widget="item" :key="index">
+        <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+          <slot :name="slot" v-bind="scope" />
+        </template>
+      </component>
     </template>
   </lambo-indicator-card-bi>
 </template>
 <script>
 import LamboIndicatorCardBi from './comps/indicator-card/src/indicator-card-bi.vue'
 import { getWidgetName } from '../../util/widget-map'
-import AtomWidget from '../../atom/index.vue'
 
 export default {
   name: "BiContainerCard",
-  components: { LamboIndicatorCardBi, AtomWidget },
+  components: { LamboIndicatorCardBi },
   props: {
     widget: {
       type: Object,

package/bi/widget/layout/col.vue

@@ -1,16 +1,20 @@
 <template>
   <el-col :span="(widget.options && widget.options.span) ? parseInt(widget.options.span) : 24">
     <template v-for="(item, index) in widget.widgets">
-      <atom-widget :widget="item" :key="index"></atom-widget>
+      <component :is="getWidgetName(item)" :widget="item" :key="index">
+        <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+          <slot :name="slot" v-bind="scope" />
+        </template>
+      </component>
     </template>
   </el-col>
 </template>
 <script>
-import AtomWidget from '../atom/index.vue'
+import { getWidgetName } from '../util/widget-map'
 
 export default {
   name: "BiCol",
-  components: { AtomWidget },
+  components: {},  
   props: {
     widget: {
       type: Object,
@@ -23,7 +27,7 @@ export default {
     }
   },
   methods: {
-
+    getWidgetName
   },
   created() {
 

package/bi/widget/layout/row.vue

@@ -1,16 +1,20 @@
 <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">
-      <atom-widget :widget="item" :key="index"></atom-widget>
+      <component :is="getWidgetName(item)" :widget="item" :key="index">
+        <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+          <slot :name="slot" v-bind="scope" />
+        </template>
+      </component>
     </template>
   </el-row>
 </template>
 <script>
-import AtomWidget from '../atom/index.vue'
+import { getWidgetName } from '../util/widget-map'
 
 export default {
   name: "BiRow",
-  components: { AtomWidget },
+  components: {},
   props: {
     widget: {
       type: Object,
@@ -23,7 +27,7 @@ export default {
     }
   },
   methods: {
-    
+    getWidgetName
   },
   created() {
 

package/bi/widget/page/index.vue

@@ -1,16 +1,29 @@
 <template>
-  <div>
+  <LamboPageContainer :has-footer="false" :has-header="widget.options.title ? true : false">
+    <template #page-title>{{ widget.options.title }}</template>
+
+    <LamboIndicatorCardBiSearch :has-extend="false" :has-title="false">
+      <BiSearchForm :widget="widget.search"></BiSearchForm>
+    </LamboIndicatorCardBiSearch>
+
     <template v-for="(item, index) in widget.widgets">
-      <atom-widget :widget="item" :key="index" :params="params"></atom-widget>
+      <component :is="getWidgetName(item)" :widget="item" :key="index">
+        <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+          <slot :name="slot" v-bind="scope" />
+        </template>
+      </component>
     </template>
-  </div>
+  </LamboPageContainer>
 </template>
 <script>
-import AtomWidget from '../atom/index.vue'
+import LamboPageContainer from "@lambo-design/page-container"
+import BiSearchForm from '../search/search-form.vue'
+import { getWidgetName } from '../util/widget-map'
+import LamboIndicatorCardBiSearch from '../container/card/comps/indicator-card/src/indicator-card-bi-search.vue'
 
 export default {
   name: "BiPage",
-  components: { AtomWidget },
+  components: { LamboPageContainer, BiSearchForm, LamboIndicatorCardBiSearch },
   props: {
     widget: {
       type: Object,
@@ -22,10 +35,11 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+    }
   },
   methods: {
-
+    getWidgetName
   },
   created() {
 

package/bi/widget/search/search-form.vue

@@ -14,10 +14,11 @@
 import LamboQueryFilter from "@lambo-design/query-filter"
 import { deepCopy } from "@lambo-design/shared/utils/assist"
 import moment from 'moment'
+import BiSearchItem from "./search-item.vue"
 
 export default {
   name: 'BiSearchForm',
-  components: { LamboQueryFilter },
+  components: { LamboQueryFilter, BiSearchItem },
   props: {
     widget: {
       type: Object,

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

@@ -38,4 +38,3 @@ export function getWidgetName(item) {
     return WIDGET_MAP['_empty']
   }
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambo-design-bi",
-  "version": "0.0.1",
+  "version": "0.0.107",
   "description": "",
   "main": "index.js",
   "author": "finch",
@@ -21,6 +21,7 @@
     "@lambo-design/shared": "^1.0.0-beta.283",
     "@lambo-design/query-filter": "^1.0.0-beta.38",
     "@lambo-design/detail-table": "^1.0.0-beta.23",
+    "@lambo-design/page-container": "^1.0.0-beta.35",
     "axios": "1.6.7",
     "core-js": "^3.8.3",
     "echarts": "^4.8.0",