🔱: [client] sync upgrade with 2 commits [trident-sync]

refactor: fs-bpmn 1.0.8
pull/14/head
GitHub Actions Bot 2023-04-15 19:23:59 +00:00
parent 71244a4eb8
commit 82b6b9ccb2
2 changed files with 42 additions and 16 deletions

View File

@ -25,7 +25,7 @@
"@ant-design/icons-vue": "^6.1.0", "@ant-design/icons-vue": "^6.1.0",
"@aws-sdk/client-s3": "^3.292.0", "@aws-sdk/client-s3": "^3.292.0",
"@aws-sdk/s3-request-presigner": "^3.292.0", "@aws-sdk/s3-request-presigner": "^3.292.0",
"@fast-crud/fast-bpmn": "^1.0.6", "@fast-crud/fast-bpmn": "^1.0.8",
"@fast-crud/fast-crud": "^1.13.1", "@fast-crud/fast-crud": "^1.13.1",
"@fast-crud/fast-extends": "^1.13.1", "@fast-crud/fast-extends": "^1.13.1",
"@fast-crud/ui-antdv": "^1.13.1", "@fast-crud/ui-antdv": "^1.13.1",

View File

@ -1,10 +1,10 @@
<template> <template>
<div class="fs-bpmn-demo-page"> <div class="fs-bpmn-demo-page">
<div class="header"> <div class="demo-tool">
<component :is="ui.tabs.name" v-model:active-key="activeKey" type="card"> <span class="m-l"> <a-button @click="getDetail">GetDetail</a-button> </span>
<component :is="ui.tabPane.name" key="designer" tab="设计器"> </component> <span class="m-l"> <a-button @click="getXml">GetXml</a-button> </span>
</component> <span class="m-l"> <a-button @click="getJson">GetJson</a-button> </span>
<div> <span class="m-l"></span>
<span class="m-l"> showMiniMapButton<a-switch v-model:checked="toolbarProps.buttons.miniMap" /> </span> <span class="m-l"> showMiniMapButton<a-switch v-model:checked="toolbarProps.buttons.miniMap" /> </span>
<span class="m-l"></span> <span class="m-l"></span>
<span class="m-l"> showExtensionProperties <a-switch v-model:checked="binding.showExtensionProperties" /> </span> <span class="m-l"> showExtensionProperties <a-switch v-model:checked="binding.showExtensionProperties" /> </span>
@ -16,11 +16,16 @@
<span class="m-l"> showSettings<a-switch v-model:checked="binding.showSettings" /> </span> <span class="m-l"> showSettings<a-switch v-model:checked="binding.showSettings" /> </span>
<span class="m-l"> showPalette<a-switch v-model:checked="binding.showPalette" /> </span> <span class="m-l"> showPalette<a-switch v-model:checked="binding.showPalette" /> </span>
<span class="m-l"> showContextMenu<a-switch v-model:checked="binding.showContextMenu" /> </span> <span class="m-l"> showContextMenu<a-switch v-model:checked="binding.showContextMenu" /> </span>
<fs-bpmn-preview-demo></fs-bpmn-preview-demo> <fs-bpmn-preview-demo></fs-bpmn-preview-demo>
</div> </div>
<div class="header">
<component :is="ui.tabs.name" v-model:active-key="activeKey" type="card">
<component :is="ui.tabPane.name" key="designer" tab="设计器"> </component>
</component>
</div> </div>
<div class="main"> <div class="main">
<fs-bpmn v-model:xml="xmlRef" :panel="panelProps" :toolbar="toolbarProps" v-bind="binding" @save="onSave"> <fs-bpmn ref="bpmnRef" v-model:xml="xmlRef" :panel="panelProps" :toolbar="toolbarProps" v-bind="binding" @save="onSave">
<template #toolbar_left> <template #toolbar_left>
<a-tag>toolbar_left插槽</a-tag> <a-tag>toolbar_left插槽</a-tag>
</template> </template>
@ -102,14 +107,32 @@ const FsBpmnDemo = defineComponent({
function onSave(xml: string) { function onSave(xml: string) {
console.log("onsave", xml); console.log("onsave", xml);
} }
const bpmnRef = ref();
async function getDetail() {
const detail = await bpmnRef.value.getDetail();
console.log("detail", detail);
}
async function getXml() {
const xml = await bpmnRef.value.getXml();
console.log("xml", xml);
}
async function getJson() {
const json = await bpmnRef.value.getJson();
console.log("json", json);
}
return { return {
localRef, localRef,
xmlRef, xmlRef,
bpmnRef,
ui, ui,
activeKey, activeKey,
panelProps, panelProps,
binding, binding,
onSave, onSave,
getDetail,
getXml,
getJson,
toolbarProps toolbarProps
}; };
} }
@ -123,6 +146,9 @@ export default FsBpmnDemo;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.demo-tool {
padding: 10px;
}
.header { .header {
padding: 20px 20px 0 20px; padding: 20px 20px 0 20px;
display: flex; display: flex;