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

去掉回车符

Browse Source
This commit is contained in:
limengnan 2025-03-13 18:40:31 +08:00
parent f2c841e50b
commit 3e323c06f3
11 changed files with 8314 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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,6 +79,5 @@ 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 => {})
})
}) })

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

@ -1,16 +1,14 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title></title>
</head>
<head> <body>
<meta charset="UTF-8" /> <div id="app"></div>
<link rel="icon" type="image/svg+xml" /> <script type="module" src="/src/pages/index/main.ts"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> </body>
<title></title> </html>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/pages/index/main.ts"></script>
</body>
</html>

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

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

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

@ -1,20 +1,19 @@
// prettier的默认配置文件 // prettier的默认配置文件
module.exports = { module.exports = {
// 一行最多 100 字符 // 一行最多 100 字符
printWidth: 100, printWidth: 100,
// 使用 2 个空格缩进 // 使用 2 个空格缩进
tabWidth: 2, tabWidth: 2,
// 不使用缩进符，而使用空格 // 不使用缩进符，而使用空格
useTabs: false, useTabs: false,
// 不尾随分号 // 不尾随分号
semi: false, semi: false,
// 使用单引号 // 使用单引号
singleQuote: true, singleQuote: true,
// 多行逗号分割的语法中，最后一行不加逗号 // 多行逗号分割的语法中，最后一行不加逗号
trailingComma: 'none', trailingComma: 'none',
// 单个参数的箭头函数不加括号 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 () => request.get({ url: '/aiBase/findTargetUrl' }) export const findBaseParams = async () => null

34
core/core-frontend/src/style/mixin.less
View File

@ -1,19 +1,19 @@
.border-bottom-tab(@width) { .border-bottom-tab(@width) {
margin-left: @width; margin-left: @width;
:deep(.ed-tabs__header::before), :deep(.ed-tabs__header::before),
:deep(.ed-tabs__header::after) { :deep(.ed-tabs__header::after) {
content: ''; content: '';
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: @width; width: @width;
height: 1px; height: 1px;
background-color: rgba(31, 35, 41, 0.15); background-color: rgba(31, 35, 41, 0.15);
} }
:deep(.ed-tabs__header::before) { :deep(.ed-tabs__header::before) {
left: -@width; left: -@width;
} }
:deep(.ed-tabs__header::after) { :deep(.ed-tabs__header::after) {
right: -@width; right: -@width;
} }
} }

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

@ -4,15 +4,14 @@
@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;
@chart-change-font-color-light: #646A73; @dv-canvas-main-font-color: #ebebeb;
@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,7 +401,8 @@ export function getCustomTheme(chart: Chart): S2Theme {
}, },
dataCell: { dataCell: {
cell: { cell: {
crossBackgroundColor: enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor, crossBackgroundColor:
enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor,
backgroundColor: tableItemBgColor backgroundColor: tableItemBgColor
}, },
bolderText: { bolderText: {
@ -603,7 +604,10 @@ 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 = chart.type === 'table-info' ? tableCell.enableTableCrossBG && !tableCell.mergeCells : tableCell.enableTableCrossBG const 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)

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

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

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

File diff suppressed because it is too large Load Diff