Merge remote-tracking branch 'origin/main'

2025-06-23 14:24:31 +08:00 · 2025-06-23 14:24:31 +08:00 · becb5e8be9
commit becb5e8be9
parent f2007f0d6f e4affb6d73
8 changed files with 95 additions and 71 deletions
--- 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<String, Object> 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<String, Object> fieldInfo = new HashMap<>();
--- 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({
@ -79,5 +77,6 @@ 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 => {
+  })
 })
--- a/core/core-frontend/index.html
+++ b/core/core-frontend/index.html
@ -1,16 +1,16 @@
 <!DOCTYPE html>
-<html lang="en">
-  <head>
+<html lang="en" style="overflow-x: hidden">
+
+<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>
-  <script 
-  src="https://webapi.amap.com/maps?v=2.0&key=YOUR_KEY&plugin=AMap.TileLayer.Satellite">
-</script>
-  <body>
+</head>
+
+<body>
  <div id="app"></div>
  <script type="module" src="/src/pages/index/main.ts"></script>
-  </body>
+</body>
+
 </html>
--- a/core/core-frontend/mobile.html
+++ b/core/core-frontend/mobile.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"
-    />
-  </head>

-  <body>
+<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>
  <div id="app"></div>
  <script type="module" src="/src/pages/mobile/main.ts"></script>
-  </body>
+</body>
+
 </html>
--- 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"
+    }
  }
 }
--- a/core/core-frontend/prettier.config.js
+++ b/core/core-frontend/prettier.config.js
@ -15,5 +15,6 @@ module.exports = {
     // 单个参数的箭头函数不加括号 x => x
    arrowParens: 'avoid',     
    // 对象大括号内两边是否加空格 { a:0 }
-  bracketSpacing: true
-}
+    bracketSpacing: true,      
+  }
+  
--- a/core/core-frontend/src/fcDesignerPro/index.es.js
+++ b/core/core-frontend/src/fcDesignerPro/index.es.js
@ -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; )
--- 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",
+  ]
 }