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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
root 2025-06-23 14:24:31 +08:00
commit becb5e8be9
8 changed files with 95 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java
View File

@ -1261,7 +1261,11 @@ public Map<String, Object> getFieldsByTableId(Long datasource_id, String tablena
for (String[] row : columnRows) { for (String[] row : columnRows) {
String field = row[0]; String field = row[0];
String type = row[1]; String type = row[1];
int size = ObjectUtils.isNotEmpty(row[2])?Integer.parseInt(row[2]):0; int size = 0 ;
if(!"longtext".equals(type)){
size = ObjectUtils.isNotEmpty(row[2])?Integer.parseInt(row[2]):0;
}
String comment = row.length > 3 ? row[3] : ""; String comment = row.length > 3 ? row[3] : "";
Map<String, Object> fieldInfo = new HashMap<>(); Map<String, Object> fieldInfo = new HashMap<>();

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

@ -1,8 +1,6 @@
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 pkg from '../package.json' with { type: "json" };
const require = createRequire(import.meta.url)
const pkg = require('../package.json')
const suffix = `${pkg.version}-${pkg.name}` const suffix = `${pkg.version}-${pkg.name}`
const eleArr = [] const eleArr = []
@ -10,7 +8,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({
@ -59,7 +57,7 @@ htmlStream.pipe(parserStream).on('finish', () => {
const eleArrStr = ${JSON.stringify(eleArr)} const eleArrStr = ${JSON.stringify(eleArr)}
const eleArr = eleArrStr const eleArr = eleArrStr
const preUrl = getPrefix() const preUrl = getPrefix()
function produceTag(obj, name) { function produceTag(obj, name) {
let element = document.createElement(name) let element = document.createElement(name)
Object.entries(obj).forEach(([key, value]) => { Object.entries(obj).forEach(([key, value]) => {
@ -73,11 +71,12 @@ htmlStream.pipe(parserStream).on('finish', () => {
element.setAttribute('crossorigin', '') element.setAttribute('crossorigin', '')
head.appendChild(element) head.appendChild(element)
} }
eleArr.forEach((ele) => { eleArr.forEach((ele) => {
produceTag(ele.attributes, ele.name) produceTag(ele.attributes, ele.name)
}) })
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 => {
})
}) })

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

@ -1,16 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en" style="overflow-x: hidden">
<head>
<meta charset="UTF-8" /> <head>
<link rel="icon" type="image/svg+xml" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <link rel="icon" type="image/svg+xml" />
<title></title> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head> <title></title>
<script </head>
src="https://webapi.amap.com/maps?v=2.0&key=YOUR_KEY&plugin=AMap.TileLayer.Satellite">
</script> <body>
<body> <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>

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>
<body> <head>
<div id="app"></div> <meta charset="UTF-8" />
<script type="module" src="/src/pages/mobile/main.ts"></script> <meta name="viewport"
</body> content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" />
</html> </head>
<body>
<div id="app"></div>
<script type="module" src="/src/pages/mobile/main.ts"></script>
</body>
</html>

12
core/core-frontend/package.json
View File

@ -35,8 +35,9 @@
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"dayjs": "^1.11.9", "dayjs": "^1.11.9",
"decimal.js": "^10.5.0",
"echarts": "^5.5.1", "echarts": "^5.5.1",
"element-plus-secondary": "^0.6.8", "element-plus-secondary": "^1.0.0",
"element-resize-detector": "^1.2.4", "element-resize-detector": "^1.2.4",
"exceljs": "^4.4.0", "exceljs": "^4.4.0",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
@ -45,7 +46,7 @@
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",
"js-base64": "^3.7.5", "js-base64": "^3.7.5",
"jsencrypt": "^3.3.2", "jsencrypt": "^3.3.2",
"jspdf": "^2.5.1", "jspdf": "^3.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"mathjs": "^11.6.0", "mathjs": "^11.6.0",
@ -120,5 +121,12 @@
"vite-svg-loader": "^5.1.0", "vite-svg-loader": "^5.1.0",
"vue-tsc": "^1.0.24", "vue-tsc": "^1.0.24",
"xss": "^1.0.14" "xss": "^1.0.14"
},
"overrides": {
"@intlify/message-compiler": "9.14.2",
"@intlify/shared": "9.14.2",
"glob": {
"inflight": "npm:inflight-lru@^1.0.0"
}
} }
} }

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

@ -1,19 +1,20 @@
// 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,
} }

25
core/core-frontend/src/fcDesignerPro/index.es.js
View File

@ -52106,10 +52106,10 @@ var o1 = { exports: {} };
}); });
/*! ***************************************************************************** /*! *****************************************************************************
Copyright (c) Microsoft Corporation. Copyright (c) Microsoft Corporation.
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted. purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
@ -53000,8 +53000,7 @@ var o1 = { exports: {} };
} }
function b(y, E, x) { function b(y, E, x) {
var k = x.css, R = x.media, M = x.sourceMap; var k = x.css, R = x.media, M = x.sourceMap;
if (R ? y.setAttribute("media", R) : y.removeAttribute("media"), M && typeof btoa < "u" && (k += ` if (R ? y.setAttribute("media", R) : y.removeAttribute("media"), M && typeof btoa < "u" && ((null)), y.styleSheet)
/*# sourceMappingURL=data:application/json;base64,`.concat(btoa(unescape(encodeURIComponent(JSON.stringify(M)))), " */")), y.styleSheet)
y.styleSheet.cssText = k; y.styleSheet.cssText = k;
else { else {
for (; y.firstChild; ) for (; y.firstChild; )
@ -53638,7 +53637,7 @@ var o1 = { exports: {} };
}); });
}; };
}, function(i, r) { }, function(i, r) {
i.exports = ` i.exports = `
\v\f\r \xA0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF`; \v\f\r \xA0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF`;
}, function(i, r, n) { }, function(i, r, n) {
var a = n(60), s = n(18), u = n(48); var a = n(60), s = n(18), u = n(48);
@ -53971,7 +53970,7 @@ var o1 = { exports: {} };
} }
} }
}), Z.length) { }), Z.length) {
E.customAlert(k("\u56FE\u7247\u9A8C\u8BC1\u672A\u901A\u8FC7") + `: E.customAlert(k("\u56FE\u7247\u9A8C\u8BC1\u672A\u901A\u8FC7") + `:
` + Z.join(` ` + Z.join(`
`), "warning"); `), "warning");
return; return;
@ -57659,8 +57658,8 @@ var o1 = { exports: {} };
var B = R.childNodes(); var B = R.childNodes();
if ((B == null ? void 0 : B.getNodeName()) === "IMG") { if ((B == null ? void 0 : B.getNodeName()) === "IMG") {
var T = (P = (M = k.selection.getSelectionContainerElem()) === null || M === void 0 ? void 0 : M.children()) === null || P === void 0 ? void 0 : P.elems[0].children[0]; var T = (P = (M = k.selection.getSelectionContainerElem()) === null || M === void 0 ? void 0 : M.children()) === null || P === void 0 ? void 0 : P.elems[0].children[0];
k.cmd.do("insertHTML", `<img k.cmd.do("insertHTML", `<img
src=` + (T == null ? void 0 : T.getAttribute("src")) + ` src=` + (T == null ? void 0 : T.getAttribute("src")) + `
style=` + (T == null ? void 0 : T.getAttribute("style")) + ">"); style=` + (T == null ? void 0 : T.getAttribute("style")) + ">");
} else { } else {
var D, V = R.elems[0], W = V.innerHTML, G = V.parentElement; var D, V = R.elems[0], W = V.innerHTML, G = V.parentElement;
@ -58093,10 +58092,10 @@ var o1 = { exports: {} };
}, { }, {
title: b.i18next.t("menus.panelMenus.video.\u63D2\u5165\u89C6\u9891"), title: b.i18next.t("menus.panelMenus.video.\u63D2\u5165\u89C6\u9891"),
tpl: `<div> tpl: `<div>
<input <input
id="` + y + `" id="` + y + `"
type="text" type="text"
class="block" class="block"
placeholder="` + b.i18next.t("\u5982") + `\uFF1A<iframe src=... ></iframe>"/> placeholder="` + b.i18next.t("\u5982") + `\uFF1A<iframe src=... ></iframe>"/>
</td> </td>
<div class="w-e-button-container"> <div class="w-e-button-container">
@ -58153,7 +58152,7 @@ var o1 = { exports: {} };
Y.push(we); Y.push(we);
} }
}), ue.length) { }), ue.length) {
R.customAlert(P("\u89C6\u9891\u9A8C\u8BC1\u672A\u901A\u8FC7") + `: R.customAlert(P("\u89C6\u9891\u9A8C\u8BC1\u672A\u901A\u8FC7") + `:
` + ue.join(` ` + ue.join(`
`), "warning"); `), "warning");
return; return;

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

@ -16,8 +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",
]
}