ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ThbTech:69d1074d698b5875bc8cb4f46cc622b65457e1af
Branches Tags
ThbTech:main
..
compare: ThbTech:d67a8df4936ff2be94eb3cfe865918a6e7d0b00f
Branches Tags
ThbTech:main

No commits in common. "69d1074d698b5875bc8cb4f46cc622b65457e1af" and "d67a8df4936ff2be94eb3cfe865918a6e7d0b00f" have entirely different histories.
69d1074d69 ... d67a8df493

11 changed files with 96 additions and 8315 deletions
Show Stats Expand all files Collapse all files

6
core/core-frontend/config/dev.ts
View File

@ -2,15 +2,15 @@ export default {
server: { server: {
proxy: { proxy: {
'/api/f': { '/api/f': {
target: 'http://192.168.1.16:8100', target: 'http://localhost:8100',
changeOrigin: true, changeOrigin: true,
rewrite: path => path.replace(/^\/api\/f/, '') rewrite: path => path.replace(/^\/api\/f/, '')
}, },
// 使用 proxy 实例 // 使用 proxy 实例
'/api': { '/api': {
target: 'http://192.168.1.16:8100', target: 'http://localhost:8105',
changeOrigin: true, changeOrigin: true,
rewrite: path => path.replace(/^\/api/, '') rewrite: path => path.replace(/^\/api/, 'de2api')
} }
}, },
port: 8080 port: 8080

11
core/core-frontend/flushbonading/index.js
View File

@ -1,8 +1,8 @@
import { WritableStream } from 'htmlparser2/lib/WritableStream' import { WritableStream } from 'htmlparser2/lib/WritableStream'
import fs from 'node:fs' import fs from 'node:fs'
import { createRequire } from 'module' import { createRequire } from 'module';
const require = createRequire(import.meta.url) const require = createRequire(import.meta.url);
const pkg = require('../package.json') const pkg = require('../package.json');
const suffix = `${pkg.version}-${pkg.name}` const suffix = `${pkg.version}-${pkg.name}`
const eleArr = [] const eleArr = []
@ -10,7 +10,7 @@ const eleArr = []
function produceTag(obj, name) { function produceTag(obj, name) {
eleArr.push({ eleArr.push({
name, name,
attributes: obj attributes: obj,
}) })
} }
const parserStream = new WritableStream({ const parserStream = new WritableStream({
@ -79,5 +79,6 @@ htmlStream.pipe(parserStream).on('finish', () => {
}) })
document.documentElement.insertBefore(head, document.querySelector('head'))` document.documentElement.insertBefore(head, document.querySelector('head'))`
fs.writeFile(`../dist/js/div_import_${suffix}.js`, templateJs, err => {}) fs.writeFile(`../dist/js/div_import_${suffix}.js`, templateJs, err => {
})
}) })

2
core/core-frontend/index.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" /> <link rel="icon" type="image/svg+xml" />
@ -11,4 +12,5 @@
<div id="app"></div> <div id="app"></div>
<script type="module" src="/src/pages/index/main.ts"></script> <script type="module" src="/src/pages/index/main.ts"></script>
</body> </body>
</html> </html>

8
core/core-frontend/mobile.html
View File

@ -1,15 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta <meta name="viewport"
name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" />
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover"
/>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<script type="module" src="/src/pages/mobile/main.ts"></script> <script type="module" src="/src/pages/mobile/main.ts"></script>
</body> </body>
</html> </html>

3
core/core-frontend/prettier.config.js
View File

@ -15,5 +15,6 @@ module.exports = {
// 单个参数的箭头函数不加括号 x => x // 单个参数的箭头函数不加括号 x => x
arrowParens: 'avoid', arrowParens: 'avoid',
// 对象大括号内两边是否加空格 { a:0 } // 对象大括号内两边是否加空格 { a:0 }
bracketSpacing: true bracketSpacing: true,
} }

2
core/core-frontend/src/api/aiComponent.ts
View File

@ -1,3 +1,3 @@
import request from '@/config/axios' import request from '@/config/axios'
export const findBaseParams = async () => null export const findBaseParams = async () => request.get({ url: '/aiBase/findTargetUrl' })

13
core/core-frontend/src/style/variable.less
View File

@ -4,14 +4,15 @@
@side-area-background: #1a1a1a; @side-area-background: #1a1a1a;
@side-outline-border-color: #363636; @side-outline-border-color: #363636;
@side-content-background: #292929; @side-content-background: #292929;
@canvas-main-font-color: #646a73; @canvas-main-font-color: #646A73;
@canvas-main-font-color-dark: #a6a6a6; @canvas-main-font-color-dark: #A6A6A6;
@side-area-background-light: #ffffff; @side-area-background-light: #FFFFFF;
@side-outline-border-color-light: rgba(31,35,41,0.15); @side-outline-border-color-light: rgba(31,35,41,0.15);
@side-content-background-light: #ffffff; @side-content-background-light: #ffffff;
@canvas-main-font-color-light: #1f2329; @canvas-main-font-color-light: #1F2329;
@chart-change-font-color-light: #646a73;
@dv-canvas-main-font-color: #ebebeb; @chart-change-font-color-light: #646A73;
@dv-canvas-main-font-color: #EBEBEB;
@main-collapse-border-dark: rgba(235, 235, 235, 0.15); @main-collapse-border-dark: rgba(235, 235, 235, 0.15);

8
core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
View File

@ -401,8 +401,7 @@ export function getCustomTheme(chart: Chart): S2Theme {
}, },
dataCell: { dataCell: {
cell: { cell: {
crossBackgroundColor: crossBackgroundColor: enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor,
enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor,
backgroundColor: tableItemBgColor backgroundColor: tableItemBgColor
}, },
bolderText: { bolderText: {
@ -604,10 +603,7 @@ export function getConditions(chart: Chart) {
if (conditions?.length > 0) { if (conditions?.length > 0) {
const { tableCell, basicStyle, tableHeader } = parseJson(chart.customAttr) const { tableCell, basicStyle, tableHeader } = parseJson(chart.customAttr)
// 合并单元格时，班马纹失效 // 合并单元格时，班马纹失效
const enableTableCrossBG = const enableTableCrossBG = chart.type === 'table-info' ? tableCell.enableTableCrossBG && !tableCell.mergeCells : tableCell.enableTableCrossBG
chart.type === 'table-info'
? tableCell.enableTableCrossBG && !tableCell.mergeCells
: tableCell.enableTableCrossBG
const valueColor = isAlphaColor(tableCell.tableFontColor) const valueColor = isAlphaColor(tableCell.tableFontColor)
? tableCell.tableFontColor ? tableCell.tableFontColor
: hexColorToRGBA(tableCell.tableFontColor, basicStyle.alpha) : hexColorToRGBA(tableCell.tableFontColor, basicStyle.alpha)

20
core/core-frontend/tsconfig.json
View File

@ -16,9 +16,21 @@
"paths": { "paths": {
"@/*": ["./src/*"] "@/*": ["./src/*"]
}, },
"types": ["vite/client", "vite-plugin-svg-icons/client", "element-plus-secondary/global"] "types": [
"vite/client",
"vite-plugin-svg-icons/client",
"element-plus-secondary/global"
]
}, },
"include": ["src/**/*", "electron-main/**/*.ts", "types/**/*.d.ts", "types"], "include": [
"exclude": ["dist", "lib", "node_modules"] "src/**/*",
"electron-main/**/*.ts",
"types/**/*.d.ts",
"types"
],
"exclude": [
"dist",
"lib",
"node_modules"
]
} }

8232
core/core-frontend/yarn.lock
View File

File diff suppressed because it is too large Load Diff