Skip to content

Commit 62a5f7d

Browse files
LZS911LZS911
authored
Merge pull request #763 from actiontech/fix/todo-list-2
Fix/todo list
2 parents b89a67b + 37d894e commit 62a5f7d

File tree

497 files changed

+17255
-17190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

497 files changed

+17255
-17190
lines changed

‎package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"icon:docs:build": "pnpm --filter @actiontech/icons docs:build",
3232
"icon:build": "pnpm --filter @actiontech/icons build",
3333
"dms:g": "pnpm --filter @actiontech/cli-create-dms-page build && create-dms-page",
34-
"api_client:g": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-client -y",
35-
"api_mocks:g": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-mocks -y",
36-
"ai-doc": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli ai-doc",
34+
"api_client:g": "cross-env npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-client -y",
35+
"api_mocks:g": "cross-env npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-mocks -y",
36+
"ai-doc": "cross-env npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli ai-doc",
3737
"postinstall": "pnpm --filter @actiontech/dms-kit build",
3838
"dms-kit:publish": "pnpm --filter @actiontech/cli-dms-kit-publish build && dms-kit-publish"
3939
},
@@ -140,12 +140,13 @@
140140
"react-redux": "^8.0.5",
141141
"react-router-dom": "^6.10.0",
142142
"recoil": "^0.7.4",
143-
"sql-formatter": "^12.2.4"
143+
"sql-formatter": "^12.2.4",
144+
"@uiw/react-md-editor": "^3.23.5"
144145
},
145146
"resolutions": {
146147
"headers-polyfill": "3.0.10",
147148
"cheerio": "1.0.0-rc.3",
148149
"@babel/core": "^7.22.0",
149150
"@ant-design/cssinjs": "1.17.0"
150151
}
151-
}
152+
}

‎packages/base/src/__snapshots__/App.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ exports[`App render App when "checkPageAction" is false 1`] = `
322322
class="dms-layout-side-end"
323323
>
324324
<span
325-
class="ant-avatar ant-avatar-circle action-avatar css-1wq79dc"
325+
class="ant-avatar ant-avatar-circle action-avatar css-6ssfc7"
326326
>
327327
<span
328328
class="ant-avatar-string"
@@ -1475,7 +1475,7 @@ exports[`App render App when token is existed 1`] = `
14751475
class="dms-layout-side-end"
14761476
>
14771477
<span
1478-
class="ant-avatar ant-avatar-circle action-avatar css-1wq79dc"
1478+
class="ant-avatar ant-avatar-circle action-avatar css-6ssfc7"
14791479
>
14801480
<span
14811481
class="ant-avatar-string"
@@ -2492,7 +2492,7 @@ exports[`App render App when token is not existed 1`] = `
24922492
</div>
24932493
</div>
24942494
<button
2495-
class="ant-btn ant-btn-primary login-btn basic-button-wrapper css-geipcv"
2495+
class="ant-btn ant-btn-primary login-btn basic-button-wrapper css-1vnelmv"
24962496
type="submit"
24972497
>
24982498
<span>

‎packages/base/src/hooks/useThemeStyleData/__snapshots__/index.test.tsx.snap‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,14 @@ exports[`test base/hooks/useThemeStyleData should match snapshot 2`] = `
178178
"background": "#F7F6F4",
179179
},
180180
},
181+
"link": {
182+
"default": {
183+
"color": "#4583ff",
184+
},
185+
"hover": {
186+
"color": "#69b1ff",
187+
},
188+
},
181189
"primary": {
182190
"active": {
183191
"background": "#3B6FD9",
@@ -357,7 +365,7 @@ exports[`test base/hooks/useThemeStyleData should match snapshot 2`] = `
357365
"color": "#15C7D4",
358366
},
359367
"default": {
360-
"backgroundColor": "#f7f6f4",
368+
"backgroundColor": "#FFFFFF",
361369
"color": "#575C66",
362370
},
363371
"geekblue": {
@@ -411,6 +419,10 @@ exports[`test base/hooks/useThemeStyleData should match snapshot 2`] = `
411419
"configItem": {
412420
"maskBg": "rgba(0, 0, 0, 0.6)",
413421
},
422+
"customAvatar": {
423+
"backgroundColor": "#fde3cf",
424+
"color": "#f56a00",
425+
},
414426
"customDraggerUpload": {
415427
"backgroundColor": "#f7f6f4",
416428
"border": "#E8E7E6",

‎packages/base/src/page/Account/PersonalSMS/__tests__/__snapshots__/index.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ exports[`base/System/GlobalSetting/PersonalSMS render init snap 1`] = `
180180
class="ant-space-item"
181181
>
182182
<button
183-
class="ant-btn ant-btn-default basic-button-wrapper css-geipcv"
183+
class="ant-btn ant-btn-default basic-button-wrapper css-1vnelmv"
184184
type="button"
185185
>
186186
<span>
@@ -227,7 +227,7 @@ exports[`base/System/GlobalSetting/PersonalSMS render init snap 1`] = `
227227
style="margin-right: 12px;"
228228
>
229229
<button
230-
class="ant-btn ant-btn-default basic-button-wrapper css-geipcv"
230+
class="ant-btn ant-btn-default basic-button-wrapper css-1vnelmv"
231231
type="button"
232232
>
233233
<span>
@@ -239,7 +239,7 @@ exports[`base/System/GlobalSetting/PersonalSMS render init snap 1`] = `
239239
class="ant-space-item"
240240
>
241241
<button
242-
class="ant-btn ant-btn-primary basic-button-wrapper css-geipcv"
242+
class="ant-btn ant-btn-primary basic-button-wrapper css-1vnelmv"
243243
type="submit"
244244
>
245245
<span>

‎packages/base/src/page/Account/__snapshots__/index.ce.test.tsx.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
2424
>
2525
账户基本信息
2626
<button
27-
class="ant-btn ant-btn-primary basic-button-wrapper css-geipcv"
27+
class="ant-btn ant-btn-primary basic-button-wrapper css-1vnelmv"
2828
type="button"
2929
>
3030
<span>
@@ -67,7 +67,7 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
6767
class="ant-space-item"
6868
>
6969
<button
70-
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-geipcv"
70+
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-1vnelmv"
7171
hidden=""
7272
type="button"
7373
>
@@ -119,7 +119,7 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
119119
class="ant-space-item"
120120
>
121121
<button
122-
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-geipcv"
122+
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-1vnelmv"
123123
hidden=""
124124
type="button"
125125
>
@@ -171,7 +171,7 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
171171
class="ant-space-item"
172172
>
173173
<button
174-
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-geipcv"
174+
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-1vnelmv"
175175
hidden=""
176176
type="button"
177177
>
@@ -223,7 +223,7 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
223223
class="ant-space-item"
224224
>
225225
<button
226-
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-geipcv"
226+
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-1vnelmv"
227227
hidden=""
228228
type="button"
229229
>
@@ -267,7 +267,7 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
267267
</div>
268268
</div>
269269
<button
270-
class="ant-btn ant-btn-primary basic-button-wrapper css-geipcv"
270+
class="ant-btn ant-btn-primary basic-button-wrapper css-1vnelmv"
271271
type="button"
272272
>
273273
<span>
@@ -390,7 +390,7 @@ exports[`test base/page/Account ce should match snapshot 1`] = `
390390
class="ant-space-item"
391391
>
392392
<button
393-
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-geipcv"
393+
class="ant-btn ant-btn-default ant-btn-icon-only config-item-filed-edit-button basic-button-wrapper css-1vnelmv"
394394
hidden=""
395395
type="button"
396396
>

0 commit comments

Comments
 (0)