imatrix-ui 0.2.42-up → 0.2.44-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "0.2.42-up",
+  "version": "0.2.44-test",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/IntervalSelection/src/sectionDate.vue

@@ -275,9 +275,14 @@ export default {
     // 填充默认值
     setTimeScope() {
       const dataOptions = this.colFieldSetting.options
+         let myDefaultValue = dataOptions.defaultValueSetting ? dataOptions.defaultValueSetting.paramValue : null
+        if (myDefaultValue === undefined || myDefaultValue === null || myDefaultValue === '') {
+          myDefaultValue = dataOptions.defaultValue
+        }
       const defaultValueMap = getDateRangeSelectorDefaultValue(
         dataOptions.stareScopeTimeType,
-        dataOptions.format
+        dataOptions.format,
+        myDefaultValue
       )
       if (defaultValueMap) {
         const startTimeTemp = defaultValueMap.startTimeTemp
@@ -286,45 +291,40 @@ export default {
         const myEndDate = defaultValueMap.endDate
         if (
           dataOptions.showType === 'year' &&
-          dataOptions.stareScopeTimeType !== '' &&
-          dataOptions.stareScopeTimeType !== null &&
-          dataOptions.stareScopeTimeType !== undefined
+          startTimeTemp &&
+          endTimeTemp
         ) {
           // 年范围选择器
           this.yearStartDate = startTimeTemp
           this.yearDate = endTimeTemp
         } else if (
           dataOptions.showType === 'quarterScope' &&
-          dataOptions.stareScopeTimeType !== '' &&
-          dataOptions.stareScopeTimeType !== null &&
-          dataOptions.stareScopeTimeType !== undefined
+          startTimeTemp &&
+          endTimeTemp
         ) {
           // 季度范围选择器
           this.ScopeStartDate = startTimeTemp
           this.ScopeEndDate = endTimeTemp
         } else if (
           dataOptions.showType === 'week' &&
-          dataOptions.stareScopeTimeType !== '' &&
-          dataOptions.stareScopeTimeType !== null &&
-          dataOptions.stareScopeTimeType !== undefined
+          startTimeTemp &&
+          endTimeTemp
         ) {
           // 周范围选择器
           this.weekStareDate = startTimeTemp
           this.weekDate = endTimeTemp
         } else if (
           dataOptions.showType === 'monthrange' &&
-          dataOptions.stareScopeTimeType !== '' &&
-          dataOptions.stareScopeTimeType !== null &&
-          dataOptions.stareScopeTimeType !== undefined
+          startTimeTemp &&
+          endTimeTemp
         ) {
           // 月份范围选择器
           this.monthStareDate = startTimeTemp
           this.monthDate = endTimeTemp
         } else if (
           dataOptions.showType === 'daterange' &&
-          dataOptions.stareScopeTimeType !== '' &&
-          dataOptions.stareScopeTimeType !== null &&
-          dataOptions.stareScopeTimeType !== undefined
+          startTimeTemp &&
+          endTimeTemp
         ) {
           // 日期范围选择器
           this.datStareDate = [startTimeTemp, endTimeTemp]

package/packages/department-tree/src/department-tree.vue

@@ -91,6 +91,9 @@ export default {
 			type: String,
 			default: ',',
 		},
+		this: {
+			type: object,
+		}
 	},
 	data() {
 		let myTitle = this.$t('imatrixUIMessage.pleaseSelectDepartment')

package/packages/super-grid/src/dynamic-input.vue

@@ -13,6 +13,7 @@
 				:row-index="position?position.row:null"
 				:select-options="options"
 				:value="innerValue"
+				:additional-param-map="additionalParamMap"
 				@change="cellEvent('change',$event)"
 				@input="cellEvent('input',$event)"
 		/>
@@ -424,7 +425,7 @@ import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-
 import {getEntityFieldValue, setEntityFieldValue} from '../../../src/utils/util'
 import {getToken} from '../../../src/utils/auth'
 import apis from './apis'
-import ViewImageDialog from './view-image-dialog.vue'
+import ViewImageDialog from './view-image-dialog'
 import {$emit} from '../../utils/gogocodeTransfer'
 
 export default {
@@ -880,8 +881,8 @@ export default {
 			if (eventName === 'clear') {
 				if ((this.type === 'multiselect' || this.type === 'select') && isDynamicDataSourceSource(this.column)) {
 					for (let index = 0; index < this.valueSetOptions.length; index++) {
-						if (this.column.prop !== this.valueSetOptions[0].valueColumn.dbColumnName) {
-							this.setCellValue(this.valueSetOptions[0].valueColumn.dbColumnName, null, 'input')
+						if (this.column.prop !== this.valueSetOptions[index].valueColumn.dbColumnName) {
+              				this.setCellValue(this.valueSetOptions[index].valueColumn.dbColumnName, null, 'input')
 						}
 					}
 				}

package/packages/super-grid/src/normal-column.vue

@@ -137,6 +137,7 @@
 		          :select-options="column.valueSet"
 		          :show-value="$escapeHtml(getLabel(scope.row, scope.$index))"
 		          :value="getCellValue(scope.row)"
+				  :additional-param-map="additionalParamMap"
           />
         </span>
 				<!-- 自定义格式的时候 -->
@@ -171,6 +172,7 @@
               $escapeHtml(getLabel(pageGridData[scope.$index], scope.$index))
             "
 		          :value="getCellValue(pageGridData[scope.$index])"
+				  :additional-param-map="additionalParamMap"
           /></span>
         <span
 		        v-else-if="
@@ -457,7 +459,8 @@ import {
 	getFileList,
 	isDynamicDataSourceSource,
 	isHasEditOption,
-	isRequiredEdit
+	isRequiredEdit,
+	getAdditionalParamMap
 } from './utils'
 import DynamicInput from './dynamic-input.vue'
 import store from './store'
@@ -547,6 +550,7 @@ export default {
 		) {
 			parentFormData = gridParams.options.extraParam.entityMap
 		}
+		const additionalParamMap = getAdditionalParamMap(gridParams)
 		return {
 			selectRow: null,
 			that: this,
@@ -569,6 +573,7 @@ export default {
 			showRichEditorViewer: false,
 			getFormData: gridParams.options.getFormData,
 			getTableGridData: gridParams.options.getGridData,
+			additionalParamMap
 		}
 	},
 	computed: {
@@ -1060,7 +1065,7 @@ export default {
 					this.column,
 					row,
 					this.isSql,
-					gridParams.additionalParamMap,
+					this.additionalParamMap,
 					gridParams.contextParameter,
 					tableName,
 					this.listCode

package/packages/super-grid/src/super-grid.vue

@@ -60,8 +60,9 @@
         class="elTable"
         :tree-props="getTreeProps(parentProp, isSql, isLazy, dataSourceType)"
         @sort-change="handleSortChange"
-        @select="select"
-        @select-all="selectAll"
+        @select="selectRecord"
+        @select-all="selectAllRecord"
+        @selection-change="selectionChangeEvent"
         @row-click="rowClickEvent"
         @row-dblclick="rowDblclickEvent"
         @expand-change="expandChange"
@@ -657,6 +658,7 @@ export default {
       handler(newValue, oldValue) {
         console.log('watch====options.extraParam.entityMap===改变==', newValue)
         this.parentFormData = newValue
+        this.$emit('change-form-data', this.parentFormData)
       }
     }
   },
@@ -2918,6 +2920,81 @@ export default {
       store.set(this.code, gridParams)
       this['subTableData'] = data
     },
+    // 选择记录
+    selectRecord(selection, row){
+      let selectRecordEventResult = true
+      const gridParams = store.get(this.code)
+      if (isHasOptionFunction('selectRecord', this.code)) {
+        selectRecordEventResult = gridParams.options.selectRecord.call(this, {
+          gridData: this.isSubTableShowPage
+            ? this.subTableData
+            : this.gridData,
+          columns: gridParams.columns,
+          superGrid: this.$refs.superGrid,
+          pageGridData: this.isSubTableShowPage
+            ? this.gridData
+            : null,
+          additionalParamMap: gridParams.additionalParamMap,
+          selection: selection,
+          row: row,
+          parentFormData: this.parentFormData
+        })
+        if(selectRecordEventResult !== undefined &&  selectRecordEventResult=== false){
+          // 最后选中的记录取消选中状态
+          this.$refs.superGrid.toggleRowSelection(row, false)
+        }
+      }
+      this.select(selection, row)
+    },
+    // 取消选择记录
+    selectAllRecord(selection){
+      let selectAllRecordsEventResult = true
+      const gridParams = store.get(this.code)
+      if (isHasOptionFunction('selectAllRecords', this.code)) {
+        selectAllRecordsEventResult = gridParams.options.selectAllRecords.call(this, {
+          gridData: this.isSubTableShowPage
+            ? this.subTableData
+            : this.gridData,
+          columns: gridParams.columns,
+          superGrid: this.$refs.superGrid,
+          pageGridData: this.isSubTableShowPage
+            ? this.gridData
+            : null,
+          additionalParamMap: gridParams.additionalParamMap,
+          selection: selection,
+          parentFormData: this.parentFormData
+        })
+        if(selectAllRecordsEventResult !== undefined &&  selectAllRecordsEventResult=== false){
+          // 取消所有记录选中状态
+          this.$refs.superGrid.toggleAllSelection()
+        }
+      }
+      this.selectAll(selection)
+    },
+    // 选择记录发生改变时
+    selectionChangeEvent(newSelection){
+      const gridParams = store.get(this.code)
+      if (isHasOptionFunction('selectionChange', this.code)) {
+        gridParams.options.selectionChange.call(this, {
+          gridData: this.isSubTableShowPage
+            ? this.subTableData
+            : this.gridData,
+          columns: gridParams.columns,
+          superGrid: this.$refs.superGrid,
+          pageGridData: this.isSubTableShowPage
+            ? this.gridData
+            : null,
+          additionalParamMap: gridParams.additionalParamMap,
+          selection: newSelection,
+          parentFormData: this.parentFormData
+        })
+        // if(selectionChangeEventResult !== undefined &&  selectionChangeEventResult=== false){
+        //   // 最后选中的记录取消选中状态
+        //   this.$refs.superGrid.toggleRowSelection(newSelection[newSelection.length - 1], false)
+        // }
+      }
+      this.selectionChange(newSelection)
+    },
   },
   emits: [
     'change-grid-data',

package/src/styles/theme/dark-blue/dialog.scss

@@ -1,8 +1,4 @@
 .dark-blue {
-  .el-dialog__header {
-    padding: 22px 0px 0px 24px;
-  }
-
   .el-dialog__title::before {
     content: "";
     text-align: center;
@@ -18,4 +14,4 @@
   }
 
 
-}
+}

package/src/utils/range-selector.js

@@ -1,3 +1,4 @@
+import {getLastNDate} from './util'
 export function getFirstDayOfSeason(date) {
   var month = new Date(date).getMonth()
   if (month < 3) {
@@ -31,7 +32,12 @@ function formatDate(time) {
 
 export function formatTimefn(format, dateTime) {
   if (format === undefined || format === null || format === '') {
-    return dateTime
+    let val = dateTime
+    // if(typeof dateTime === 'number') {
+    //   // 表示是毫秒值
+    //   val = new Date(dateTime)
+    // }
+    return val
   }
   const nowTime = new Date(dateTime)
   const year = nowTime.getFullYear()
@@ -95,9 +101,9 @@ export function formatTimefn(format, dateTime) {
   return format
 }
 
-export function getDateRangeSelectorDefaultValue(stareScopeTimeType, format) {
+export function getDateRangeSelectorDefaultValue(stareScopeTimeType, format, defaultValueSetting) {
   let Staretime = ''
-  const endTime = new Date()
+  let endTime = new Date()
   const computeTime = new Date()
   if (stareScopeTimeType === 'oneYear') {
     // 近一年
@@ -177,6 +183,16 @@ export function getDateRangeSelectorDefaultValue(stareScopeTimeType, format) {
     // 近三周
     const MondayTime = getWeekOfSeason(computeTime)
     Staretime = new Date(MondayTime - 14 * 24 * 60 * 60 * 1000)
+  } else {
+    if (defaultValueSetting && defaultValueSetting.includes('${context.')) {
+        defaultValueSetting = defaultValueSetting.replace('${context.', '').replace('}', '')
+        const dates = getLastNDate(defaultValueSetting)
+        if(dates && Array.isArray(dates)) {
+          // 表示是区间范围组件需要的值
+          Staretime = dates[0]
+          endTime = dates[1]
+        }
+    }
   }
   if (Staretime) {
     const startTimeTemp = new Date(Staretime).getTime()

package/src/utils/util.js

@@ -1,6 +1,6 @@
 import i18n from '../i18n/i18n'
-import {executeExpression} from './calculator/calculator-util'
-import {getLangByShort} from './common-util'
+import { executeExpression } from './calculator/calculator-util'
+import { getLangByShort } from './common-util'
 
 export function getI18n() {
     if (!window.$locale) {
@@ -89,69 +89,69 @@ export function findDynamicDataSourceByCode(
     searchParam
 ) {
     let watchAttrValue
-  let parentEntity
-  let listCode
-  let formCode
-  let tableName
-  if (searchParam) {
-    watchAttrValue = searchParam.watchAttrValue
-    if (watchAttrValue === undefined || watchAttrValue === null) {
-      watchAttrValue = ''
-    }
-    parentEntity = searchParam.parent
-    listCode = searchParam._listCode
-    formCode = searchParam._formCode
-    tableName = searchParam._tableName
-  }
-  const params = {
-    searchText,
-    watchAttrValue,
-    parent: parentEntity
-
-  }
-  if (additionalParameterStr && typeof (additionalParameterStr) === 'object') {
-    params.additionalParamMap = additionalParameterStr
-  } else if (additionalParameterStr && typeof (additionalParameterStr) === 'string') {
-    params.additionalParamMap = JSON.parse(additionalParameterStr)
-  }
-  if (params.additionalParamMap === undefined) {
-    params.additionalParamMap = {}
-  }
-  if (listCode) {
-    params.additionalParamMap._listCode = listCode
-  }
-  if (formCode) {
-    params.additionalParamMap._formCode = formCode
-  }
-  if (tableName) {
-    params.additionalParamMap._tableName = tableName
-  }
-  if (entity && entity !== null) {
-    params.entity = entity
-  }
-  const backendUrl = window.$vueApp.config.globalProperties.baseURL
-
-  return new Promise((resolve, reject) => {
-    // 页面设计不请求动态数据源
-    if (window.$vueApp.config.globalProperties.systemCode !== undefined && window.$vueApp.config.globalProperties.systemCode === 'iMatrix') {
-      resolve()
-    } else {
-        window.$vueApp.config.globalProperties.$http.post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(result => {
-        if (result.backendUrl) {
-          // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
-          window.$vueApp.config.globalProperties.$http.post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(finallyResult => {
-            resolve(finallyResult)
-          }).catch(error => {
-            reject(error)
-          })
-        } else {
-          resolve(result)
+    let parentEntity
+    let listCode
+    let formCode
+    let tableName
+    if (searchParam) {
+        watchAttrValue = searchParam.watchAttrValue
+        if (watchAttrValue === undefined || watchAttrValue === null) {
+            watchAttrValue = ''
         }
-      }).catch(error => {
-        reject(error)
-      })
+        parentEntity = searchParam.parent
+        listCode = searchParam._listCode
+        formCode = searchParam._formCode
+        tableName = searchParam._tableName
+    }
+    const params = {
+        searchText,
+        watchAttrValue,
+        parent: parentEntity
+
+    }
+    if (additionalParameterStr && typeof (additionalParameterStr) === 'object') {
+        params.additionalParamMap = additionalParameterStr
+    } else if (additionalParameterStr && typeof (additionalParameterStr) === 'string') {
+        params.additionalParamMap = JSON.parse(additionalParameterStr)
+    }
+    if (params.additionalParamMap === undefined) {
+        params.additionalParamMap = {}
+    }
+    if (listCode) {
+        params.additionalParamMap._listCode = listCode
+    }
+    if (formCode) {
+        params.additionalParamMap._formCode = formCode
     }
-  })
+    if (tableName) {
+        params.additionalParamMap._tableName = tableName
+    }
+    if (entity && entity !== null) {
+        params.entity = entity
+    }
+    const backendUrl = window.$vueApp.config.globalProperties.baseURL
+
+    return new Promise((resolve, reject) => {
+        // 页面设计不请求动态数据源
+        if (window.$vueApp.config.globalProperties.systemCode !== undefined && window.$vueApp.config.globalProperties.systemCode === 'iMatrix') {
+            resolve()
+        } else {
+            window.$vueApp.config.globalProperties.$http.post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(result => {
+                if (result.backendUrl) {
+                    // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
+                    window.$vueApp.config.globalProperties.$http.post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(finallyResult => {
+                        resolve(finallyResult)
+                    }).catch(error => {
+                        reject(error)
+                    })
+                } else {
+                    resolve(result)
+                }
+            }).catch(error => {
+                reject(error)
+            })
+        }
+    })
 }
 
 /**
@@ -434,11 +434,179 @@ function getSubEntityFieldValue(subEntityData, fieldName) {
 }
 
 function getContextValue(contextParameterMap, propValue) {
+    let value = getLastNDate(propValue)
     if (contextParameterMap) {
-        return contextParameterMap[propValue]
+        value = contextParameterMap[propValue]
+    }
+    return value
+}
+/**
+ * 获得最近n天的开始日期和结束日期集合
+ * @param {*} propValue currentTime/currentWeek/currentMonth/currentQuarter/currentYear/lastNDay:n
+ * @returns [startDate,endDate]，例如：[2024/2/26 00:00:00,2023/3/3 23:59:59]
+ */
+export function getLastNDate(propValue) {
+    let value
+    if (propValue &&
+        propValue === 'currentTime') {
+        // 当前时间
+        value = new Date()
+    }
+    if (propValue &&
+        propValue === 'currentWeek') {
+        // 本周
+        value = getCurrentWeek()
+    }
+    if (propValue &&
+        propValue === 'currentMonth') {
+        // 本月
+        value = getCurrentMonth()
+    }
+    if (propValue &&
+        propValue === 'currentQuarter') {
+        // 本季度
+        value = getCurrentQuarter()
+    }
+    if (propValue &&
+        propValue === 'currentYear') {
+        // 本年
+        value = getCurrentYear()
+    }
+    if (propValue &&
+        propValue.indexOf('lastNDay') >= 0) {
+        // 最近n天 lastNDay:n，例如：lastNDay:5，表示最近5天
+        const n = propValue.substring(propValue.indexOf(':') + 1)
+        value = getLastNDay(parseInt(n))
     }
+    return value
+}
+/**
+ * 获得当前周的周一和周日的的日期
+ * 例如：[2024/2/26 00:00:00,2023/3/3 23:59:59]
+ * @returns 
+ */
+function getCurrentWeek() {
+    const new_Date = new Date() //获取本周一周日期
+    const timesStamp = new_Date.getTime();
+    const currenDay = new_Date.getDay();
+    // 周一
+    const monday = new Date(timesStamp + 24 * 60 * 60 * 1000 * (0 - (currenDay + 6) % 7))
+    // 周日
+    const sunday = new Date(timesStamp + 24 * 60 * 60 * 1000 * (6 - (currenDay + 6) % 7))
+    const startDate = monday.toLocaleDateString() + " " + monday.toLocaleTimeString()
+    const endDate = sunday.toLocaleDateString() + " " + sunday.toLocaleTimeString()
+    console.log(`getCurrentMonth从 ${startDate} 开始，到 ${endDate} 结束`);
+    return [monday, sunday]
 }
+/**
+ *  获得当前月第1天和最后1天的日期
+ * 例如：[2023/1/1 00:00:00,2023/1/31 23:59:59]
+ * @returns [xxx,xxx]
+ */
+function getCurrentMonth() {
+    // 创建一个新的Date对象，表示当前时间
+    const currentDate = new Date();
+
+    // 获取当前年份和月份
+    const year = currentDate.getFullYear(); // 获取完整的四位年份
+    const month = currentDate.getMonth() + 1; // getMonth返回值范围为0-11，因此加上1得到真正的月份
+
+    // 设置起始日期为本月第一天
+    currentDate.setDate(1);
+
+    // 将起始日期格式化成字符串形式（YYYY-MM-DD）
+    const startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/01`;
+
+    // 设置结束日期为下个月第一天的前一天
+    currentDate.setMonth(currentDate.getMonth() + 2);
+    currentDate.setDate(0);
+
+    // 将结束日期格式化成字符串形式（YYYY-MM-DD）
+    const endDateStr = `${currentDate.getFullYear()}/${currentDate.getMonth() < 9 ? '0' : ''}${(currentDate.getMonth() + 1)}/01`;
+    const startDate11 = new Date(Date.parse(startDateStr))
+    const endDate11 = new Date(new Date(Date.parse(endDateStr)).getTime() - 1000)
+    const startDate = startDate11.toLocaleDateString() + " " + startDate11.toLocaleTimeString()
+    const endDate = endDate11.toLocaleDateString() + " " + endDate11.toLocaleTimeString()
+    console.log(`getCurrentMonth从 ${startDate} 开始，到 ${endDate} 结束`);
+    return [startDate11, endDate11]
+}
+/**
+ * 获得当前季度第1天和最后一天的日期
+ * 例如：[2023/1/1 00:00:00,2023/3/31 23:59:59]
+ * @returns 
+ */
+function getCurrentQuarter() {
+    const currentDate = new Date();
+    const quarterStartIndex = (currentDate.getMonth() + 3) % 12;
+    let firstDayOfQuarter; // 存放第一天的Date对象
+    if (currentDate.getMonth() < quarterStartIndex + 2) {
+        firstDayOfQuarter = new Date(currentDate.getFullYear(), quarterStartIndex, 1);
+    } else {
+        firstDayOfQuarter = new Date(currentDate.getFullYear() + 1, quarterStartIndex, 1);
+    }
+
+    let lastDayOfQuarter; // 存放最后一天的Date对象
+    if (firstDayOfQuarter.getMonth() === 11) {
+        lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear() + 1, 0, 0);
+    } else {
+        lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear(), firstDayOfQuarter.getMonth() + 3, 0);
+    }
+    lastDayOfQuarter = new Date(lastDayOfQuarter.getTime() + (24 * 60 * 60 * 1000) - 1000)
+    const startDate = firstDayOfQuarter.toLocaleDateString() + " " + firstDayOfQuarter.toLocaleTimeString()
+    const endDate = lastDayOfQuarter.toLocaleDateString() + " " + lastDayOfQuarter.toLocaleTimeString()
+    console.log(`getCurrentQuarter从 ${startDate} 开始，到 ${endDate} 结束`);
+    return [firstDayOfQuarter, lastDayOfQuarter]
+}
+/**
+ * 获得本年的第1天和最后一天的日期
+ * 例如：[2023/1/1 00:00:00,2023/12/31 23:59:59]
+ * @returns 
+ */
+function getCurrentYear() {
+    // 创建一个新的日期对象
+    const currentYear = new Date().getFullYear(); // 获取当前年份
+
+    // 设置为当前年的1月1号（第一天）
+    let firstDayOfCurrentYear = new Date(currentYear, 0);
+    firstDayOfCurrentYear.setMonth(0, 1); // 将月份设置为0表示1月
+
+    // 设置为下一年的12月31号（最后一天）
+    let lastDayOfCurrentYear = new Date(currentYear + 1, 0);
+    lastDayOfCurrentYear = lastDayOfCurrentYear.getTime() - 1000
+    lastDayOfCurrentYear = new Date(lastDayOfCurrentYear)
+    const startDate = firstDayOfCurrentYear.toLocaleDateString() + " " + firstDayOfCurrentYear.toLocaleTimeString()
+    const endDate = lastDayOfCurrentYear.toLocaleDateString() + " " + lastDayOfCurrentYear.toLocaleTimeString()
+    console.log(`getCurrentYear从 ${startDate} 开始，到 ${endDate} 结束`);
+    return [firstDayOfCurrentYear, lastDayOfCurrentYear]
+}
+/**
+ * 获得最近n天的日期[n天前,当前日期]。
+ * 例如：[2024/2/25 00:00:00,2024/2/29 23:59:59]
+ * @param {} n 
+ */
+function getLastNDay(n) {
+    let currentDate = new Date(); // 创建一个表示今天的Date对象
+    let year = currentDate.getFullYear(); // 获取完整的四位年份
+    let month = currentDate.getMonth() + 1; // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    let date = currentDate.getDate(); // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    let startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/${date}`;
+    currentDate = new Date(Date.parse(startDateStr))
+    currentDate.setDate(currentDate.getDate() + 1)
+    currentDate = new Date(currentDate.getTime() - 1000)
 
+    let lastNDay = new Date(); // 创建一个表示今天的Date对象
+    lastNDay.setDate(lastNDay.getDate() - (n - 1));
+    const lastNYear = lastNDay.getFullYear(); // 获取完整的四位年份
+    const lastNMonth = lastNDay.getMonth() + 1; // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    const lastNDate = lastNDay.getDate(); // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    const endtDateStr = `${lastNYear}/${lastNMonth < 10 ? '0' : ''}${lastNMonth}/${lastNDate}`;
+    lastNDay = new Date(Date.parse(endtDateStr))
+
+    const startDate = lastNDay.toLocaleDateString() + " " + lastNDay.toLocaleTimeString()
+    const endDate = currentDate.toLocaleDateString() + " " + currentDate.toLocaleTimeString()
+    console.log(`getLastNDay从 ${startDate} 开始，到 ${endDate} 结束`);
+    retur[lastNDay, currentDate]
+}
 export function getPropValue(
     propValue,
     entity,
@@ -572,11 +740,11 @@ export function setEntityFieldValue(entity, prop, value) {
                     parentObj[subProp] = value
                 }
             }
-				} else {
-					if (entity[prop] === undefined || entity[prop] === null) {
+        } else {
+            if (entity[prop] === undefined || entity[prop] === null) {
                 // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
                 entity[prop] = value
-						} else {
+            } else {
                 // 静态对象属性赋值，提高性能
                 entity[prop] = value
             }
@@ -681,7 +849,7 @@ export function findSystemInfoByCode(systemCode) {
         if (!systemCode) {
             systemCode = window.$vueApp.config.globalProperties.systemCode
         }
-        
+
         window.$vueApp.config.globalProperties.$http
             .get(
                 window.$vueApp.config.globalProperties.baseAPI +