From a62230c19502381598e6bdd5e7a565163762c057 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Wed, 19 Apr 2023 19:24:05 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?= =?UTF-8?q?h=203=20commits=20[trident-sync]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: _index列 被conditionalRender影响的bug refactor: --- packages/ui/certd-client/src/plugin/fast-crud/index.tsx | 3 ++- .../certd-client/src/views/crud/dict/cloneable/crud.tsx | 3 ++- .../certd-client/src/views/crud/dict/cloneable/mock.ts | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx index 489d0a4f..65394842 100644 --- a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx +++ b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx @@ -40,7 +40,8 @@ function install(app: any, options: any = {}) { conditionalRender: { match(scope) { //不能用 !scope.value , 否则switch组件设置为关之后就消失了 - return scope.value == null || (scope.value instanceof Array && scope.value.length === 0); + const { value, key } = scope; + return !value && key != "_index" && value != false; }, render() { return "-"; diff --git a/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx b/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx index 23d89861..72442e3a 100644 --- a/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx @@ -1,6 +1,6 @@ import * as api from "./api"; import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes, ValueChangeContext } from "@fast-crud/fast-crud"; -export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet { +export default function createCrudOptions({}: CreateCrudOptionsProps): CreateCrudOptionsRet { const pageRequest = async (query: UserPageQuery): Promise => { return await api.GetList(query); }; @@ -17,6 +17,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti }; const remoteDict = dict({ + cloneable: true, url: "/mock/dicts/OpenStatusEnum" }); diff --git a/packages/ui/certd-client/src/views/crud/dict/cloneable/mock.ts b/packages/ui/certd-client/src/views/crud/dict/cloneable/mock.ts index 76809517..514fc4ed 100644 --- a/packages/ui/certd-client/src/views/crud/dict/cloneable/mock.ts +++ b/packages/ui/certd-client/src/views/crud/dict/cloneable/mock.ts @@ -6,14 +6,17 @@ const options: any = { const list = [ { status: "1", - remote: "2" + remote: "2", + modifyDict: true }, { status: "2", - remote: "0" + remote: "0", + modifyDict: false }, { - status: "0" + status: "0", + modifyDict: true } ]; options.list = list;