';
+ return str;
+ }
+ return '';
+ } else if ('CONDITION_RANGE' === type) {
+ const objs = Tools.json2Object(row.conditionRange);
+ if (objs) {
+ let str = `
`;
+ str += `
`;
+ for (let i = 0; i < objs.length; i++) {
+ const obj = objs[i];
+ str += '';
+ str += ' | ' + PlaceHolder.replace(obj.condition) + ' | ';
+ str += ' ' + ('' + PlaceHolder.replace(obj.value)) + ' | ';
str += '
';
}
str += '
';
@@ -256,13 +302,21 @@
return str;
}
return '';
+ } else if ('PMML' === type) {
+ return {
+ componentType: 'w-code-mirror',
+ bindModelValue: true,
+ attrs: {
+ rows: 3,
+ },
+ };
}
},
},
]"
:editor="{
dialog: {
- width: '600px',
+ width: '800px',
},
form: {
colsNum: 1,
@@ -271,8 +325,8 @@
{ name: 'id', label: $t('id'), type: 'text', hidden: true },
{ name: 'order', label: $t('order'), type: 'number', hidden: true },
{ name: 'type', label: $t('type'), type: 'text', hidden: true },
- { name: 'description', label: $t('description'), type: 'text' },
- { name: 'enable', label: $t('enable'), type: 'checkbox', defaultValue: true },
+ { name: 'description', label: $t('description'), type: 'text', hidden: true },
+ { name: 'enable', label: $t('enable'), type: 'checkbox', defaultValue: true, hidden: true },
{
name: 'optionCode',
label: $t('re.resources.designer.processor.grid.entity.optionCode'),
@@ -288,6 +342,8 @@
type: 'code-mirror',
lang: 'java',
rows: 5,
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: autoCompletionOptionsRef,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
@@ -300,7 +356,8 @@
type: 'code-mirror',
lang: 'java',
rows: 1,
- height: '32px',
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: autoCompletionOptionsRef,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
@@ -313,7 +370,8 @@
type: 'code-mirror',
lang: 'java',
rows: 1,
- height: '32px',
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: autoCompletionOptionsRef,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
@@ -326,7 +384,8 @@
type: 'code-mirror',
lang: 'java',
rows: 1,
- height: '32px',
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: autoCompletionOptionsRef,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
@@ -339,7 +398,8 @@
type: 'code-mirror',
lang: 'java',
rows: 1,
- height: '32px',
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: autoCompletionOptionsRef,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
@@ -352,7 +412,8 @@
type: 'code-mirror',
lang: 'java',
rows: 1,
- height: '32px',
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: autoCompletionOptionsRef,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
@@ -370,45 +431,232 @@
{
name: 'numberRangeVar',
label: $t('re.resources.designer.processor.grid.entity.numberRangeVar'),
+ showIf: (arg) => {
+ return 'NUMBER_RANGE' === arg.form.getFieldValue('type');
+ },
type: 'code-mirror',
lang: 'java',
rows: 1,
- height: '32px',
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: autoCompletionOptionsRef,
extAutoCompletionOptions: GroovyFunctions,
- showIf: (arg) => {
- return 'NUMBER_RANGE' === arg.form.getFieldValue('type');
- },
},
{
name: 'numberRange',
label: $t('re.resources.designer.processor.grid.entity.numberRange'),
+ showIf: (arg) => {
+ return 'NUMBER_RANGE' === arg.form.getFieldValue('type');
+ },
type: 'w-grid',
height: 300,
+ denseBody: true,
+ draggable: true,
pageable: false,
configButton: false,
toolbarConfigure: { noIcon: false },
- toolbarActions: ['add', 'clone', 'remove'],
+ toolbarActions: [
+ 'add',
+ 'clone',
+ 'edit',
+ {
+ extend: 'remove',
+ click: (arg) => {
+ const grid = gridRef.getEditorForm().getFieldComponent('numberRange');
+ grid.removeRows(arg.selecteds);
+ },
+ },
+ 'separator',
+ {
+ name: 'example',
+ label: $t('example'),
+ icon: 'bi-balloon',
+ click: (arg) => {
+ const grid = gridRef.getEditorForm().getFieldComponent('numberRange');
+ const sampleData = [
+ { uuid: Tools.uuid(), minIncluded: false, min: null, max: 0, maxIncluded: false, value: 1 },
+ { uuid: Tools.uuid(), minIncluded: true, min: 0, max: 1, maxIncluded: false, value: 2 },
+ { uuid: Tools.uuid(), minIncluded: true, min: 1, max: 2, maxIncluded: false, value: 3 },
+ { uuid: Tools.uuid(), minIncluded: true, min: 2, max: 3, maxIncluded: false, value: 4 },
+ { uuid: Tools.uuid(), minIncluded: true, min: 3, max: null, maxIncluded: false, value: 5 },
+ { uuid: Tools.uuid(), minIncluded: false, min: null, max: null, maxIncluded: false, value: 0 },
+ ];
+ grid.setLocalData(sampleData);
+ },
+ },
+ ],
+ primaryKey: 'uuid',
columns: [
{ width: 200, name: 'uuid', label: 'uuid', hidden: true },
- { width: 60, name: 'minIncluded', label: $t('include') },
- { width: 100, name: 'min', label: $t('minValue'), align: 'center' },
- { width: 100, name: 'max', label: $t('maxValue'), align: 'center' },
- { width: 60, name: 'maxIncluded', label: $t('include'), type: 'boolean' },
- { width: '100%', name: 'value', label: $t('value') },
+ {
+ width: 60,
+ name: 'minIncluded',
+ label: $t('include'),
+ align: 'center',
+ sortable: false,
+ format: (value) => {
+ if (value) {
+ return '[';
+ } else {
+ return '(';
+ }
+ },
+ },
+ { width: 100, name: 'min', label: $t('minValue'), align: 'right', sortable: false },
+ { width: 100, name: 'max', label: $t('maxValue'), align: 'right', sortable: false },
+ {
+ width: 60,
+ name: 'maxIncluded',
+ label: $t('include'),
+ align: 'center',
+ sortable: false,
+ format: (value) => {
+ if (value) {
+ return '[';
+ } else {
+ return ')';
+ }
+ },
+ },
+ { width: '100%', name: 'value', label: $t('value'), sortable: false },
],
- showIf: (arg) => {
- return 'NUMBER_RANGE' === arg.form.getFieldValue('type');
+ editor: {
+ dialog: {
+ width: '600px',
+ },
+ form: {
+ colsNum: 4,
+ fields: [
+ { name: 'uuid', label: 'uuid', hidden: true, colSpan: 4 },
+ { name: 'min', label: $t('minValue'), type: 'text', colSpan: 3 },
+ { name: 'minIncluded', label: $t('include'), type: 'checkbox' },
+ { name: 'max', label: $t('maxValue'), type: 'text', colSpan: 3 },
+ { name: 'maxIncluded', label: $t('include'), type: 'checkbox' },
+ { name: 'value', label: $t('value'), type: 'number', colSpan: 3 },
+ ],
+ },
+ },
+ onBeforeEditorDataSubmit: (data, callback) => {
+ const grid = gridRef.getEditorForm().getFieldComponent('numberRange');
+ const form = grid.getEditorForm();
+ if ('add' == form.getStatus() || 'clone' == form.getStatus()) {
+ data.uuid = Tools.uuid();
+ grid.addRow(data);
+ callback(false);
+ } else if ('edit' == form.getStatus()) {
+ grid.replaceRow(data);
+ callback(false);
+ }
},
},
{
name: 'conditionRange',
label: $t('re.resources.designer.processor.grid.entity.conditionRange'),
- type: 'code-mirror',
- rows: 1,
showIf: (arg) => {
return 'CONDITION_RANGE' === arg.form.getFieldValue('type');
},
+ type: 'w-grid',
+ height: 300,
+ denseBody: true,
+ draggable: true,
+ pageable: false,
+ configButton: false,
+ toolbarConfigure: { noIcon: false },
+ toolbarActions: [
+ 'add',
+ 'clone',
+ 'edit',
+ {
+ extend: 'remove',
+ click: (arg) => {
+ const grid = gridRef.getEditorForm().getFieldComponent('conditionRange');
+ grid.removeRows(arg.selecteds);
+ },
+ },
+ 'separator',
+ {
+ name: 'example',
+ label: $t('example'),
+ icon: 'bi-balloon',
+ click: (arg) => {
+ const grid = gridRef.getEditorForm().getFieldComponent('conditionRange');
+ const sampleData = [
+ { uuid: Tools.uuid(), condition: '${变量名}<=0', value: '0' },
+ { uuid: Tools.uuid(), condition: '${变量名}>0 && ${变量名}<=50', value: '50' },
+ { uuid: Tools.uuid(), condition: '${变量名}>50 && ${变量名}<=80', value: '80' },
+ { uuid: Tools.uuid(), condition: '${变量名}>80 && ${变量名}<=100', value: '100' },
+ { uuid: Tools.uuid(), condition: '${变量名}>100', value: '60' },
+ ];
+ grid.setLocalData(sampleData);
+ },
+ },
+ ],
+ primaryKey: 'uuid',
+ columns: [
+ { name: 'uuid', label: 'uuid', hidden: true },
+ {
+ name: 'condition',
+ label: $t('condition'),
+ align: 'left',
+ sortable: false,
+ format: (value) => {
+ return PlaceHolder.replace(value);
+ },
+ },
+ {
+ name: 'value',
+ label: $t('value'),
+ sortable: false,
+ format: (value) => {
+ return PlaceHolder.replace(value);
+ },
+ },
+ ],
+ editor: {
+ dialog: {
+ width: '600px',
+ },
+ form: {
+ colsNum: 1,
+ fields: [
+ { name: 'uuid', label: 'uuid', hidden: true },
+ {
+ name: 'condition',
+ label: $t('condition'),
+ type: 'code-mirror',
+ lang: 'java',
+ rows: 1,
+ placeholder: true,
+ autoCompletion: true,
+ autoCompletionOptions: autoCompletionOptionsRef,
+ extAutoCompletionOptions: GroovyFunctions,
+ },
+ {
+ name: 'value',
+ label: $t('value'),
+ type: 'code-mirror',
+ lang: 'java',
+ rows: 1,
+ placeholder: true,
+ autoCompletion: true,
+ autoCompletionOptions: autoCompletionOptionsRef,
+ extAutoCompletionOptions: GroovyFunctions,
+ },
+ ],
+ },
+ },
+ onBeforeEditorDataSubmit: (data, callback) => {
+ const grid = gridRef.getEditorForm().getFieldComponent('conditionRange');
+ const form = grid.getEditorForm();
+ if ('add' == form.getStatus() || 'clone' == form.getStatus()) {
+ data.uuid = Tools.uuid();
+ grid.addRow(data);
+ callback(false);
+ } else if ('edit' == form.getStatus()) {
+ grid.replaceRow(data);
+ callback(false);
+ }
+ },
},
{
name: 'decisionTable2C',
@@ -450,7 +698,9 @@
name: 'pmml',
label: $t('re.resources.designer.processor.grid.entity.pmml'),
type: 'code-mirror',
- rows: 1,
+ rows: 10,
+ lineNumber: true,
+ lang: 'xml',
showIf: (arg) => {
return 'PMML' === arg.form.getFieldValue('type');
},
@@ -544,6 +794,39 @@
],
},
}"
+ @before-editor-data-submit="
+ (data, callback) => {
+ const form = gridRef.getEditorForm();
+ if ('NUMBER_RANGE' === data.type) {
+ const grid = form.getFieldComponent('numberRange');
+ const localData = grid.getLocalData();
+ const ranges = [];
+ for (const item of localData) {
+ ranges.push({
+ uuid: item.uuid,
+ minIncluded: item.minIncluded,
+ min: item.min,
+ max: item.max,
+ maxIncluded: item.maxIncluded,
+ value: item.value,
+ });
+ }
+ data.numberRange = Tools.object2Json(ranges);
+ } else if ('CONDITION_RANGE' === data.type) {
+ const grid = form.getFieldComponent('conditionRange');
+ const localData = grid.getLocalData();
+ const ranges = [];
+ for (const item of localData) {
+ ranges.push({
+ uuid: item.uuid,
+ condition: item.condition,
+ value: item.value,
+ });
+ }
+ data.conditionRange = Tools.object2Json(ranges);
+ }
+ }
+ "
@after-editor-open="
(row) => {
axios.get(Environment.apiContextPath('/api/re/model/parameter/listParemterHintsByParameterId/' + parameter.id)).then((response) => {
@@ -572,9 +855,13 @@
optionOptionsRef = parameters;
});
if ('NUMBER_RANGE' === row.type) {
- const fields = gridRef.getEditorForm().getFields();
- console.log(fields);
- numberRangeGridRef.setLocalData(Tools.json2Object(row.numberRange));
+ const grid = gridRef.getEditorForm().getFieldComponent('numberRange');
+ const rows = Tools.json2Object(row.numberRange);
+ grid.setLocalData(rows);
+ } else if ('CONDITION_RANGE' === row.type) {
+ const grid = gridRef.getEditorForm().getFieldComponent('conditionRange');
+ const rows = Tools.json2Object(row.conditionRange);
+ grid.setLocalData(rows);
}
}
"
@@ -583,6 +870,7 @@
-./w-code-mirror/GroovyFunctions
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/w-code-mirror/PlaceholderPlugin.ts b/io.sc.platform.core.frontend/src/platform/components/form/elements/w-code-mirror/PlaceholderPlugin.ts
index efc9a3f3..f8ba5a69 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/w-code-mirror/PlaceholderPlugin.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/w-code-mirror/PlaceholderPlugin.ts
@@ -11,15 +11,16 @@ class PlaceholderWidget extends WidgetType {
}
toDOM() {
+ const container = document.createElement('span');
+ container.className = 'px-0.5';
+
const elt = document.createElement('span');
elt.setAttribute('placeholder', true);
- elt.style.cssText = `
- border: 1px solid gray;
- border-radius: 4px;
- padding: 2px 2px;
- `;
+ elt.className = 'p-0.5 border border-gray-800 rounded-md';
elt.textContent = this.name;
- return elt;
+
+ container.appendChild(elt);
+ return container;
}
ignoreEvent() {
@@ -55,22 +56,13 @@ const placeholderPlugin = ViewPlugin.fromClass(
mouseover: (e, view) => {
const target = e.target as HTMLElement;
if (target.tagName.toLowerCase() === 'span' && target.getAttribute('placeholder')) {
- target.style.cssText = `
- border: 1px solid gray;
- border-radius: 4px;
- padding: 2px 2px;
- background: orange;
- `;
+ target.className = 'p-0.5 border border-orange-400 rounded-md';
}
},
mouseout: (e, view) => {
const target = e.target as HTMLElement;
if (target.tagName.toLowerCase() === 'span' && target.getAttribute('placeholder')) {
- target.style.cssText = `
- border: 1px solid gray;
- border-radius: 4px;
- padding: 2px 2px;
- `;
+ target.className = 'p-0.5 border border-gray-800 rounded-md';
}
},
contextmenu: (e, view) => {
diff --git a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue
index 135cfe7d..af92bf02 100644
--- a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue
+++ b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue
@@ -228,7 +228,6 @@
:editor="{
dialog: {
width: '600px',
- height: '400px',
},
form: {
colsNum: 1,
@@ -261,8 +260,10 @@
label: $t('re.resources.designer.processor.grid.entity.ternaryCondition'),
type: 'code-mirror',
lang: 'java',
- rows: 1,
- height: '32px',
+ rows: 50,
+ lineNumber: true,
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: GroovyFunctions,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json
index 18aaba2d..c32666d2 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.237",
+ "version": "8.1.244",
"description": "前端核心包,用于快速构建前端的脚手架",
"private": false,
"keywords": [],
@@ -104,7 +104,7 @@
"luckyexcel": "1.0.1",
"mockjs": "1.1.0",
"pinia": "2.1.7",
- "platform-core": "8.1.237",
+ "platform-core": "8.1.244",
"quasar": "2.15.3",
"tailwindcss": "3.4.3",
"vue": "3.4.24",
diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue
index 135cfe7d..af92bf02 100644
--- a/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue
+++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue
@@ -228,7 +228,6 @@
:editor="{
dialog: {
width: '600px',
- height: '400px',
},
form: {
colsNum: 1,
@@ -261,8 +260,10 @@
label: $t('re.resources.designer.processor.grid.entity.ternaryCondition'),
type: 'code-mirror',
lang: 'java',
- rows: 1,
- height: '32px',
+ rows: 50,
+ lineNumber: true,
+ placeholder: true,
+ autoCompletion: true,
autoCompletionOptions: GroovyFunctions,
extAutoCompletionOptions: GroovyFunctions,
showIf: (arg) => {
diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml b/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml
index 6d411899..8343d425 100644
--- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml
+++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml
@@ -16,51 +16,99 @@
${pattern}
+
+ INFO
+ ACCEPT
+ DENY
+
-
-
+
+
${pattern}
${homedir}/logs/log.log
-
- ${homedir}/logs/log.%d.log
+
+ ${homedir}/logs/log.%d.%i.log
30
+ 100MB
+
+ TRACE
+ ACCEPT
+ NEUTRAL
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+ ${pattern}
+ ${homedir}/logs/debug.log
+
+ ${homedir}/logs/debug.%d.%i.log
+ 30
+ 100MB
+
+
+ DEBUG
+ ACCEPT
+ DENY
+
+
-
-
-
-
+
+
+ ${pattern}
+ ${homedir}/logs/info.log
+
+ ${homedir}/logs/info.%d.%i.log
+ 30
+ 100MB
+
+
+ INFO
+ ACCEPT
+ DENY
+
+
+
+
+ ${pattern}
+ ${homedir}/logs/warn.log
+
+ ${homedir}/logs/warn.%d.%i.log
+ 30
+ 100MB
+
+
+ WARN
+ ACCEPT
+ DENY
+
+
-
-
+
+ ${pattern}
+ ${homedir}/logs/error.log
+
+ ${homedir}/logs/error.%d.%i.log
30
+ 100MB
+
+ ERROR
+ ACCEPT
+ DENY
+
-
-
+
+
-
-
-
- -->
-
\ No newline at end of file
+
+
+
+
+
+
+