feat: 合并 1.0.6 版本代码

This commit is contained in:
奔跑的面条
2022-07-21 11:03:04 +08:00
40 changed files with 1286 additions and 271 deletions
@@ -3,7 +3,8 @@ import { CreateComponentType } from '@/packages/index.d'
import debounce from 'lodash/debounce'
import cloneDeep from 'lodash/cloneDeep'
import { defaultTheme, globalThemeJson } from '@/settings/chartThemes/index'
import { requestInterval, previewScaleType } from '@/settings/designSetting'
import { requestInterval, previewScaleType, requestIntervalUnit } from '@/settings/designSetting'
import { RequestBodyEnum } from '@/enums/httpEnum'
// 记录记录
import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
// 全局设置
@@ -123,7 +124,18 @@ export const useChartEditStore = defineStore({
// 数据请求处理(需存储给后端)
requestGlobalConfig: {
requestOriginUrl: '',
requestInterval: requestInterval
requestInterval: requestInterval,
requestIntervalUnit: requestIntervalUnit,
requestParams: {
Body: {
"form-data": {},
"x-www-form-urlencoded": {},
json: '',
xml: ''
},
Header: {},
Params: {}
}
},
// 图表数组(需存储给后端)
componentList: []
@@ -401,7 +413,7 @@ export const useChartEditStore = defineStore({
type: isCut ? HistoryActionTypeEnum.CUT : HistoryActionTypeEnum.COPY
}
this.setRecordChart(copyData)
window['$message'].success(isCut ? '剪切成功' : '复制成功!')
window['$message'].success(isCut ? '剪切图表成功' : '复制图表成功!')
loadingFinish()
}
} catch(value) {