diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 1e3ee94f..2d707f45 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.420", + "platform-core": "8.1.421", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/io.sc.engine.rule.frontend/src/views/shared/ProcessorManager.ts b/io.sc.engine.rule.frontend/src/views/shared/ProcessorManager.ts index c3475b66..e63a88d9 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/ProcessorManager.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/ProcessorManager.ts @@ -143,8 +143,7 @@ class ProcessorManager { } public afterEditorOpen(args: any): void { - //const type = args.grid.getEditorForm().getFieldValue('type'); - const type = 'OPTION_VALUE'; + const type = args.grid.getEditorForm().getFieldValue('type'); if (this.processors[type]) { this.processors[type].afterEditorOpen(args); } diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts index bdb2d2bc..25e33ebb 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts @@ -47,7 +47,7 @@ class ConditionRange extends Processor { dbClickOperation: 'edit', autoFetchData: false, denseBody: true, - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts index 649daeab..53611c98 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts @@ -60,7 +60,7 @@ class DecisionTable extends Processor { selectedMode: 'cell', autoFetchData: false, denseBody: true, - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, @@ -165,7 +165,7 @@ class DecisionTable extends Processor { }, ], 'separator', - 'rowEdit', + 'edit', 'separator', { name: 'example', diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable2c.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable2c.ts index 1993f0a3..266d3382 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable2c.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable2c.ts @@ -49,12 +49,13 @@ class DecisionTable2C extends Processor { return 'DECISION_TABLE_2C' === args.form.getFieldValue('type'); }, type: 'w-grid', + localMode: true, height: 300, dbClickOperation: 'edit', selectedMode: 'cell', autoFetchData: false, denseBody: true, - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, @@ -141,7 +142,7 @@ class DecisionTable2C extends Processor { }, ], 'separator', - 'rowEdit', + 'edit', 'separator', { name: 'example', diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/NumberRange.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/NumberRange.ts index 3a9dc1bd..5defdcfa 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/NumberRange.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/NumberRange.ts @@ -68,7 +68,7 @@ class NumberRange extends Processor { dbClickOperation: 'edit', autoFetchData: false, denseBody: true, - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts index 918b070b..fafe3006 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts @@ -68,7 +68,7 @@ class ObjectProperties extends Processor { autoFetchData: false, dbClickOperation: 'edit', dense: true, - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts index ff2f8cc7..0e64618f 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts @@ -62,7 +62,7 @@ class ScoreCard extends Processor { dbClickOperation: 'edit', autoFetchData: false, denseBody: true, - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts index 9d365d21..e7b98af3 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts @@ -77,7 +77,7 @@ class Sql extends Processor { autoFetchData: false, dense: true, dbClickOperation: 'edit', - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, @@ -191,7 +191,7 @@ class Sql extends Processor { autoFetchData: false, title: $t('re.resources.designer.processor.grid.entity.sqlQueryResult'), dense: true, - draggable: 'local', + dndMode: 'local', pageable: false, checkboxSelection: false, configButton: false, @@ -242,7 +242,7 @@ class Sql extends Processor { title: $t('re.resources.designer.processor.grid.entity.sqlFieldMapping'), dense: true, dbClickOperation: 'edit', - draggable: 'local', + dndMode: 'local', pageable: false, configButton: false, toolbarConfigure: { noIcon: false }, diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 22f222a5..b0e065a8 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.420", + "version": "8.1.421", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index afbb402b..823c80c3 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.420", + "version": "8.1.421", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -110,7 +110,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.2", "pinia": "2.2.2", - "platform-core": "8.1.420", + "platform-core": "8.1.421", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "vue": "3.5.10", diff --git a/io.sc.platform.system.frontend/src/views/menu/Menu.vue b/io.sc.platform.system.frontend/src/views/menu/Menu.vue index 987535f7..2123a7fb 100644 --- a/io.sc.platform.system.frontend/src/views/menu/Menu.vue +++ b/io.sc.platform.system.frontend/src/views/menu/Menu.vue @@ -9,7 +9,7 @@ selection="multiple" :checkbox-selection="true" :tree="true" - :draggable="true" + dndMode="server" :tree-icon=" (row) => { if (row.type === 'SEPARATOR') {