Skip to content

Commit 06a575b

Browse files
committed
[Fix-4530-1.2] Fix resolve pagination error when changing pages on the Registry
1 parent f6e6a4f commit 06a575b

3 files changed

Lines changed: 31 additions & 30 deletions

File tree

dinky-admin/src/main/resources/mapper/DocumentMapper.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@
4646
<if test='param.subtype!=null and param.subtype!=""'>
4747
and a.subtype = #{param.subtype}
4848
</if>
49+
<if test='param.enabled != null and param.enabled != ""'>
50+
and a.enabled =
51+
<choose>
52+
<when test='param.enabled == true or param.enabled == 1 or param.enabled == "true" or param.enabled == "1"'>1</when>
53+
<otherwise>0</otherwise>
54+
</choose>
55+
</if>
4956
<if test='param.version!=null and param.version!=""'>
5057
and a.version = #{param.version}
5158
</if>

dinky-web/pom.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<npmVersion>10.5.0</npmVersion>
5252
<pnpmVersion>9.15.4</pnpmVersion>
5353
<!-- 国内node下载加速 -->
54-
<!-- <nodeDownloadRoot>https://mirrors.huaweicloud.com/nodejs/</nodeDownloadRoot>-->
55-
<!-- <npmDownloadRoot>https://repo.huaweicloud.com/npm-software/</npmDownloadRoot>-->
54+
<!-- <nodeDownloadRoot>https://mirrors.huaweicloud.com/nodejs/</nodeDownloadRoot>-->
55+
<!-- <npmDownloadRoot>https://repo.huaweicloud.com/npm-software/</npmDownloadRoot>-->
5656
</configuration>
5757
<executions>
5858
<execution>
@@ -61,24 +61,24 @@
6161
<goal>install-node-and-pnpm</goal>
6262
</goals>
6363
</execution>
64-
<execution>
65-
<id>install</id>
66-
<goals>
67-
<goal>pnpm</goal>
68-
</goals>
69-
<configuration>
70-
<arguments>install --registry ${npm-registry-repo}</arguments>
71-
</configuration>
72-
</execution>
73-
<execution>
74-
<id>build</id>
75-
<goals>
76-
<goal>pnpm</goal>
77-
</goals>
78-
<configuration>
79-
<arguments>run build</arguments>
80-
</configuration>
81-
</execution>
64+
<execution>
65+
<id>install</id>
66+
<goals>
67+
<goal>pnpm</goal>
68+
</goals>
69+
<configuration>
70+
<arguments>install --registry ${npm-registry-repo}</arguments>
71+
</configuration>
72+
</execution>
73+
<execution>
74+
<id>build</id>
75+
<goals>
76+
<goal>pnpm</goal>
77+
</goals>
78+
<configuration>
79+
<arguments>run build</arguments>
80+
</configuration>
81+
</execution>
8282
</executions>
8383
</plugin>
8484
</plugins>

dinky-web/src/pages/RegCenter/Document/components/DocumentProTable/index.tsx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,12 @@ const DocumentTableList: React.FC = () => {
117117
title: l('rc.doc.functionType'),
118118
sorter: true,
119119
dataIndex: 'type',
120-
filterMultiple: true,
121-
filters: true,
122120
valueEnum: DOCUMENT_TYPE_ENUMS
123121
},
124122
{
125123
title: l('rc.doc.subFunctionType'),
126124
sorter: true,
127125
dataIndex: 'subtype',
128-
filters: true,
129-
filterMultiple: true,
130126
renderFormItem: (item, { type }, form) => {
131127
const currentType = form.getFieldValue('type');
132128
let options = currentType === DOCUMENT_TYPE_ENUMS.FUN_UDF.value ? FUNCTION_TYPES : JOB_TYPE;
@@ -139,8 +135,6 @@ const DocumentTableList: React.FC = () => {
139135
title: l('rc.doc.category'),
140136
sorter: true,
141137
dataIndex: 'category',
142-
filterMultiple: true,
143-
filters: true,
144138
valueEnum: DOCUMENT_CATEGORY_ENUMS
145139
},
146140
{
@@ -172,11 +166,11 @@ const DocumentTableList: React.FC = () => {
172166
{
173167
title: l('global.table.isEnable'),
174168
dataIndex: 'enabled',
175-
hideInSearch: true,
176-
filters: STATUS_MAPPING(),
177-
filterMultiple: false,
178169
hideInDescriptions: true,
179-
valueEnum: STATUS_ENUM(),
170+
valueType: 'select',
171+
valueEnum: Object.fromEntries(
172+
STATUS_MAPPING().map(item => [item.value, { text: item.text, status: item.value === 1 ? 'Success' : 'Error' }])
173+
),
180174
render: (_, record) => {
181175
return (
182176
<EnableSwitchBtn

0 commit comments

Comments
 (0)