lambo-design-bi 0.0.205 → 0.0.207

package/bi/designer/index.vue

@@ -1,9 +1,9 @@
 <template>
   <el-container class="designer-container" direction="vertical">
     <!-- 顶部标题栏 -->
-    <el-header class="header">
+    <!-- <el-header class="header">
       <span>物流查询设计器</span>
-    </el-header>
+    </el-header> -->
 
     <!-- 主体内容区 -->
     <el-container class="main-content">
@@ -41,7 +41,7 @@
             <el-button size="small">导入JSON</el-button>
             <el-button size="small" type="primary">导出JSON</el-button>
             <el-button size="small" type="success">导出代码</el-button>
-            <el-button size="small" type="warning">生成SFC</el-button>
+            <!-- <el-button size="small" type="warning">生成SFC</el-button> -->
           </div>
         </el-header>
 
@@ -84,18 +84,17 @@ export default {
 .designer-container {
   height: 100vh;
   width: 100vw;
-  min-width: 1024px;
 }
 
-.header {
-  height: 48px;
-  line-height: 48px;
+/* .header {
+  height: 32px;
+  line-height: 32px;
   padding-left: 20px;
   border-bottom: 1px solid #dcdfe6;
   background: #fff;
   font-size: 16px;
   font-weight: bold;
-}
+} */
 
 .main-content {
   height: calc(100vh - 48px);

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

@@ -41,7 +41,7 @@ export default {
   methods: {
     getWidgetName,
     initConfig() {
-      this.containerStyle = parseStyleStr(this.widget.options.style) || {}
+      this.containerStyle = parseStyleStr(this.widget.options.style || {}) || {}
       console.log("ContainerCard this.containerStyle:", this.containerStyle)
     }
   },

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

@@ -82,28 +82,8 @@ export default {
       })
     },
     goBack() {
-      let routeConfig = this.$route || {}
-      console.log("child-page-tm goBack routeConfig:", routeConfig)
-      let parentRouteName = null
-      if (routeConfig && routeConfig.meta && routeConfig.meta.crumbs) {
-        let crumbs = routeConfig.meta.crumbs
-        if (crumbs && crumbs.length > 1) {
-          let parentRoute = crumbs[crumbs.length - 2]
-          if (parentRoute) {
-            parentRouteName = parentRoute.name || null
-          }
-        }
-      }
-      if (parentRouteName) {
-        console.log("child-page-tm goBack parentRouteName:", parentRouteName)
-        this.$router.push({
-          name: parentRouteName,
-          query: { pageId: this.parentPageId }
-        })
-      } else {
-        console.log("child-page-tm goBack history.back()")
-        this.$router.go(-1)
-      }
+      console.log("child-page-tm goBack history.back()")
+      this.$router.go(-1)
     },
     initSearch() {
       let resObj = getInitSearchRes(this.childPageWidget)

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

@@ -1,6 +1,6 @@
 <template>
-  <div v-if="widget.widgets && widget.widgets.length > 0">
-    <LamboQueryFilter :default-rows="1" :label-width="145" :span="6" :showSearchIcon="true" :autocomplete="'on'" :hideResetButton="true" @do-search="doSearch" @on-reset="onReset">
+  <div class="bi-search-form" v-if="widget.widgets && widget.widgets.length > 0">
+    <LamboQueryFilter :default-rows="2" :label-width="150" :span="8" :showSearchIcon="true" :autocomplete="'on'" :hideResetButton="true" @do-search="doSearch" @on-reset="onReset">
       <div v-for="(item, index) in widget.widgets" :key="index">
         <FormItem v-if="item.options.searchType !== 'A0'" :label="item.name">
           <BiSearchItem :widget="item"></BiSearchItem>
@@ -59,9 +59,9 @@ export default {
               } else {
                 if (item.options.searchType === SEARCH_DICT.SINGLE_DATE.id) {
                   params[qKey] = moment(val).format(DEFAULT_DATE_FORMAT)
-                }else if (item.options.searchType === SEARCH_DICT.SINGLE_YEAR.id) {
+                } else if (item.options.searchType === SEARCH_DICT.SINGLE_YEAR.id) {
                   params[qKey] = moment(val).format(DEFAULT_YEAR_FORMAT)
-                }else if (item.options.searchType === SEARCH_DICT.SINGLE_MONTH.id) {
+                } else if (item.options.searchType === SEARCH_DICT.SINGLE_MONTH.id) {
                   params[qKey] = moment(val).format(DEFAULT_MONTH_FORMAT)
                 }
                 else {
@@ -95,8 +95,14 @@ export default {
   },
   mounted() {
     this.cacheWidget = deepCopy(this.widget)
-    this.doSearch();
+    this.doSearch()
   }
 }
 </script>
-<style scoped></style>
+<style scoped>
+.bi-search-form {
+  ::v-deep .ivu-form-item {
+    margin-bottom: 8px;
+  }
+}
+</style>

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

@@ -17,10 +17,6 @@
       </Select>
     </div>
     <div v-else-if="widget.options.searchType === searchDict.MUlTI_SELECT.id"> <!-- 多选下拉框 -->
-      <!-- <Select v-model="widget.options.val" class="lambo-query-class" filterable :clearable="true" placeholder="请选择" multiple
-        :max-tag-count="1">
-        <Option v-for="(item, index) in widget.options.dataList" :key="index" :value="item.K"> {{ item.V }}</Option>
-      </Select> -->
       <LamboElMultiSelect v-model="widget.options.val" :data="widget.options.dataList"></LamboElMultiSelect>
     </div>
     <div v-else-if="widget.options.searchType === searchDict.SINGLE_HELP.id"> <!-- 单选帮助框 -->
@@ -64,7 +60,7 @@
 import HelpBox from "../../../pub/helpbox/index.vue"
 import biConfig from "../config/config"
 import { SEARCH_DICT } from '../../../util/constants'
-import LamboElMultiSelect from '../../../pub/search/multi-select/index.vue' 
+import LamboElMultiSelect from '../../../pub/search/multi-select/index.vue'
 
 export default {
   name: 'BiSearchItem',

package/package.json

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

package/pub/search/checkbox/index.vue

@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <CheckboxGroup v-model="fruit">
+      <Checkbox label="香蕉"></Checkbox>
+      <Checkbox label="苹果"></Checkbox>
+      <Checkbox label="西瓜"></Checkbox>
+    </CheckboxGroup>
+  </div>
+</template>
+<script>
+
+export default {
+  name: "LamboCheckBox",
+  components: {},
+  props: {
+
+  },
+  data() {
+    return {
+      fruit: ['苹果']
+    }
+  },
+  methods: {
+
+  },
+  created() {
+
+  },
+  mounted() {
+
+  }
+}
+</script>
+<style scoped></style>