去掉回车符
This commit is contained in:
parent
f2c841e50b
commit
3e323c06f3
@ -2,13 +2,13 @@ export default {
|
||||
server: {
|
||||
proxy: {
|
||||
'/api/f': {
|
||||
target: 'http://localhost:8100',
|
||||
target: 'http://192.168.1.16:8100',
|
||||
changeOrigin: true,
|
||||
rewrite: path => path.replace(/^\/api\/f/, '')
|
||||
},
|
||||
// 使用 proxy 实例
|
||||
'/api': {
|
||||
target: 'http://localhost:8105',
|
||||
target: 'http://192.168.1.16:8100',
|
||||
changeOrigin: true,
|
||||
rewrite: path => path.replace(/^\/api/, '')
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import { WritableStream } from 'htmlparser2/lib/WritableStream'
|
||||
import fs from 'node:fs'
|
||||
import { createRequire } from 'module';
|
||||
const require = createRequire(import.meta.url);
|
||||
const pkg = require('../package.json');
|
||||
import { createRequire } from 'module'
|
||||
const require = createRequire(import.meta.url)
|
||||
const pkg = require('../package.json')
|
||||
const suffix = `${pkg.version}-${pkg.name}`
|
||||
|
||||
const eleArr = []
|
||||
@ -10,7 +10,7 @@ const eleArr = []
|
||||
function produceTag(obj, name) {
|
||||
eleArr.push({
|
||||
name,
|
||||
attributes: obj,
|
||||
attributes: obj
|
||||
})
|
||||
}
|
||||
const parserStream = new WritableStream({
|
||||
@ -79,6 +79,5 @@ htmlStream.pipe(parserStream).on('finish', () => {
|
||||
})
|
||||
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 => {})
|
||||
})
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" />
|
||||
@ -12,5 +11,4 @@
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/pages/index/main.ts"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@ -1,15 +1,15 @@
|
||||
<!DOCTYPE html>
|
||||
<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" />
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover"
|
||||
/>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/pages/mobile/main.ts"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@ -15,6 +15,5 @@ module.exports = {
|
||||
// 单个参数的箭头函数不加括号 x => x
|
||||
arrowParens: 'avoid',
|
||||
// 对象大括号内两边是否加空格 { a:0 }
|
||||
bracketSpacing: true,
|
||||
bracketSpacing: true
|
||||
}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
import request from '@/config/axios'
|
||||
|
||||
export const findBaseParams = async () => request.get({ url: '/aiBase/findTargetUrl' })
|
||||
export const findBaseParams = async () => null
|
||||
|
||||
@ -4,15 +4,14 @@
|
||||
@side-area-background: #1a1a1a;
|
||||
@side-outline-border-color: #363636;
|
||||
@side-content-background: #292929;
|
||||
@canvas-main-font-color: #646A73;
|
||||
@canvas-main-font-color-dark: #A6A6A6;
|
||||
@canvas-main-font-color: #646a73;
|
||||
@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-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);
|
||||
|
||||
@ -401,7 +401,8 @@ export function getCustomTheme(chart: Chart): S2Theme {
|
||||
},
|
||||
dataCell: {
|
||||
cell: {
|
||||
crossBackgroundColor: enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor,
|
||||
crossBackgroundColor:
|
||||
enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor,
|
||||
backgroundColor: tableItemBgColor
|
||||
},
|
||||
bolderText: {
|
||||
@ -603,7 +604,10 @@ export function getConditions(chart: Chart) {
|
||||
if (conditions?.length > 0) {
|
||||
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)
|
||||
? tableCell.tableFontColor
|
||||
: hexColorToRGBA(tableCell.tableFontColor, basicStyle.alpha)
|
||||
|
||||
@ -16,21 +16,8 @@
|
||||
"paths": {
|
||||
"@/*": ["./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"
|
||||
],
|
||||
"exclude": [
|
||||
"dist",
|
||||
"lib",
|
||||
"node_modules",
|
||||
]
|
||||
"include": ["src/**/*", "electron-main/**/*.ts", "types/**/*.d.ts", "types"],
|
||||
"exclude": ["dist", "lib", "node_modules"]
|
||||
}
|
||||
8232
core/core-frontend/yarn.lock
Normal file
8232
core/core-frontend/yarn.lock
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user