+
@@ -69,17 +64,28 @@
diff --git a/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue
index 4b327424..2714219d 100644
--- a/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue
+++ b/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue
@@ -7,7 +7,6 @@
:fetch-data-url="Environment.apiContextPath('api/system/menu/allMenus')"
:tree="true"
db-click-operation="expand"
- dnd-mode="server"
:columns="[
{
name: 'name',
diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/ai/Ai.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/ai/Ai.vue
index ab7628dd..7c165eee 100644
--- a/io.sc.platform.core.frontend/template-project/src/views/testcase/ai/Ai.vue
+++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/ai/Ai.vue
@@ -99,7 +99,7 @@ const doSendMessage = async (message: string) => {
});
// 准备发出请求
- const url = Environment.apiContextPath('/api/ai/ollama/chat');
+ const url = Environment.apiContextPath('/api/ai/chat');
// 设置请求头
const headers = Fetch.buildHeaders();
if (!Fetch.isAuthorization(url)) {
diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties
index f0e57bc1..d3458e1e 100644
--- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties
+++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties
@@ -255,4 +255,5 @@ rowNumber=Row Number
tab=Tab
ai=Artificial Intelligence
aiChat=AI Chat
+thinking=Thinking:
errorOccurred=An Error Occurred
\ No newline at end of file
diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties
index 0c554333..dc503385 100644
--- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties
+++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties
@@ -255,4 +255,5 @@ rowNumber=\u884C\u865F
tab=\u7E2E\u9032
ai=\u4EBA\u5DE5\u667A\u80FD
aiChat=AI \u5C0D\u8A71
+thinking=\u601D\u8003\u4E2D:
errorOccurred=\u767C\u751F\u932F\u8AA4
\ No newline at end of file
diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties
index f4fee608..6d18d546 100644
--- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties
+++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties
@@ -255,4 +255,5 @@ rowNumber=\u884C\u53F7
tab=\u7F29\u8FDB
ai=\u4EBA\u5DE5\u667A\u80FD
aiChat=AI \u5BF9\u8BDD
+thinking=\u601D\u8003\u4E2D:
errorOccurred=\u53D1\u751F\u9519\u8BEF
\ No newline at end of file
diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json
index cea8843b..b66c5d01 100644
--- a/io.sc.platform.developer.doc/package.json
+++ b/io.sc.platform.developer.doc/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.platform.developer.doc",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"main": "index.js",
"scripts": {
@@ -28,7 +28,7 @@
"vuepress": "2.0.0-rc.15"
},
"dependencies": {
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"vue": "3.5.13",
"vue-i18n": "11.0.1"
diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json
index c28b9438..3c1da58a 100644
--- a/io.sc.platform.developer.frontend/package.json
+++ b/io.sc.platform.developer.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.platform.developer.frontend",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.platform.developer.frontend/public/engine.svg b/io.sc.platform.developer.frontend/public/engine.svg
new file mode 100644
index 00000000..306b49f6
--- /dev/null
+++ b/io.sc.platform.developer.frontend/public/engine.svg
@@ -0,0 +1,3 @@
+
diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json
index 298e6638..d2af7f49 100644
--- a/io.sc.platform.lcdp.frontend/package.json
+++ b/io.sc.platform.lcdp.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.platform.lcdp.frontend",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.platform.lcdp.frontend/public/engine.svg b/io.sc.platform.lcdp.frontend/public/engine.svg
new file mode 100644
index 00000000..306b49f6
--- /dev/null
+++ b/io.sc.platform.lcdp.frontend/public/engine.svg
@@ -0,0 +1,3 @@
+
diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json
index 363f5875..ed45c37d 100644
--- a/io.sc.platform.license.keygen.frontend/package.json
+++ b/io.sc.platform.license.keygen.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.platform.license.keygen.frontend",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.platform.license.keygen.frontend/public/engine.svg b/io.sc.platform.license.keygen.frontend/public/engine.svg
new file mode 100644
index 00000000..306b49f6
--- /dev/null
+++ b/io.sc.platform.license.keygen.frontend/public/engine.svg
@@ -0,0 +1,3 @@
+
diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json
index 838bea92..3031dbbf 100644
--- a/io.sc.platform.mvc.frontend/package.json
+++ b/io.sc.platform.mvc.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.platform.mvc.frontend",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.platform.mvc.frontend/public/engine.svg b/io.sc.platform.mvc.frontend/public/engine.svg
new file mode 100644
index 00000000..306b49f6
--- /dev/null
+++ b/io.sc.platform.mvc.frontend/public/engine.svg
@@ -0,0 +1,3 @@
+
diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json
index 7780c17e..cb751ca5 100644
--- a/io.sc.platform.scheduler.manager.frontend/package.json
+++ b/io.sc.platform.scheduler.manager.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.platform.scheduler.manager.frontend",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.platform.scheduler.manager.frontend/public/engine.svg b/io.sc.platform.scheduler.manager.frontend/public/engine.svg
new file mode 100644
index 00000000..306b49f6
--- /dev/null
+++ b/io.sc.platform.scheduler.manager.frontend/public/engine.svg
@@ -0,0 +1,3 @@
+
diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json
index 9aabd06f..e7f29856 100644
--- a/io.sc.platform.system.frontend/package.json
+++ b/io.sc.platform.system.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.platform.system.frontend",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"private": false,
"keywords": [],
@@ -111,7 +111,7 @@
"mockjs": "1.1.0",
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.platform.system.frontend/public/engine.svg b/io.sc.platform.system.frontend/public/engine.svg
new file mode 100644
index 00000000..306b49f6
--- /dev/null
+++ b/io.sc.platform.system.frontend/public/engine.svg
@@ -0,0 +1,3 @@
+
diff --git a/io.sc.platform.util/src/main/java/io/sc/platform/util/TernaryUtil.java b/io.sc.platform.util/src/main/java/io/sc/platform/util/TernaryUtil.java
new file mode 100644
index 00000000..2ef14771
--- /dev/null
+++ b/io.sc.platform.util/src/main/java/io/sc/platform/util/TernaryUtil.java
@@ -0,0 +1,10 @@
+package io.sc.platform.util;
+
+/**
+ * 三元操作辅助类
+ */
+public class TernaryUtil {
+ public static
T nullValue(T value, T nullValue){
+ return value==null?nullValue:value;
+ }
+}
diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json
index 9b8c592b..201101f9 100644
--- a/io.sc.standard.frontend/package.json
+++ b/io.sc.standard.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.standard.frontend",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.48",
+ "platform-core": "8.2.50",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.standard.frontend/public/engine.svg b/io.sc.standard.frontend/public/engine.svg
new file mode 100644
index 00000000..306b49f6
--- /dev/null
+++ b/io.sc.standard.frontend/public/engine.svg
@@ -0,0 +1,3 @@
+
diff --git a/io.sc.website/package.json b/io.sc.website/package.json
index 0c9b5081..3852ea6a 100644
--- a/io.sc.website/package.json
+++ b/io.sc.website/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.website",
- "version": "8.2.10",
+ "version": "8.2.11",
"description": "",
"main": "index.js",
"scripts": {
@@ -28,6 +28,6 @@
},
"dependencies": {
"vue": "3.5.13",
- "platform-core": "8.2.48"
+ "platform-core": "8.2.50"
}
}
\ No newline at end of file