Browse Source

update

main
wangshaoping 6 months ago
parent
commit
018cb632bc
  1. 4
      io.sc.engine.rule.frontend/src/views/resources/designer/DecisionTreeDialog.vue
  2. 42
      io.sc.engine.rule.frontend/src/views/resources/designer/ExecutionFlowDialog.vue
  3. 4
      io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue
  4. 2
      io.sc.platform.security/src/main/java/io/sc/platform/security/jwt/JwtEncoderUtil.java

4
io.sc.engine.rule.frontend/src/views/resources/designer/DecisionTreeDialog.vue

@ -182,9 +182,9 @@ const vertexDefines = [
},
getLabel: (value) => {
let html = '';
html += '<div style="text-align:center;">' + value.expression + '</div>';
html += '<div style="text-align:center;">' + PlaceHolder.replace(value.expression || '') + '</div>';
html += '<hr size="0.5"/>';
html += '<div style="text-align:left;">' + value.commands + '</div>';
html += '<div style="text-align:left;">' + PlaceHolder.replace(value.commands || '') + '</div>';
return html;
},
getValue: (dom) => {

42
io.sc.engine.rule.frontend/src/views/resources/designer/ExecutionFlowDialog.vue

@ -18,7 +18,7 @@ import ResourceDeployStatusTag from '@/views/shared/ResourceDeployStatusTag.vue'
const dialogRef = ref();
const processorIdRef = ref();
const modelValueRef = ref();
const modelValueRef = ref('');
const autoCompletionManager = new AutoCompletionManager();
const userDefinedFunctionsRef = ref();
@ -347,53 +347,41 @@ const vertexDefines = [
size: [120, 60],
},
getLabel: (value) => {
let html = '<div style="text-align:left;">' + (value?.inputCommands || '') + '</div>';
html += '<hr/>';
const resourceAbstract = findResourceAbstractById(value.resourceAbstractId);
if (resourceAbstract) {
return resourceAbstract.name + '(V' + resourceAbstract.version + ')';
html += resourceAbstract.name + '(V' + resourceAbstract.version + ')';
}
return '';
html += '<hr/>';
html += '<div style="text-align:left;">' + (value?.outputCommands || '') + '</div>';
return html;
},
getValue: (dom) => {
let result = { resourceAbstractId: '', inputCommands: '', outputCommands: '' };
if (dom) {
const code = dom.getAttribute('code');
const version = dom.getAttribute('version');
const inputCommands = dom.getAttribute('inputCommands');
const outputCommands = dom.getAttribute('outputCommands');
const resourceAbstract = findResourceAbstractByCodeAndVersion(code, version);
if (resourceAbstract) {
return {
resourceAbstractId: resourceAbstract.id,
inputCommands: inputCommands,
outputCommands: outputCommands,
};
} else {
return {
resourceAbstractId: '',
inputCommands: '',
outputCommands: '',
};
result.resourceAbstractId = resourceAbstract.id;
}
} else {
return {
resourceAbstractId: '',
inputCommands: '',
outputCommands: '',
};
result.inputCommands = dom.getAttribute('inputCommands') || '';
result.outputCommands = dom.getAttribute('outputCommands') || '';
}
return result;
},
setValue: (dom, value) => {
const resourceAbstract = findResourceAbstractById(value.resourceAbstractId);
if (resourceAbstract) {
dom.setAttribute('code', resourceAbstract.code);
dom.setAttribute('version', resourceAbstract.version);
dom.setAttribute('inputCommands', value.inputCommands);
dom.setAttribute('outputCommands', value.outputCommands);
} else {
dom.setAttribute('code', '');
dom.setAttribute('version', '');
dom.setAttribute('inputCommands', '');
dom.setAttribute('outputCommands', '');
}
dom.setAttribute('inputCommands', value?.inputCommands || '');
dom.setAttribute('outputCommands', value?.outputCommands || '');
},
getFormFields: () => {
return [
@ -460,7 +448,7 @@ const vertexDefines = [
label: $t('re.graph.vertex.configurableResourceAbstract.entity.inputCommands'),
type: 'w-code-mirror',
lang: 'java',
rows: 10,
rows: 9,
placeholder: true,
lineWrap: true,
lineBreak: true,

4
io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue

@ -9,7 +9,7 @@
hide-bottom
:config-button="false"
selection="multiple"
db-click-operation="edit"
db-click-operation="customEdit"
:checkbox-selection="true"
:tree="false"
:fetch-data-url="Environment.apiContextPath('/api/re/model/parameter/processor/findByParameterId?parameterId=' + parameter.id)"
@ -248,10 +248,12 @@
],
{
extend: 'edit',
name: 'customEdit',
enableIf: (arg) => {
return arg.selected;
},
click: (arg) => {
console.log('>>>>>>', arg);
const type = arg.selected?.type;
if ('DECISION_TREE' === type) {
decisionTreeDialogRef.open(parameter.id, arg.selected?.id);

2
io.sc.platform.security/src/main/java/io/sc/platform/security/jwt/JwtEncoderUtil.java

@ -39,7 +39,7 @@ public class JwtEncoderUtil {
builder.id(UUID.randomUUID().toString());
Instant now =Instant.now();
builder.issuedAt(now);
builder.expiresAt(now.plusSeconds(8*60*60));//8小时后过期
builder.expiresAt(now.plusSeconds(60*60));//1小时后过期
for(String key : map.keySet()){
builder.claim(key,map.get(key));
}

Loading…
Cancel
Save