lw-cdp-ui 1.4.23 → 1.4.25

package/dist/components/lwBiChart/page.vue

@@ -1,42 +1,67 @@
 <template>
   <div class="lw-bi-chart-global-layout">
-    <lw-search v-if="searchOptions.length > 0" class="search-body" :options="searchOptions" v-model="searchParams"
-      :hideLabel="true" @search="search" @reset="reset" />
+    <lw-search
+      v-if="searchOptions.length > 0"
+      class="search-body"
+      :options="searchOptions"
+      v-model="searchParams"
+      :hideLabel="true"
+      @search="search"
+      @reset="reset" />
 
-    <GridLayout v-model:layout="chartList" :col-num="12" :row-height="30" :is-draggable="designMode"
-      :is-resizable="designMode" :use-css-transforms="false" vertical-compact use-css-transforms>
-      <GridItem v-for="(item, index) in chartList" :key="item.i" :x="item.x" :y="item.y" :w="item.w" :h="item.h"
+    <GridLayout
+      v-model:layout="chartList"
+      :col-num="12"
+      :row-height="30"
+      :is-draggable="designMode"
+      :is-resizable="designMode"
+      :use-css-transforms="false"
+      vertical-compact
+      use-css-transforms>
+      <GridItem
+        v-for="(item, index) in chartList"
+        :key="item.i"
+        :x="item.x"
+        :y="item.y"
+        :w="item.w"
+        :h="item.h"
         :i="item.i">
         <div class="lw-bi-chart-global-layout-item" :class="{ edit: designMode }">
           <div v-if="item.data?.setting?.activeDateUnitFilter" class="filter-top">
             <el-radio-group v-model="item.timeUnit" @change="changeTimeUnit(item, index)">
-              <el-radio-button :label="key" :value="value"
-                v-for="(value, key) in item.data?.setting?.optionalDateUnitRanges" :key="key" />
-              <el-radio-button disabled
-                v-if="Object.keys(item.data?.setting?.optionalDateUnitRanges).length == 0">未选择周期列表</el-radio-button>
+              <el-radio-button
+                :label="key"
+                :value="value"
+                v-for="(value, key) in item.data?.setting?.optionalDateUnitRanges"
+                :key="key" />
+              <el-radio-button disabled v-if="Object.keys(item.data?.setting?.optionalDateUnitRanges).length == 0"
+                >未选择周期列表</el-radio-button
+              >
             </el-radio-group>
           </div>
 
           <div v-if="item?.type == 'Dashboard'" class="grid-item-dashboard">
             <lwBiChartPage :chartId="item.id" />
           </div>
-          <lwBiChartItem :rawData="item.data"
+          <lwBiChartItem
+            :rawData="item.data"
             :height="item.data?.setting?.activeDateUnitFilter ? 'calc(100% - 36px)' : '100%'" />
           <div class="remove" v-if="designMode" @click="removeChart(index)">
             <el-button type="primary" link icon="el-icon-delete"></el-button>
           </div>
         </div>
-
       </GridItem>
     </GridLayout>
     <div class="no-record-panel e-unselect" v-if="chartList.length === 0">
-      <el-empty :description="designMode ? '点击上方工具栏中的按钮，添加图表至当前仪表板' : '仪表板中还没有添加任何图表'" />
+      <el-empty
+        :description="designMode ? '点击上方工具栏中的按钮，添加图表至当前仪表板' : '仪表板中还没有添加任何图表'" />
     </div>
   </div>
 </template>
 
 <script>
 import { GridLayout, GridItem } from 'grid-layout-plus'
+import dayjs from 'dayjs'
 export default {
   components: { GridLayout, GridItem },
   data() {
@@ -81,8 +106,8 @@ export default {
       let visualize = await this.$http.get(
         `${this.$config.API_URL}/bi-manage/{tenantId}/{buCode}/visualize/${chartData.id}`
       )
-      visualize?.models.forEach(item => {
-        item?.dimensions.forEach(d => {
+      visualize?.models.forEach((item) => {
+        item?.dimensions.forEach((d) => {
           d.timeSetting.timeUnit = chartItem.timeUnit
         })
       })
@@ -160,6 +185,25 @@ export default {
     removeChart(index) {
       this.modelValue.splice(index, 1)
     },
+    listToTree(data) {
+      const result = []
+      const map = {}
+
+      data.forEach((item) => {
+        map[item.id] = { value: item.id, label: item.name, children: [] }
+      })
+
+      data.forEach((item) => {
+        const parent = map[item.parent]
+        if (parent) {
+          parent.children.push(map[item.id])
+        } else {
+          result.push(map[item.id])
+        }
+      })
+
+      return result
+    },
     async getFilter(filterControls) {
       for (const control of filterControls) {
         const { type } = control
@@ -194,11 +238,13 @@ export default {
           case 'DATA_PICKER': {
             const setting = control.dataPickerSetting
             const options = await getOptions(setting)
+            this.searchParams[`values.${setting.code}`] = setting?.value || []
             this.searchOptions.push({
               label: control.name,
               prop: `values.${setting.code}`,
               renderType: 'select',
               options,
+              value: setting?.value || '',
               valueKey: 'value',
               labelKey: 'label'
             })
@@ -208,10 +254,11 @@ export default {
           case 'DATA_CASCADE': {
             const setting = control.dataPickerSetting
             const items = await getTreeOptions(setting)
+            this.searchParams[`values.${setting.code}`] = setting?.value || []
             this.searchOptions.push({
               label: control.name,
               name: `values.${setting.code}`,
-              value: '',
+              value: setting?.value || [],
               component: 'treeSelect',
               options: {
                 items,
@@ -223,9 +270,11 @@ export default {
           }
 
           case 'DATA_INPUT': {
+            this.searchParams[`values.${control.dataInputSetting.code}`] = control.dataInputSetting?.value || ''
             this.searchOptions.push({
               label: control.name,
               prop: `values.${control.dataInputSetting.code}`,
+              value: control.dataInputSetting?.value || '',
               renderType: 'input'
             })
             break
@@ -233,10 +282,88 @@ export default {
 
           case 'DATE_PICKER': {
             const setting = control.datePickerSetting
+            let value = []
+            switch (control.datePickerSetting.type) {
+              case 'TODAY':
+                value = [dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ'), dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ')]
+                break
+              case 'THIS_MONTH':
+                value = [
+                  dayjs().startOf('month').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().endOf('month').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'THIS_YEAR':
+                value = [
+                  dayjs().startOf('year').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().endOf('year').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'LAST_10_DAYS':
+                value = [
+                  dayjs().subtract(10, 'day').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'LAST_30_DAYS':
+                value = [
+                  dayjs().subtract(30, 'day').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'LAST_12_MONTH':
+                value = [
+                  dayjs().subtract(12, 'month').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'LAST_5_YEAR':
+                value = [
+                  dayjs().subtract(5, 'year').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'LAST_60_SECONDS':
+                value = [dayjs().subtract(60, 'second').toISOString(), dayjs().toISOString()]
+                break
+              case 'LAST_30_MINUTES':
+                value = [dayjs().subtract(30, 'minute').toISOString(), dayjs().toISOString()]
+                break
+              case 'LAST_24_HOURS':
+                value = [dayjs().subtract(24, 'hour').toISOString(), dayjs().toISOString()]
+                break
+              case 'CURRENT_MONDAY_TO_TODAY':
+                value = [
+                  dayjs().startOf('week').add(1, 'day').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), // 周一
+                  dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'YESTERDAY':
+                value = [
+                  dayjs().subtract(1, 'day').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().subtract(1, 'day').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'LAST_YEAR':
+                value = [
+                  dayjs().subtract(1, 'year').startOf('year').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+                  dayjs().subtract(1, 'year').endOf('year').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+                ]
+                break
+              case 'ABSOLUTE':
+                value = [control.datePickerSetting.timeRange.from, control.datePickerSetting.timeRange.to] // 用户指定区间，不设置默认值
+                break
+              default:
+                value = []
+                break
+            }
+            this.searchParams[`ranges.${setting.code}`] = value
+
             this.searchOptions.push({
               label: control.name,
               prop: `ranges.${setting.code}`,
               renderType: 'dateRange',
+              value,
               valueFormat: 'YYYY-MM-DDTHH:mm:ss.SSSZ'
             })
             this.globalFilter.ranges[setting.code] = {

package/dist/components/lwFormMini/FormComponent.vue

@@ -1,43 +1,39 @@
 <template>
   <!-- 动态组件 -->
-  <component :is="componentMap[item.component]"
-             v-model="defaultValue"
-             @change="handleChange"
-             :size="size"
-             :disabled="disabled"
-             v-bind="getComponentProps(item)">
+  <component
+    :is="componentMap[item.component]"
+    v-model="defaultValue"
+    @change="handleChange"
+    :size="size"
+    :disabled="disabled"
+    v-bind="getComponentProps(item)">
     <!-- 处理组件插槽 -->
     <template v-if="item.component === 'select'">
-      <el-option v-for="option in item.options.items"
-                 :key="option.value"
-                 :disabled="option.disabled"
-                 :label="option.label"
-                 :value="option.value" />
+      <el-option
+        v-for="option in item.options.items"
+        :key="option.value"
+        :disabled="option.disabled"
+        :label="option.label"
+        :value="option.value" />
     </template>
     <template v-if="item.component === 'checkboxGroup'">
-      <el-checkbox v-for="_item in item.options.items"
-                   :key="_item.value"
-                   :label="_item.value">{{_item.label}}</el-checkbox>
+      <el-checkbox v-for="_item in item.options.items" :key="_item.value" :label="_item.value">{{
+        _item.label
+      }}</el-checkbox>
     </template>
     <template v-if="item.component === 'radio'">
-      <el-radio v-for="_item in item.options.items"
-                :key="_item.value"
-                :label="_item.value">{{_item.label}}</el-radio>
+      <el-radio v-for="_item in item.options.items" :key="_item.value" :label="_item.value">{{ _item.label }}</el-radio>
     </template>
-    <template v-if="item.component === 'number' && item?.options?.suffix"
-              #suffix>
+    <template v-if="item.component === 'number' && item?.options?.suffix" #suffix>
       {{ item.options.suffix }}
     </template>
-    <template v-if="item.component === 'input' && item?.options?.prepend"
-              #prepend>
+    <template v-if="item.component === 'input' && item?.options?.prepend" #prepend>
       {{ item.options.prepend }}
     </template>
-    <template v-if="item.component === 'input' && item?.options?.append"
-              #append>
+    <template v-if="item.component === 'input' && item?.options?.append" #append>
       {{ item.options.append }}
     </template>
   </component>
-
 </template>
 
 <script>
@@ -123,7 +119,7 @@ export default {
     // 获取组件属性
     getComponentProps(item) {
       let propsItem = {}
-      const {type, startPlaceholder, endPlaceholder, controlsPosition, items, ...options} = item?.options || {}
+      const { type, startPlaceholder, endPlaceholder, controlsPosition, items, ...options } = item?.options || {}
       if (item?.options) {
         // 通用属性
         propsItem.placeholder = item.options.placeholder || ''
@@ -173,4 +169,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dist/components/lwSearch/index.vue

@@ -180,11 +180,10 @@ export default {
     // 用来兼容旧配置
     defaultOptions() {
       return this.options.map((item) => {
-        const { label, span, prop: name, renderType: component, placeholder = label, ...other } = item || {}
-        const componentObj = { label, name, component, span }
+        const { label, value, span, prop: name, renderType: component, placeholder = label, ...other } = item || {}
+        const componentObj = { label, name, value, component, span }
 
         const baseOptions = { placeholder, ...other }
-
         switch (component) {
           case 'dateRange':
             return {