Commit e9dd4d1c272f96ab855fc1001d1a73724a8ddd35

Authored by ww
1 parent 912bab9c

chore: 合并go-view 代码

@@ -2,20 +2,20 @@ module.exports = { @@ -2,20 +2,20 @@ module.exports = {
2 root: true, 2 root: true,
3 parser: 'vue-eslint-parser', 3 parser: 'vue-eslint-parser',
4 globals: { 4 globals: {
5 - postMessage: true, 5 + postMessage: true
6 }, 6 },
7 parserOptions: { 7 parserOptions: {
8 parser: '@typescript-eslint/parser', 8 parser: '@typescript-eslint/parser',
9 sourceType: 'module', 9 sourceType: 'module',
10 ecmaFeatures: { 10 ecmaFeatures: {
11 jsx: true, 11 jsx: true,
12 - tsx: true,  
13 - }, 12 + tsx: true
  13 + }
14 }, 14 },
15 env: { 15 env: {
16 - 'node': true, 16 + node: true,
17 // The Follow config only works with eslint-plugin-vue v8.0.0+ 17 // The Follow config only works with eslint-plugin-vue v8.0.0+
18 - 'vue/setup-compiler-macros': true, 18 + 'vue/setup-compiler-macros': true
19 }, 19 },
20 extends: [ 20 extends: [
21 'plugin:vue/vue3-essential', 21 'plugin:vue/vue3-essential',
@@ -4,4 +4,3 @@ dist @@ -4,4 +4,3 @@ dist
4 dist-ssr 4 dist-ssr
5 *.local 5 *.local
6 .vscode 6 .vscode
7 -src/packages/components/Decorates/Mores/external/Icon/SvgBorder.vue  
  1 +#!/usr/bin/env sh
  2 +. "$(dirname -- "$0")/_/husky.sh"
  3 +
  4 +npx --no-install commitlint -e
  1 +version: '1.0'
  2 +name: branch-pipeline
  3 +displayName: BranchPipeline
  4 +stages:
  5 + - stage:
  6 + name: compile
  7 + displayName: 编译
  8 + steps:
  9 + - step: build@nodejs
  10 + name: build_nodejs
  11 + displayName: Nodejs 构建
  12 + # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
  13 + nodeVersion: 14.16.0
  14 + # 构建命令:安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
  15 + commands:
  16 + - npm install && rm -rf ./dist && npm run build
  17 + # 非必填字段,开启后表示将构建产物暂存,但不会上传到制品库中,7天后自动清除
  18 + artifacts:
  19 + # 构建产物名字,作为产物的唯一标识可向下传递,支持自定义,默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
  20 + - name: BUILD_ARTIFACT
  21 + # 构建产物获取路径,是指代码编译完毕之后构建物的所在路径
  22 + path:
  23 + - ./dist
  24 + - step: publish@general_artifacts
  25 + name: publish_general_artifacts
  26 + displayName: 上传制品
  27 + # 上游构建任务定义的产物名,默认BUILD_ARTIFACT
  28 + dependArtifact: BUILD_ARTIFACT
  29 + # 上传到制品库时的制品命名,默认output
  30 + artifactName: output
  31 + dependsOn: build_nodejs
  32 + - stage:
  33 + name: release
  34 + displayName: 发布
  35 + steps:
  36 + - step: publish@release_artifacts
  37 + name: publish_release_artifacts
  38 + displayName: '发布'
  39 + # 上游上传制品任务的产出
  40 + dependArtifact: output
  41 + # 发布制品版本号
  42 + version: '1.0.0.0'
  43 + # 是否开启版本号自增,默认开启
  44 + autoIncrement: true
  45 +triggers:
  46 + push:
  47 + branches:
  48 + exclude:
  49 + - master
  50 + include:
  51 + - .*
  1 +version: '1.0'
  2 +name: master-pipeline
  3 +displayName: MasterPipeline
  4 +stages:
  5 + - stage:
  6 + name: compile
  7 + displayName: 编译
  8 + steps:
  9 + - step: build@nodejs
  10 + name: build_nodejs
  11 + displayName: Nodejs 构建
  12 + # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
  13 + nodeVersion: 14.16.0
  14 + # 构建命令:安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
  15 + commands:
  16 + - npm install && rm -rf ./dist && npm run build
  17 + # 非必填字段,开启后表示将构建产物暂存,但不会上传到制品库中,7天后自动清除
  18 + artifacts:
  19 + # 构建产物名字,作为产物的唯一标识可向下传递,支持自定义,默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
  20 + - name: BUILD_ARTIFACT
  21 + # 构建产物获取路径,是指代码编译完毕之后构建物的所在路径
  22 + path:
  23 + - ./dist
  24 + - step: publish@general_artifacts
  25 + name: publish_general_artifacts
  26 + displayName: 上传制品
  27 + # 上游构建任务定义的产物名,默认BUILD_ARTIFACT
  28 + dependArtifact: BUILD_ARTIFACT
  29 + # 上传到制品库时的制品命名,默认output
  30 + artifactName: output
  31 + dependsOn: build_nodejs
  32 + - stage:
  33 + name: release
  34 + displayName: 发布
  35 + steps:
  36 + - step: publish@release_artifacts
  37 + name: publish_release_artifacts
  38 + displayName: '发布'
  39 + # 上游上传制品任务的产出
  40 + dependArtifact: output
  41 + # 发布制品版本号
  42 + version: '1.0.0.0'
  43 + # 是否开启版本号自增,默认开启
  44 + autoIncrement: true
  45 +triggers:
  46 + push:
  47 + branches:
  48 + include:
  49 + - master
  1 +version: '1.0'
  2 +name: pr-pipeline
  3 +displayName: PRPipeline
  4 +stages:
  5 + - stage:
  6 + name: compile
  7 + displayName: 编译
  8 + steps:
  9 + - step: build@nodejs
  10 + name: build_nodejs
  11 + displayName: Nodejs 构建
  12 + # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
  13 + nodeVersion: 14.16.0
  14 + # 构建命令:安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
  15 + commands:
  16 + - npm install && rm -rf ./dist && npm run build
  17 + # 非必填字段,开启后表示将构建产物暂存,但不会上传到制品库中,7天后自动清除
  18 + artifacts:
  19 + # 构建产物名字,作为产物的唯一标识可向下传递,支持自定义,默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
  20 + - name: BUILD_ARTIFACT
  21 + # 构建产物获取路径,是指代码编译完毕之后构建物的所在路径
  22 + path:
  23 + - ./dist
  24 + - step: publish@general_artifacts
  25 + name: publish_general_artifacts
  26 + displayName: 上传制品
  27 + # 上游构建任务定义的产物名,默认BUILD_ARTIFACT
  28 + dependArtifact: BUILD_ARTIFACT
  29 + # 上传到制品库时的制品命名,默认output
  30 + artifactName: output
  31 + dependsOn: build_nodejs
  32 +triggers:
  33 + pr:
  34 + branches:
  35 + include:
  36 + - master
  1 +/**
  2 + * Get the configuration file variable name
  3 + * @param env
  4 + */
  5 +export const getConfigFileName = (env: Record<string, any>) => {
  6 + return `__PRODUCTION__${env.VITE_GLOB_APP_SHORT_NAME || '__APP'}__CONF__`
  7 + .toUpperCase()
  8 + .replace(/\s/g, '');
  9 +};
1 <template> 1 <template>
2 - <n-dropdown trigger="hover" @select="handleSelect" :show-arrow="true" :options="options"> 2 + <n-dropdown
  3 + trigger="hover"
  4 + @select="handleSelect"
  5 + :show-arrow="true"
  6 + :options="options"
  7 + >
3 <div class="user-info-box"> 8 <div class="user-info-box">
4 <person-icon v-if="fallback"></person-icon> 9 <person-icon v-if="fallback"></person-icon>
5 - <n-avatar v-if="!fallback" round object-fit="cover" size="medium" :src="Person" @error="errorHandle"></n-avatar> 10 + <n-avatar
  11 + v-if="!fallback"
  12 + round
  13 + object-fit="cover"
  14 + size="medium"
  15 + :src="Person"
  16 + @error="errorHandle"
  17 + ></n-avatar>
6 </div> 18 </div>
7 </n-dropdown> 19 </n-dropdown>
8 20
@@ -12,7 +12,8 @@ export enum DragKeyEnum { @@ -12,7 +12,8 @@ export enum DragKeyEnum {
12 // 不同页面保存操作 12 // 不同页面保存操作
13 export enum SavePageEnum { 13 export enum SavePageEnum {
14 CHART = 'SaveChart', 14 CHART = 'SaveChart',
15 - JSON = 'SaveJSON' 15 + JSON = 'SaveJSON',
  16 + CLOSE = 'close'
16 } 17 }
17 18
18 // 操作枚举 19 // 操作枚举
@@ -43,8 +43,9 @@ watch( @@ -43,8 +43,9 @@ watch(
43 () => chartEditStore.getEditCanvasConfig.chartThemeColor, 43 () => chartEditStore.getEditCanvasConfig.chartThemeColor,
44 (newColor: keyof typeof chartColorsSearch) => { 44 (newColor: keyof typeof chartColorsSearch) => {
45 try { 45 try {
46 - if (!isPreview()) {  
47 - const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme] 46 + if (!isPreview()) {
  47 + const themeColor =
  48 + colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
48 colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[defaultTheme] 49 colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[defaultTheme]
49 props.chartConfig.option.series.forEach((value: any, index: number) => { 50 props.chartConfig.option.series.forEach((value: any, index: number) => {
50 value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [ 51 value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [
@@ -10,7 +10,7 @@ import { @@ -10,7 +10,7 @@ import {
10 RequestParamsObjType 10 RequestParamsObjType
11 } from '@/enums/httpEnum' 11 } from '@/enums/httpEnum'
12 import { PreviewScaleEnum } from '@/enums/styleEnum' 12 import { PreviewScaleEnum } from '@/enums/styleEnum'
13 -import type { ChartColorsNameType, GlobalThemeJsonType } from '@/settings/chartThemes/index' 13 +import type { ChartColorsNameType, CustomColorsType, GlobalThemeJsonType } from '@/settings/chartThemes/index'
14 14
15 // 编辑画布属性 15 // 编辑画布属性
16 export enum EditCanvasTypeEnum { 16 export enum EditCanvasTypeEnum {
@@ -901,7 +901,7 @@ export const useChartEditStore = defineStore({ @@ -901,7 +901,7 @@ export const useChartEditStore = defineStore({
901 } 901 }
902 }, 902 },
903 // * 显示 903 // * 显示
904 - setShow(isHistory = true) { 904 + setShow(isHistory: boolean = true) {
905 this.setHide(false, isHistory) 905 this.setHide(false, isHistory)
906 }, 906 },
907 // ---------------- 907 // ----------------
@@ -21,7 +21,7 @@ export const loadAsyncComponent = (loader: AsyncComponentLoader<any>) => @@ -21,7 +21,7 @@ export const loadAsyncComponent = (loader: AsyncComponentLoader<any>) =>
21 loadingComponent: AsyncLoading, 21 loadingComponent: AsyncLoading,
22 delay: 20, 22 delay: 20,
23 }) 23 })
24 - 24 +
25 export const loadSkeletonAsyncComponent = (loader: AsyncComponentLoader<any>) => 25 export const loadSkeletonAsyncComponent = (loader: AsyncComponentLoader<any>) =>
26 defineAsyncComponent({ 26 defineAsyncComponent({
27 loader, 27 loader,
@@ -88,8 +88,10 @@ const { DownloadIcon, ShareIcon, PawIcon, SettingsSharpIcon, CreateIcon } = icon @@ -88,8 +88,10 @@ const { DownloadIcon, ShareIcon, PawIcon, SettingsSharpIcon, CreateIcon } = icon
88 const settingStore = useSettingStore() 88 const settingStore = useSettingStore()
89 const chartEditStore = useChartEditStore() 89 const chartEditStore = useChartEditStore()
90 const routerParamsInfo = useRoute() 90 const routerParamsInfo = useRoute()
  91 +
  92 +/// THINGS_KIT 关闭监听页面失焦数据同步数据
91 // 初始化编辑 JSON 模块 93 // 初始化编辑 JSON 模块
92 -useSyncUpdate() 94 +// useSyncUpdate()
93 95
94 // 鼠标悬停定时器 96 // 鼠标悬停定时器
95 let mouseTime: any = null 97 let mouseTime: any = null
@@ -12,3 +12,5 @@ interface Window { @@ -12,3 +12,5 @@ interface Window {
12 // 编辑 JSON 的存储对象 12 // 编辑 JSON 的存储对象
13 opener: any 13 opener: any
14 } 14 }
  15 +
  16 +declare type Recordable<T = any> = Record<string, T>