From 040b2e8a53b21e6ad5fb5c3e3b306d37f244c68f Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Wed, 22 Mar 2023 19:23:53 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?= =?UTF-8?q?h=2011=20commits=20[trident-sync]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refactor: 1.11.7 refactor: 1.11.6 refactor: 1.11.5 refactor: ui interface refactor: ui interface refactor: ui interface refactor: 1.11.4 fix: 多级表头列设置不显示bug fix: tabs，修复连续触发两次查询的bug https://github.com/fast-crud/fast-crud/issues/161 perf: 文本复制组件优化 --- packages/ui/certd-client/CHANGELOG.md | 22 ++++++++++++++ packages/ui/certd-client/package.json | 9 +++--- packages/ui/certd-client/src/main.ts | 1 - .../src/router/source/framework.ts | 1 + .../src/router/source/modules/ui.ts | 30 +++++++++++++++++++ .../views/crud/basis/columns-set/index.vue | 8 ++++- .../src/views/crud/component/text/index.vue | 9 ++++++ .../src/views/crud/feature/search/crud.tsx | 1 + .../src/views/crud/feature/tabs/crud.tsx | 2 +- .../src/views/ui/form/input/index.vue | 21 +++++++++++++ 10 files changed, 97 insertions(+), 7 deletions(-) create mode 100644 packages/ui/certd-client/src/router/source/modules/ui.ts create mode 100644 packages/ui/certd-client/src/views/ui/form/input/index.vue diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 2e4e02dd..0e7e1d8b 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,28 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.11.7](https://github.com/fast-crud/fast-crud/compare/v1.11.6...v1.11.7) (2023-03-22) + +**Note:** Version bump only for package @fast-crud/fs-admin-antdv + + + + + +## [1.11.6](https://github.com/fast-crud/fast-crud/compare/v1.11.5...v1.11.6) (2023-03-22) + +**Note:** Version bump only for package @fast-crud/fs-admin-antdv + +## [1.11.5](https://github.com/fast-crud/fast-crud/compare/v1.11.4...v1.11.5) (2023-03-22) + +**Note:** Version bump only for package @fast-crud/fs-admin-antdv + +## [1.11.4](https://github.com/fast-crud/fast-crud/compare/v1.11.3...v1.11.4) (2023-03-22) + +### Performance Improvements + +* doRefresh增加参数 ([a585604](https://github.com/fast-crud/fast-crud/commit/a5856045380f4a3fe2e657fd2ace1aea3473c6d7)) + ## [1.11.3](https://github.com/fast-crud/fast-crud/compare/v1.11.2...v1.11.3) (2023-03-21) **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 d072e041..3077e6e8 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.11.3", + "version": "1.11.7", "private": true, "scripts": { "dev": "vite", @@ -24,9 +24,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-crud": "^1.11.3", - "@fast-crud/fast-extends": "^1.11.3", - "@fast-crud/ui-antdv": "^1.11.3", + "@fast-crud/fast-crud": "^1.11.7", + "@fast-crud/fast-extends": "^1.11.7", + "@fast-crud/ui-antdv": "^1.11.7", + "@fast-crud/ui-interface": "^1.11.6", "@iconify/iconify": "^3.1.0", "@iconify/json": "^2.2.35", "@purge-icons/generated": "^0.9.0", diff --git a/packages/ui/certd-client/src/main.ts b/packages/ui/certd-client/src/main.ts index 409b9ee6..1810666e 100644 --- a/packages/ui/certd-client/src/main.ts +++ b/packages/ui/certd-client/src/main.ts @@ -10,7 +10,6 @@ import i18n from "./i18n"; import store from "./store"; import components from "./components"; import plugin from "./plugin/"; - // @ts-ignore const app = createApp(App); // 尽量 diff --git a/packages/ui/certd-client/src/router/source/framework.ts b/packages/ui/certd-client/src/router/source/framework.ts index 45366ca2..a89c9f40 100644 --- a/packages/ui/certd-client/src/router/source/framework.ts +++ b/packages/ui/certd-client/src/router/source/framework.ts @@ -1,5 +1,6 @@ import LayoutFramework from "/src/layout/layout-framework.vue"; import { crudResources } from "/@/router/source/modules/crud"; +import { uiResources } from "/@/router/source/modules/ui"; import { sysResources } from "/@/router/source/modules/sys"; export const frameworkResource = [ { diff --git a/packages/ui/certd-client/src/router/source/modules/ui.ts b/packages/ui/certd-client/src/router/source/modules/ui.ts new file mode 100644 index 00000000..e8cfc6e4 --- /dev/null +++ b/packages/ui/certd-client/src/router/source/modules/ui.ts @@ -0,0 +1,30 @@ +export const uiResources = [ + { + title: "UI示例", + name: "ui", + path: "/ui", + redirect: "/ui/form", + meta: { + icon: "ion:apps-sharp" + }, + children: [ + { + title: "表单组件", + name: "UIForm", + path: "/ui/form", + redirect: "/ui/form/input", + meta: { + icon: "ion:disc-outline" + }, + children: [ + { + title: "input", + name: "UIFormInput", + path: "/ui/form/input", + component: "/ui/form/input/index.vue" + } + ] + } + ] + } +]; 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 2a53576f..1b51cfef 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 @@ -10,6 +10,8 @@ @@ -36,10 +38,14 @@ export default defineComponent({ message.info("点击列设置按钮查看效果，当前列设置组件的模式为：" + crudBinding.value.toolbar.columnsFilter.mode); } + function columnsSetShowToggle() { + crudBinding.value.table.columns[3].columnSetShow = !crudBinding.value.table.columns[3].columnSetShow; + } return { crudBinding, crudRef, - columnsSetToggleMode + columnsSetToggleMode, + columnsSetShowToggle }; } }); diff --git a/packages/ui/certd-client/src/views/crud/component/text/index.vue b/packages/ui/certd-client/src/views/crud/component/text/index.vue index 27429b65..698daef5 100644 --- a/packages/ui/certd-client/src/views/crud/component/text/index.vue +++ b/packages/ui/certd-client/src/views/crud/component/text/index.vue @@ -1,5 +1,14 @@ diff --git a/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx index a45891b5..b5133e01 100644 --- a/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx @@ -38,6 +38,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti text: "自定义", show: true, order: 3, + class: "fs-test", icon: { icon: "ant-design:search", style: { diff --git a/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx index e77b3a91..a173a928 100644 --- a/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx @@ -52,7 +52,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti name: "radio", show: true //type: 'card', //tabs类型 - // defaultOptions: { //第一个tab页签显示 + // defaultOption: { //第一个tab页签显示 // show: true, // value: null, //点击第一个页签，查询值 // label: '全部', // 第一个页签的名称 diff --git a/packages/ui/certd-client/src/views/ui/form/input/index.vue b/packages/ui/certd-client/src/views/ui/form/input/index.vue new file mode 100644 index 00000000..6ffe47ec --- /dev/null +++ b/packages/ui/certd-client/src/views/ui/form/input/index.vue @@ -0,0 +1,21 @@ + + +