lambo-design-bi 0.0.131 → 0.0.133

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

@@ -5,7 +5,7 @@
       {{ widget.options.title }}
     </template>
     <template v-for="(item, index) in widget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index">
+      <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>

package/bi/widget/layout/col.vue

@@ -1,7 +1,7 @@
 <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">
+      <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>
@@ -19,6 +19,10 @@ export default {
     widget: {
       type: Object,
       default: () => ({})
+    },
+    params: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {

package/bi/widget/layout/row.vue

@@ -1,7 +1,7 @@
 <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">
+      <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>
@@ -19,6 +19,10 @@ export default {
     widget: {
       type: Object,
       default: () => ({})
+    },
+    params: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {

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

@@ -75,7 +75,7 @@ export default {
       // this.$router.push({  name: 'xxx' })
     },
     doSearch(params) {
-      console.log("child-page-tm doSearch params:", params)
+      console.log("child-page-tm doSearch 1 params:", params)
       console.log("child-page-tm doSearch this.childPageWidget:", this.childPageWidget)
       let emptySearchArr = []
       // 增加前端校验是否必传
@@ -104,6 +104,7 @@ export default {
         return
       }
       this.params = deepCopy(params)
+      console.log("child-page-tm doSearch 2 this.params:", this.params)
     },
     setRouteConfig2Search(widgetData) {
       let routeConfig = this.$route.query || {}
@@ -115,7 +116,7 @@ export default {
             let searchType = item.options['searchType']
             let qKey = item.options['qKey']
             if (searchType === SEARCH_DICT.INPUT.id) {
-              item['val'] = routeConfig[qKey]
+              item.options['val'] = routeConfig[qKey]
             } else if (searchType === SEARCH_DICT.SINGLE_SELECT.id) {
               let val = routeConfig[qKey]
               let valName = ''
@@ -131,8 +132,8 @@ export default {
                   }
                 }
                 if (valName) {
-                  item['val'] = val
-                  item['valName'] = valName
+                  item.options['val'] = val
+                  item.options['valName'] = valName
                 }
               }
             } else if (searchType === SEARCH_DICT.MUlTI_SELECT.id) {
@@ -150,8 +151,8 @@ export default {
                   }
                 }
                 if (valNameArr && valNameArr.length > 0) {
-                  item['val'] = val
-                  item['valName'] = valNameArr.join()
+                  item.options['val'] = valArr
+                  item.options['valName'] = valNameArr.join()
                 }
               }
             } else if (searchType === SEARCH_DICT.SINGLE_DATE.id) {
@@ -159,7 +160,7 @@ export default {
               if (val && val.indexOf('-') > 0) {
                 val = moment(val).format("YYYYMMDD")
               }
-              item['val'] = val
+              item.options['val'] = val
             } else if (searchType === SEARCH_DICT.MUlTI_DATE.id) {
               console.log("detail -- getPageConfig -- routeConfig:", routeConfig)
               let startDate = routeConfig[qKey + '_start']

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

@@ -61,7 +61,7 @@ export default {
       })
     },
     doSearch(params) {
-      console.log("index-page-tm doSearch params:", params)
+      console.log("index-page-tm doSearch 1 params:", params)
       console.log("index-page-tm doSearch this.pageWidget:", this.pageWidget)
       let emptySearchArr = []
       // 增加前端校验是否必传
@@ -90,6 +90,7 @@ export default {
         return
       }
       this.params = deepCopy(params)
+      console.log("index-page-tm doSearch 2 this.params:", this.params)
     },
   },
   created() {

package/bi/widget/page/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <template v-for="(item, index) in widget.widgets">
-      <component :is="getWidgetName(item)" :widget="item" :key="index">
+      <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>
@@ -37,6 +37,15 @@ export default {
   },
   mounted() {
 
+  },
+  watch: {
+    params: {
+      handler: function (val, oldVal) {
+        console.log('page watch oldVal,val:', oldVal, val)
+
+      },
+      deep: true
+    },
   }
 }
 </script>

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

@@ -15,6 +15,7 @@ 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"
+import { SEARCH_DICT, DATE_RANGE_PFIX, DEFAULT_DATE_FORMAT } from '../../../util/constants'
 
 export default {
   name: 'BiSearchForm',
@@ -34,33 +35,36 @@ export default {
     doSearch() {
       let params = {}
       let searchList = this.widget.widgets
-      console.log("doSearch -- this.widget.widgets:", searchList)
+      console.log("search-from doSearch this.widget.widgets:", searchList)
       if (searchList) {
         searchList.map(item => {
-          if (item.options && Object.prototype.hasOwnProperty.call(item, "val") && Object.prototype.hasOwnProperty.call(item, "qKey")) {
-            let val = item.options.val
+          if (item.options && Object.prototype.hasOwnProperty.call(item.options, "qKey")) {
             let qKey = item.options.qKey
-            if (val) {
+            if (Object.prototype.hasOwnProperty.call(item.options, "val") && item.options.val) {
+              let val = item.options.val
               if (Array.isArray(val)) {
-                if (item.options.searchType === '51') {
+                if (item.options.searchType === SEARCH_DICT.MUlTI_DATE.id) {
                   if (val && Array.isArray(val) && val.length === 2 && val[0] && val[1]) {
-                    params[qKey + '_start'] = moment(val[0]).format("YYYYMMDD")
-                    params[qKey + '_end'] = moment(val[1]).format("YYYYMMDD")
+                    params[qKey + DATE_RANGE_PFIX.START] = moment(val[0]).format(DEFAULT_DATE_FORMAT)
+                    params[qKey + DATE_RANGE_PFIX.END] = moment(val[1]).format(DEFAULT_DATE_FORMAT)
                   }
                 } else {
                   params[qKey] = val.join()
                 }
               } else {
                 if (item.options.searchType === '50') {
-                  params[qKey] = moment(val).format("YYYYMMDD")
+                  params[qKey] = moment(val).format(DEFAULT_DATE_FORMAT)
                 } else {
                   params[qKey] = val
                 }
               }
+            } else {
+              params[qKey] = null
             }
           }
         })
       }
+      console.log("search-from doSearch params:", params)
       this.$emit("on-search", params)
     },
     onReset() {

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

@@ -177,7 +177,7 @@ export default {
   watch: {
     params: {
       handler: function (val, oldVal) {
-        console.log('watch val,oldVal', val, oldVal)
+        console.log('paging-table watch oldVal,val:', oldVal, val)
         this.doSearch()
       },
       deep: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambo-design-bi",
-  "version": "0.0.131",
+  "version": "0.0.133",
   "description": "",
   "main": "index.js",
   "author": "finch",