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

refactor: bpmn 1.0.6
Merge remote-tracking branch 'origin/main'
refactor: bpmn 1.0.6
Merge branch 'main' of https://github.com/fast-crud/fs-admin-antdv
perf: toolbar按钮显隐配置,保存按钮,对话框样式优化
refactor: 1.13.0
refactor: 1.13.0
feat: FsComponentRender组件重构

修复选择联动示例报错的bug
pull/14/head
GitHub Actions Bot 2023-04-07 19:23:58 +00:00
parent e76fb235aa
commit 5746042d68
6 changed files with 41 additions and 20 deletions

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [1.13.0](https://github.com/fast-crud/fast-crud/compare/v1.12.2...v1.13.0) (2023-04-07)
**Note:** Version bump only for package @fast-crud/fs-admin-antdv
## [1.12.2](https://github.com/fast-crud/fast-crud/compare/v1.12.1...v1.12.2) (2023-04-06) ## [1.12.2](https://github.com/fast-crud/fast-crud/compare/v1.12.1...v1.12.2) (2023-04-06)
**Note:** Version bump only for package @fast-crud/fs-admin-antdv **Note:** Version bump only for package @fast-crud/fs-admin-antdv

View File

@ -1,6 +1,6 @@
{ {
"name": "@fast-crud/fs-admin-antdv", "name": "@fast-crud/fs-admin-antdv",
"version": "1.12.2", "version": "1.13.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
@ -25,11 +25,11 @@
"@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.3", "@fast-crud/fast-bpmn": "^1.0.6",
"@fast-crud/fast-crud": "^1.12.2", "@fast-crud/fast-crud": "^1.13.0",
"@fast-crud/fast-extends": "^1.12.2", "@fast-crud/fast-extends": "^1.13.0",
"@fast-crud/ui-antdv": "^1.12.2", "@fast-crud/ui-antdv": "^1.13.0",
"@fast-crud/ui-interface": "^1.12.2", "@fast-crud/ui-interface": "^1.13.0",
"@iconify/iconify": "^3.1.0", "@iconify/iconify": "^3.1.0",
"@iconify/json": "^2.2.35", "@iconify/json": "^2.2.35",
"@purge-icons/generated": "^0.9.0", "@purge-icons/generated": "^0.9.0",

View File

@ -39,7 +39,8 @@ function install(app: any, options: any = {}) {
}, },
conditionalRender: { conditionalRender: {
match(scope) { match(scope) {
return !scope.value; //不能用 !scope.value 否则switch组件设置为关之后就消失了
return scope.value == null || (scope.value instanceof Array && scope.value.length === 0);
}, },
render() { render() {
return "-"; return "-";

View File

@ -121,10 +121,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
title: "单选远程", title: "单选远程",
search: { search: {
show: true, show: true,
rules: null, rules: null
component: {
style: { width: "100px" }
}
}, },
type: "dict-select", type: "dict-select",
dict: dict({ dict: dict({
@ -154,7 +151,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
search: { search: {
title: "远程搜索", title: "远程搜索",
type: "text", type: "text",
search: { show: true, component: { style: { width: "240px" } } }, search: { show: true },
form: { form: {
component: { component: {
name: "a-select", name: "a-select",

View File

@ -1,10 +1,9 @@
<template> <template>
<fs-page> <fs-page>
<fs-crud ref="crudRef" custom-class="page-layout" v-bind="crudBinding"> <template #header>
<template #header-top> <div class="title">表单Grid布局</div>
<div class="page-header">表单布局</div>
</template> </template>
</fs-crud> <fs-crud ref="crudRef" custom-class="page-layout" v-bind="crudBinding"> </fs-crud>
</fs-page> </fs-page>
</template> </template>

View File

@ -5,6 +5,8 @@
<component :is="ui.tabPane.name" key="designer" tab="设计器"> </component> <component :is="ui.tabPane.name" key="designer" tab="设计器"> </component>
</component> </component>
<div> <div>
<span class="m-l"> showMiniMapButton<a-switch v-model:checked="toolbarProps.buttons.miniMap" /> </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>
<span class="m-l"> showNameAndCode<a-switch v-model:checked="binding.showNameAndCode" /> </span> <span class="m-l"> showNameAndCode<a-switch v-model:checked="binding.showNameAndCode" /> </span>
<span class="m-l"></span> <span class="m-l"></span>
@ -18,7 +20,14 @@
</div> </div>
</div> </div>
<div class="main"> <div class="main">
<fs-bpmn v-model:xml="xmlRef" :panel="panelProps" v-bind="binding"></fs-bpmn> <fs-bpmn v-model:xml="xmlRef" :panel="panelProps" :toolbar="toolbarProps" v-bind="binding" @save="onSave">
<template #toolbar_left>
<a-tag>toolbar_left插槽</a-tag>
</template>
<template #toolbar_right>
<a-tag>toolbar_right插槽</a-tag>
</template>
</fs-bpmn>
</div> </div>
</div> </div>
</template> </template>
@ -29,7 +38,7 @@ import { defineComponent, Ref, ref } from "vue";
import FsBpmnPreviewDemo from "./preview.vue"; import FsBpmnPreviewDemo from "./preview.vue";
import { demoXml } from "./xml"; import { demoXml } from "./xml";
import { useUi } from "@fast-crud/ui-interface"; import { useUi } from "@fast-crud/ui-interface";
import { FsBpmnPanelProps, Base } from "@fast-crud/fast-bpmn"; import { FsBpmnPanelProps, Base, FsBpmnToolbarProps } from "@fast-crud/fast-bpmn";
import ElementUserAssign from "./ElementUserAssign.vue"; import ElementUserAssign from "./ElementUserAssign.vue";
const FsBpmnDemo = defineComponent({ const FsBpmnDemo = defineComponent({
@ -49,6 +58,11 @@ const FsBpmnDemo = defineComponent({
showNameAndCode: true, showNameAndCode: true,
showExtensionProperties: true showExtensionProperties: true
}); });
const toolbarProps = ref<FsBpmnToolbarProps>({
buttons: {
miniMap: true
}
});
const panelProps = ref<FsBpmnPanelProps>({ const panelProps = ref<FsBpmnPanelProps>({
// //
registerComponents() { registerComponents() {
@ -84,13 +98,19 @@ const FsBpmnDemo = defineComponent({
} }
} }
}); });
function onSave(xml: string) {
console.log("onsave", xml);
}
return { return {
localRef, localRef,
xmlRef, xmlRef,
ui, ui,
activeKey, activeKey,
panelProps, panelProps,
binding binding,
onSave,
toolbarProps
}; };
} }
}); });