From e4affb6d730b45b5f1d4a9784a9bd0d078f6e2d7 Mon Sep 17 00:00:00 2001 From: limengnan <420004014@qq.com> Date: Mon, 23 Jun 2025 14:00:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0gisbi=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=88=E4=B8=8D=E5=8C=85=E5=90=ABsrc?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/manage/DatasetDataManage.java | 6 +++- core/core-frontend/flushbonading/index.js | 13 ++++--- core/core-frontend/index.html | 30 ++++++++-------- core/core-frontend/mobile.html | 24 ++++++------- core/core-frontend/package.json | 12 +++++-- core/core-frontend/prettier.config.js | 35 ++++++++++--------- .../src/fcDesignerPro/index.es.js | 25 +++++++------ core/core-frontend/tsconfig.json | 21 ++++++++--- 8 files changed, 95 insertions(+), 71 deletions(-) diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java index 73c9aa1..ff210b2 100644 --- a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java @@ -1261,7 +1261,11 @@ public Map getFieldsByTableId(Long datasource_id, String tablena for (String[] row : columnRows) { String field = row[0]; 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] : ""; Map fieldInfo = new HashMap<>(); diff --git a/core/core-frontend/flushbonading/index.js b/core/core-frontend/flushbonading/index.js index a72b726..fedc247 100644 --- a/core/core-frontend/flushbonading/index.js +++ b/core/core-frontend/flushbonading/index.js @@ -1,8 +1,6 @@ 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 pkg from '../package.json' with { type: "json" }; const suffix = `${pkg.version}-${pkg.name}` const eleArr = [] @@ -10,7 +8,7 @@ const eleArr = [] function produceTag(obj, name) { eleArr.push({ name, - attributes: obj + attributes: obj, }) } const parserStream = new WritableStream({ @@ -59,7 +57,7 @@ htmlStream.pipe(parserStream).on('finish', () => { const eleArrStr = ${JSON.stringify(eleArr)} const eleArr = eleArrStr const preUrl = getPrefix() - + function produceTag(obj, name) { let element = document.createElement(name) Object.entries(obj).forEach(([key, value]) => { @@ -73,11 +71,12 @@ htmlStream.pipe(parserStream).on('finish', () => { element.setAttribute('crossorigin', '') head.appendChild(element) } - + eleArr.forEach((ele) => { produceTag(ele.attributes, ele.name) }) 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 => { + }) }) diff --git a/core/core-frontend/index.html b/core/core-frontend/index.html index 3d0d3c1..82a8495 100644 --- a/core/core-frontend/index.html +++ b/core/core-frontend/index.html @@ -1,16 +1,16 @@ - - - - - - - - - -
- - - + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/core/core-frontend/mobile.html b/core/core-frontend/mobile.html index d9644bd..ddfd163 100644 --- a/core/core-frontend/mobile.html +++ b/core/core-frontend/mobile.html @@ -1,15 +1,15 @@ - - - - - -
- - - + + + + + + +
+ + + + \ No newline at end of file diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json index ced1a99..834ed0d 100644 --- a/core/core-frontend/package.json +++ b/core/core-frontend/package.json @@ -35,8 +35,9 @@ "cross-env": "^7.0.3", "crypto-js": "^4.1.1", "dayjs": "^1.11.9", + "decimal.js": "^10.5.0", "echarts": "^5.5.1", - "element-plus-secondary": "^0.6.8", + "element-plus-secondary": "^1.0.0", "element-resize-detector": "^1.2.4", "exceljs": "^4.4.0", "file-saver": "^2.0.5", @@ -45,7 +46,7 @@ "html2canvas": "^1.4.1", "js-base64": "^3.7.5", "jsencrypt": "^3.3.2", - "jspdf": "^2.5.1", + "jspdf": "^3.0.1", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "mathjs": "^11.6.0", @@ -120,5 +121,12 @@ "vite-svg-loader": "^5.1.0", "vue-tsc": "^1.0.24", "xss": "^1.0.14" + }, + "overrides": { + "@intlify/message-compiler": "9.14.2", + "@intlify/shared": "9.14.2", + "glob": { + "inflight": "npm:inflight-lru@^1.0.0" + } } } diff --git a/core/core-frontend/prettier.config.js b/core/core-frontend/prettier.config.js index e5a2218..353b0a9 100644 --- a/core/core-frontend/prettier.config.js +++ b/core/core-frontend/prettier.config.js @@ -1,19 +1,20 @@ // prettier的默认配置文件 module.exports = { - // 一行最多 100 字符 - printWidth: 100, - // 使用 2 个空格缩进 - tabWidth: 2, - // 不使用缩进符，而使用空格 - useTabs: false, - // 不尾随分号 - semi: false, - // 使用单引号 - singleQuote: true, - // 多行逗号分割的语法中，最后一行不加逗号 - trailingComma: 'none', - // 单个参数的箭头函数不加括号 x => x - arrowParens: 'avoid', - // 对象大括号内两边是否加空格 { a:0 } - bracketSpacing: true -} + // 一行最多 100 字符 + printWidth: 100, + // 使用 2 个空格缩进 + tabWidth: 2, + // 不使用缩进符，而使用空格 + useTabs: false, + // 不尾随分号 + semi: false, + // 使用单引号 + singleQuote: true, + // 多行逗号分割的语法中，最后一行不加逗号 + trailingComma: 'none', + // 单个参数的箭头函数不加括号 x => x + arrowParens: 'avoid', + // 对象大括号内两边是否加空格 { a:0 } + bracketSpacing: true, + } + \ No newline at end of file diff --git a/core/core-frontend/src/fcDesignerPro/index.es.js b/core/core-frontend/src/fcDesignerPro/index.es.js index cf8760a..3aa350b 100644 --- a/core/core-frontend/src/fcDesignerPro/index.es.js +++ b/core/core-frontend/src/fcDesignerPro/index.es.js @@ -52106,10 +52106,10 @@ var o1 = { exports: {} }; }); /*! ***************************************************************************** Copyright (c) Microsoft Corporation. - + Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 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) { var k = x.css, R = x.media, M = x.sourceMap; - if (R ? y.setAttribute("media", R) : y.removeAttribute("media"), M && typeof btoa < "u" && (k += ` -/*# sourceMappingURL=data:application/json;base64,`.concat(btoa(unescape(encodeURIComponent(JSON.stringify(M)))), " */")), y.styleSheet) + if (R ? y.setAttribute("media", R) : y.removeAttribute("media"), M && typeof btoa < "u" && ((null)), y.styleSheet) y.styleSheet.cssText = k; else { for (; y.firstChild; ) @@ -53638,7 +53637,7 @@ var o1 = { exports: {} }; }); }; }, 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`; }, function(i, r, n) { var a = n(60), s = n(18), u = n(48); @@ -53971,7 +53970,7 @@ var o1 = { exports: {} }; } } }), Z.length) { - E.customAlert(k("\u56FE\u7247\u9A8C\u8BC1\u672A\u901A\u8FC7") + `: + E.customAlert(k("\u56FE\u7247\u9A8C\u8BC1\u672A\u901A\u8FC7") + `: ` + Z.join(` `), "warning"); return; @@ -57659,8 +57658,8 @@ var o1 = { exports: {} }; var B = R.childNodes(); 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]; - k.cmd.do("insertHTML", `"); } else { 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"), tpl: `
- "/>
@@ -58153,7 +58152,7 @@ var o1 = { exports: {} }; Y.push(we); } }), ue.length) { - R.customAlert(P("\u89C6\u9891\u9A8C\u8BC1\u672A\u901A\u8FC7") + `: + R.customAlert(P("\u89C6\u9891\u9A8C\u8BC1\u672A\u901A\u8FC7") + `: ` + ue.join(` `), "warning"); return; diff --git a/core/core-frontend/tsconfig.json b/core/core-frontend/tsconfig.json index 772a436..9e5d380 100644 --- a/core/core-frontend/tsconfig.json +++ b/core/core-frontend/tsconfig.json @@ -16,8 +16,21 @@ "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", + ] +} \ No newline at end of file