diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 1db9ab49..a3d4dd4a 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.14.0](https://github.com/fast-crud/fast-crud/compare/v1.13.12...v1.14.0) (2023-06-09) + +### Features + +* crudBinding.value.table.columns由array改成map ([8f89d2b](https://github.com/fast-crud/fast-crud/commit/8f89d2b26e12be0b3bcec2da8b4d7a2942395e8e)) + ## [1.13.12](https://github.com/fast-crud/fast-crud/compare/v1.13.11...v1.13.12) (2023-06-08) **Note:** Version bump only for package @fast-crud/fs-admin-antdv diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 336bd050..470823c7 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -1,6 +1,6 @@ { "name": "@fast-crud/fs-admin-antdv", - "version": "1.13.12", + "version": "1.14.0", "private": true, "scripts": { "dev": "vite", @@ -25,11 +25,10 @@ "@ant-design/icons-vue": "^6.1.0", "@aws-sdk/client-s3": "^3.292.0", "@aws-sdk/s3-request-presigner": "^3.292.0", - "@fast-crud/fast-bpmn": "^1.0.14", - "@fast-crud/fast-crud": "^1.13.12", - "@fast-crud/fast-extends": "^1.13.12", - "@fast-crud/ui-antdv": "^1.13.12", - "@fast-crud/ui-interface": "^1.13.12", + "@fast-crud/fast-crud": "^1.14.0", + "@fast-crud/fast-extends": "^1.14.0", + "@fast-crud/ui-antdv": "^1.14.0", + "@fast-crud/ui-interface": "^1.14.0", "@iconify/iconify": "^3.1.0", "@iconify/json": "^2.2.35", "@purge-icons/generated": "^0.9.0", diff --git a/packages/ui/certd-client/src/plugin/bpmn/index.ts b/packages/ui/certd-client/src/plugin/bpmn/index.ts deleted file mode 100644 index f1f38345..00000000 --- a/packages/ui/certd-client/src/plugin/bpmn/index.ts +++ /dev/null @@ -1,107 +0,0 @@ -import "@fast-crud/fast-bpmn/dist/style.css"; -// @ts-ignore -import FastBpmn, { FsBpmnSetupOptions, PanelComponentItem, Base, Shape } from "@fast-crud/fast-bpmn"; - -const fsBpmnOpts: FsBpmnSetupOptions = { - // 注册panel公共组件 - // @ts-ignore - registerPanelComponents(element: Base): Record { - return {}; - }, - //自定义增强contextPad - createEnhancementContextPadActions(provider) { - const actions: Record = {}; - const appendUserTask = (event: Event, element: Shape) => { - const shape = provider.elementFactory.createShape({ type: "bpmn:UserTask" }); - provider.create.start(event, shape, { - source: element - }); - }; - - const append = provider.autoPlace - ? // @ts-ignore - (event: Event, element: Shape) => { - const shape = provider.elementFactory.createShape({ type: "bpmn:UserTask" }); - provider.autoPlace.append(element, shape); - } - : appendUserTask; - - // 添加创建用户任务按钮 - actions["append.append-user-task"] = { - group: "model", - className: "bpmn-icon-user-task", - title: "用户任务", - action: { - dragstart: appendUserTask, - click: append - } - }; - - // 添加一个与edit一组的按钮 - actions["enhancement-op-1"] = { - group: "edit", - className: "enhancement-op", - title: "扩展操作1", - action: { - // @ts-ignore - click: function (e: Event) { - alert("点击 扩展操作1"); - } - } - }; - - // 添加一个新分组的自定义按钮 - actions["enhancement-op"] = { - group: "enhancement", - className: "enhancement-op", - title: "扩展操作2", - action: { - // @ts-ignore - click: function (e: Event) { - alert("点击 扩展操作2"); - } - } - }; - - return actions; - }, - - //自定义重写contextPad - // @ts-ignore - createRewriteContextPadActions(provider: any, element: Base) { - const actions: Record = {}; - - // 添加一个与edit一组的按钮 - actions["enhancement-op-1"] = { - group: "edit", - className: "enhancement-op", - title: "扩展操作1", - action: { - // @ts-ignore - click: function (e: Event) { - alert("点击 扩展操作1"); - } - } - }; - - // 添加一个新分组的自定义按钮 - actions["enhancement-op"] = { - group: "enhancement", - className: "enhancement-op", - title: "扩展操作2", - action: { - // @ts-ignore - click: function (e: Event) { - alert("点击 扩展操作2"); - } - } - }; - - return actions; - } -} as FsBpmnSetupOptions; - -export default function (app: any, i18n: any) { - fsBpmnOpts.i18n = i18n.global; - app.use(FastBpmn, fsBpmnOpts); -} diff --git a/packages/ui/certd-client/src/plugin/index.ts b/packages/ui/certd-client/src/plugin/index.ts index 21b12f18..8650b3a5 100644 --- a/packages/ui/certd-client/src/plugin/index.ts +++ b/packages/ui/certd-client/src/plugin/index.ts @@ -2,12 +2,10 @@ import "./iconify"; import "./iconfont"; import FastCrud from "./fast-crud"; import permission from "./permission"; -// import FsBpmn from "./bpmn"; function install(app: any, options: any = {}) { app.use(FastCrud, options); app.use(permission); - // app.use(FsBpmn, options.i18n); } export default { diff --git a/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx index fd56e13f..f62a9da7 100644 --- a/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx @@ -42,14 +42,14 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti toggleColumnSetShow: { text: "切换列设置项显隐", click() { - crudBinding.value.toolbar.columnsFilter.originalColumns[3].columnSetShow = !crudBinding.value.toolbar.columnsFilter.originalColumns[3].columnSetShow; + crudBinding.value.toolbar.columnsFilter.originalColumns.hidden.columnSetShow = !crudBinding.value.toolbar.columnsFilter.originalColumns.hidden.columnSetShow; message.info("切换第4列的列设置显隐"); } }, toggleColumnSetDisabled: { text: "切换列设置项禁用", click() { - crudBinding.value.toolbar.columnsFilter.originalColumns[2].columnSetDisabled = !crudBinding.value.toolbar.columnsFilter.originalColumns[2].columnSetDisabled; + crudBinding.value.toolbar.columnsFilter.originalColumns.disabled.columnSetDisabled = !crudBinding.value.toolbar.columnsFilter.originalColumns.disabled.columnSetDisabled; message.info("切换第3列的列设置禁用启用"); } }, diff --git a/packages/ui/certd-client/src/views/crud/basis/columns-set/index.vue b/packages/ui/certd-client/src/views/crud/basis/columns-set/index.vue index 91ca15d3..8fda6906 100644 --- a/packages/ui/certd-client/src/views/crud/basis/columns-set/index.vue +++ b/packages/ui/certd-client/src/views/crud/basis/columns-set/index.vue @@ -35,7 +35,7 @@ export default defineComponent({ } function columnsSetShowToggle() { - crudBinding.value.table.columns[3].columnSetShow = !crudBinding.value.table.columns[3].columnSetShow; + crudBinding.value.table.columns.disabled.columnSetShow = !crudBinding.value.table.columns.disabled.columnSetShow; } return { crudBinding, diff --git a/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx index 0f6be78d..caf67e0f 100644 --- a/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx @@ -2,10 +2,10 @@ import * as api from "./api"; import { requestForMock } from "/src/api/service"; import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, GetContextFn, ScopeContext, useCompute, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; import { message } from "ant-design-vue"; -import { computed, ref } from "vue"; +import { computed } from "vue"; const { asyncCompute, compute } = useCompute(); -export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet { +export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { const pageRequest = async (query: UserPageQuery): Promise => { return await api.GetList(query); }; @@ -21,24 +21,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.AddObj(form); }; - //普通的ref引用,可以动态切换配置 - const showRef = ref(false); - const showTableRef = ref(true); - const showTableComputed = computed(() => { - return showTableRef.value; - }); - - const columnComponentShowRef = ref(true); - const columnComponentShowComputed = computed(() => { - return columnComponentShowRef.value; - }); + const { showRef, showTableComputed, columnComponentShowComputed } = context; return { - output: { - showRef, - showTableRef, - columnComponentShowRef - }, crudOptions: { request: { pageRequest, diff --git a/packages/ui/certd-client/src/views/crud/basis/compute/index.vue b/packages/ui/certd-client/src/views/crud/basis/compute/index.vue index b3973e7a..d8907267 100644 --- a/packages/ui/certd-client/src/views/crud/basis/compute/index.vue +++ b/packages/ui/certd-client/src/views/crud/basis/compute/index.vue @@ -15,6 +15,7 @@ 表格显隐: 列显隐: + 列显隐2:列显隐2 diff --git a/packages/ui/certd-client/src/views/integration/bpmn/index.vue b/packages/ui/certd-client/src/views/integration/bpmn/index.vue deleted file mode 100644 index 2bd7335e..00000000 --- a/packages/ui/certd-client/src/views/integration/bpmn/index.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - diff --git a/packages/ui/certd-client/src/views/integration/bpmn/preview.vue b/packages/ui/certd-client/src/views/integration/bpmn/preview.vue deleted file mode 100644 index e8443633..00000000 --- a/packages/ui/certd-client/src/views/integration/bpmn/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/packages/ui/certd-client/src/views/integration/bpmn/xml.ts b/packages/ui/certd-client/src/views/integration/bpmn/xml.ts deleted file mode 100644 index 7e6ccab6..00000000 --- a/packages/ui/certd-client/src/views/integration/bpmn/xml.ts +++ /dev/null @@ -1,27 +0,0 @@ -export const demoXml = ` - - - Flow_0z7lqtc - - - - Flow_1rf2bmgFlow_06ulhtm - - - - Flow_0z7lqtcFlow_1p9en55Flow_1xxl1vf - - Flow_06ulhtm - - Flow_1xxl1vfFlow_1rf2bmgFlow_11pwko7 - - - - Flow_11pwko7Flow_1p9en55 - - - - - - -`;