lw-cdp-ui 1.4.24 → 1.4.26

package/dist/components/lwBiChart/page.vue

@@ -16,8 +16,7 @@
       :is-draggable="designMode"
       :is-resizable="designMode"
       :use-css-transforms="false"
-      vertical-compact
-      use-css-transforms>
+      vertical-compact>
       <GridItem
         v-for="(item, index) in chartList"
         :key="item.i"
@@ -34,14 +33,20 @@
                 :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 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" />
+            <lwBiChartPage
+              :ref="
+                (el) => {
+                  if (el) chartPageRefs[index] = el
+                }
+              "
+              :chartId="item.id" />
           </div>
           <lwBiChartItem
             :rawData="item.data"
@@ -61,12 +66,14 @@
 
 <script>
 import { GridLayout, GridItem } from 'grid-layout-plus'
+import dayjs from 'dayjs'
 export default {
   components: { GridLayout, GridItem },
   data() {
     return {
       id: '',
       searchOptions: [],
+      chartPageRefs: [],
       chartList: [],
       globalFilter: { values: {}, ranges: {} },
       searchParams: {}
@@ -156,20 +163,38 @@ export default {
       return result
     },
     search() {
+      let filter = JSON.parse(JSON.stringify(this.globalFilter))
       let params = this.unflattenObject(this.searchParams)
       if (params.ranges) {
         Object.entries(params.ranges).map(([key, value]) => {
-          this.globalFilter.ranges[key].timeRange = {
+          filter.ranges[key].timeRange = {
             from: value[0],
             to: value[1]
           }
+          filter.ranges[key].type = 'ABSOLUTE'
+        })
+      }
+      filter.values = params.values
+      this.getChartList(filter)
+
+      // 如果有二级图表
+      if (this.chartPageRefs.length > 0) {
+        this.chartPageRefs.forEach((item) => {
+          item.searchParams = this.searchParams
+          item.globalFilter = filter
+          item.search()
         })
       }
-      this.globalFilter.values = params.values
-      this.getChartList(this.globalFilter)
     },
     reset() {
       this.getChartList({ values: {}, ranges: {} })
+
+      // 如果有二级图表
+      if (this.chartPageRefs.length > 0) {
+        this.chartPageRefs.forEach((item) => {
+          item.getChartList({ values: {}, ranges: {} })
+        })
+      }
     },
     async getChartList(globalFilter = {}) {
       let params = {
@@ -210,7 +235,10 @@ export default {
         const getOptions = async (setting) => {
           const { type, dict, dataInterfaceUri, dimensionTableId } = setting.options
           if (type === 'DICT') {
-            return Object.entries(dict).map(([key, value]) => ({ value: key, label: value }))
+            return Object.entries(dict).map(([key, value]) => ({
+              value: key,
+              label: value
+            }))
           } else if (type === 'DATA_INTERFACE') {
             const res = await this.$http.get(dataInterfaceUri)
             return res.map((item) => ({ value: item.id, label: item.name }))
@@ -223,7 +251,10 @@ export default {
         const getTreeOptions = async (setting) => {
           const { type, dict, dataInterfaceUri, dimensionTableId } = setting.options
           if (type === 'DICT') {
-            return Object.entries(dict).map(([key, value]) => ({ value: key, label: value }))
+            return Object.entries(dict).map(([key, value]) => ({
+              value: key,
+              label: value
+            }))
           } else if (type === 'DATA_INTERFACE') {
             const res = await this.$http.get(dataInterfaceUri)
             return this.listToTree(res)
@@ -237,11 +268,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'
             })
@@ -251,10 +284,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,
@@ -266,9 +300,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
@@ -276,10 +312,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/lwLayout/index.vue

@@ -24,7 +24,10 @@
           </div>
           <div class="adminui-side-scroll">
             <el-scrollbar>
-              <el-menu :default-active="active" router :collapse="menuIsCollapse"
+              <el-menu
+                :default-active="active"
+                router
+                :collapse="menuIsCollapse"
                 :unique-opened="$config.MENU_UNIQUE_OPENED">
                 <NavMenu :navMenus="menu"></NavMenu>
               </el-menu>
@@ -41,7 +44,7 @@
         <div class="aminui-body el-container">
           <div class="aminui-body-menu-top">
             <div class="top-bar-title">
-              <span class="title">{{ $t("lwLayout.layout.topbar") }}：</span>
+              <span class="title">{{ $t('lwLayout.layout.topbar') }}：</span>
               <Topbar v-if="!ismobile"></Topbar>
             </div>
             <userbar :isShowBu="isShowBu" :isShowTask="isShowTask" :isInitialized="isInitialized">
@@ -81,7 +84,6 @@
       </div>
     </section>
   </template>
-
 </template>
 
 <script>
@@ -165,7 +167,7 @@ export default {
       let { grantedApplications } = JSON.parse(userAuthInfo) || {}
 
       if (grantedApplications) {
-        let item = grantedApplications.find(x => x.code === this.$config.APP_NAME.toLowerCase())
+        let item = grantedApplications.find((x) => x.code === this.$config.APP_NAME.toLowerCase())
         return item?.aliasName ? item : ''
       } else {
         return ''
@@ -174,7 +176,7 @@ export default {
   },
   beforeCreate() {
     // 挂载自定义菜单订阅
-    this.$bus.$on('setMenu', menu => {
+    this.$bus.$on('setMenu', (menu) => {
       this.changeMenu = true
       this.menu = this.filterUrl(menu)
     })
@@ -225,14 +227,16 @@ export default {
       let user = await this.$api.auth.user()
 
       // 判断密码是否过期
-      if (!user?.userAuthInfo && user?.loginPage?.includes("pwdChange")) {
+      if (!user?.userAuthInfo && user?.loginPage?.includes('pwdChange')) {
         this.$message.warning('您的密码已过期，请修改密码!')
         return false
       }
 
       // 处理应用显示逻辑
-      let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0].split('_')[0]))]
-      user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x =>
+      let application = [
+        ...new Set(user.userAuthInfo.menus.map((permission) => permission.split('.')[0].split('_')[0]))
+      ]
+      user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter((x) =>
         application.includes(x.code)
       )
 
@@ -245,7 +249,10 @@ export default {
       }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
       this.$tool.data.set('userAuthInfo', userAuthInfo)
-      this.$store.state.user = userAuthInfo
+      this.$store.state.user = {
+        ...this.$store.state.user,
+        ...userAuthInfo
+      }
 
       // 动态菜单
       MENU_LIST['menuDynamic'] = !!user?.menuDynamic
@@ -276,7 +283,7 @@ export default {
 
         // 处理子节点
         if (node.children && node.children.length) {
-          route.children = node.children.sort((a, b) => a.sort - b.sort).map(child => processNode(child, route))
+          route.children = node.children.sort((a, b) => a.sort - b.sort).map((child) => processNode(child, route))
         }
 
         return route
@@ -285,7 +292,7 @@ export default {
       // 按applications分组
       const groupedData = {}
 
-      originData.forEach(item => {
+      originData.forEach((item) => {
         // 获取应用类型（如ec、cdp等）
         const appType = item.applications[0]
 
@@ -299,7 +306,7 @@ export default {
       })
 
       // 对每个应用类型的菜单进行排序
-      Object.keys(groupedData).forEach(appType => {
+      Object.keys(groupedData).forEach((appType) => {
         groupedData[appType].sort((a, b) => a.sort - b.sort)
       })
 
@@ -328,7 +335,7 @@ export default {
     filterUrl(map) {
       var newMap = []
       map &&
-        map.forEach(item => {
+        map.forEach((item) => {
           item.meta = item.meta ? item.meta : {}
           //处理隐藏
           if (item.meta.hidden || item.meta.type == 'button') {

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 {