diff --git a/.gitmodules b/.gitmodules index fdb033d..ccddf1b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ [submodule "bj-rtss-message"] path = bj-rtss-message url = ../bj-rtss-message.git -[submodule "graphic-pixi"] - path = graphic-pixi - url = ../../jl-framework/graphic-pixi.git - branch = bj-rtss diff --git a/bj-rtss-message b/bj-rtss-message index 9c1d888..b68103f 160000 --- a/bj-rtss-message +++ b/bj-rtss-message @@ -1 +1 @@ -Subproject commit 9c1d8889e2b0fdcc3f931259a8d2ebc2952285a4 +Subproject commit b68103fcf0d9a505a605675b8cebb6ca1bf5c533 diff --git a/graphic-pixi b/graphic-pixi deleted file mode 160000 index 1db5125..0000000 --- a/graphic-pixi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1db512545467327f783f5e05bd3a1da654355ba2 diff --git a/package.json b/package.json index 0d4f28c..178fde5 100644 --- a/package.json +++ b/package.json @@ -17,19 +17,14 @@ "sync": "node scripts/sync.cjs" }, "dependencies": { - "@pixi/filter-outline": "^5.2.0", - "@pixi/graphics-extras": "^7.2.4", "@quasar/extras": "^1.0.0", - "@stomp/stompjs": "^7.0.0", "axios": "^1.2.1", "default-passive-events": "^2.0.0", "echarts": "^5.4.3", "google-protobuf": "^3.21.2", + "jl-graphic": "git+ssh://git.code.tencent.com:jl-framework/graphic-pixi.git", "js-base64": "^3.7.5", - "mqtt": "^5.2.1", "pinia": "^2.0.11", - "pixi-viewport": "^5.0.1", - "pixi.js": "^7.2.4", "quasar": "^2.6.0", "vue": "^3.0.0", "vue-router": "^4.0.0" diff --git a/scripts/sync.cjs b/scripts/sync.cjs deleted file mode 100644 index a8fc918..0000000 --- a/scripts/sync.cjs +++ /dev/null @@ -1,70 +0,0 @@ -/** - * 同步图形框架文件到 src/jl-graphic/ - */ -const { - readdirSync, - existsSync, - copyFileSync, - mkdirSync, - rmSync, -} = require('fs'); -const { resolve } = require('path'); - -const jlGraphicSrcPath = resolve(__dirname, '../graphic-pixi/src/jlgraphic'); -const jlGraphicLibPath = resolve(__dirname, '../src/jl-graphic'); - -/** - * 检查并初始化当前项目引入的jl-graphic库 - */ -function checkAndInitJlGraphicLib() { - const exist = existsSync(jlGraphicLibPath); - if (exist) { - console.log('jl-graphic文件夹已存在,清空'); - readdirSync(jlGraphicLibPath, { - withFileTypes: true, - }).forEach((file) => { - if (file.isDirectory()) { - rmSync(resolve(jlGraphicLibPath, file.name), { recursive: true }); - } else { - rmSync(resolve(jlGraphicLibPath, file.name)); - } - }); - } else { - console.log('jl-graphic文件夹不存在,创建'); - // 文件夹不存在,创建 - mkdirSync(jlGraphicLibPath); - } -} - -function copyJlGraphicFiles() { - readdirSync(jlGraphicSrcPath, { - withFileTypes: true, - }).forEach((file) => { - recursiveCopyFiles(file); - }); -} - -function recursiveCopyFiles(file, path = []) { - if (file.isFile()) { - const fileSrcPath = resolve(jlGraphicSrcPath, ...path, file.name); - const fileDestPath = resolve(jlGraphicLibPath, ...path, file.name); - console.log(`copy file ${fileSrcPath} -> ${fileDestPath}`); - copyFileSync(fileSrcPath, fileDestPath); - } else if (file.isDirectory()) { - const srcDir = resolve(jlGraphicSrcPath, ...path, file.name); - const dirPath = resolve(jlGraphicLibPath, ...path, file.name); - mkdirSync(dirPath); - readdirSync(srcDir, { - withFileTypes: true, - }).forEach((subFile) => { - recursiveCopyFiles(subFile, [...path, file.name]); - }); - } -} - -function main() { - checkAndInitJlGraphicLib(); - copyJlGraphicFiles(); -} - -main(); diff --git a/src/components/DrawAppFormUtils.ts b/src/components/DrawAppFormUtils.ts index be1a9ca..33f13eb 100644 --- a/src/components/DrawAppFormUtils.ts +++ b/src/components/DrawAppFormUtils.ts @@ -1,5 +1,5 @@ import { type GraphicDataBase } from 'src/drawApp/graphics/GraphicDataBase'; -import { IDrawApp } from 'src/jl-graphic'; +import { IDrawApp } from 'jl-graphic'; import { onMounted, onUnmounted, reactive, toRaw } from 'vue'; export function useFormData( diff --git a/src/components/common/SelectConfigUtils.vue b/src/components/common/SelectConfigUtils.vue index e5e0166..1c1ada4 100644 --- a/src/components/common/SelectConfigUtils.vue +++ b/src/components/common/SelectConfigUtils.vue @@ -64,7 +64,7 @@