Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 一些样式和行为调整 #91

Merged
merged 142 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
9dde8a9
feat: 资源配置页代码编辑器静态样式
Carlmac Jul 16, 2024
2f9afe7
feat: 调整样式
Carlmac Jul 17, 2024
ad95bb3
feat: 编辑器行号左侧 linting 提示静态样式
Carlmac Jul 17, 2024
a67e661
feat: 编辑器跳转和高亮
Carlmac Jul 17, 2024
b23cf5d
feat: 编辑器错误消息台开关逻辑及滚动条样式
Carlmac Jul 18, 2024
2dafdc3
feat: 编辑器错误消息行号解析
Carlmac Jul 18, 2024
6389d6e
feat: 完成编辑器错误代码行高亮及跳转
Carlmac Jul 19, 2024
842ccf7
feat: 错误消息显示行号列号
Carlmac Jul 19, 2024
20ebaed
feat: 代码校验后可选择是否跳转
Carlmac Jul 19, 2024
035dc7f
feat: 代码校验失败禁止跳转,行号推导逻辑优化
Carlmac Jul 19, 2024
60f4727
feat: 用正则重写行号解析逻辑
Carlmac Jul 22, 2024
c995335
feat: 搜索面板切换逻辑
Carlmac Jul 22, 2024
89d86f7
fix: 修复代码样式
Carlmac Jul 23, 2024
3b14aa3
feat: 编辑器页新样式
Carlmac Jul 23, 2024
df0206a
feat: “导入资源配置”页基本样式
Carlmac Jul 23, 2024
552e4bf
feat: 表头批量修改 config 的 UI
Carlmac Jul 24, 2024
d4c1ecc
chore: 整理代码
Carlmac Jul 24, 2024
cc3ea17
feat: 批量修改认证和公开设置
Carlmac Jul 24, 2024
562d06a
feat: 资源编辑逻辑
Carlmac Jul 24, 2024
403cc4f
fix: 修复 footer 样式
Carlmac Jul 24, 2024
5da693c
feat: 资源名称路径快筛
Carlmac Jul 25, 2024
52c0325
feat: 插件列 Tooltip 显示插件名称
Carlmac Jul 25, 2024
15786cb
feat: 导入确认 Dialog
Carlmac Jul 25, 2024
983921d
feat: 文本高亮
Carlmac Jul 25, 2024
9cd2823
feat: 接口文档 Slider
Carlmac Jul 25, 2024
5e78389
feat: 覆盖文档的 Switcher
Carlmac Jul 25, 2024
92c9496
chore: 整理代码
Carlmac Jul 25, 2024
28e624b
feat: 编辑器语法校验button及校验通过消息
Carlmac Jul 25, 2024
0506c81
feat: 编辑器语法校验button及校验通过消息
Carlmac Jul 25, 2024
1a90589
feat: 语法校验按钮的loading/disabled状态
Carlmac Jul 26, 2024
8acd778
feat: 把 json_path 展示到错误消息中
Carlmac Jul 26, 2024
5a2b2d4
fix: 修复行号解析逻辑
Carlmac Jul 26, 2024
9b8c2b9
fix: 修复router报错
Carlmac Jul 26, 2024
1e68005
refactor: 优化并列的 await 调用
Carlmac Jul 26, 2024
6fa4e65
merge: 合并
Carlmac Jul 26, 2024
547e202
feat: 编辑器错误消息跳转按钮
Carlmac Jul 26, 2024
014b962
feat: 编辑器全屏功能
Carlmac Jul 26, 2024
bcae4c1
fix: 修复样式
Carlmac Jul 26, 2024
4cfed67
feat: 更新 i18n 翻译
Carlmac Jul 29, 2024
56f194e
feat: 切换字号功能
Carlmac Jul 29, 2024
31d4115
feat: 切换字号功能
Carlmac Jul 29, 2024
7cfc311
feat: 错误消息栏自动折叠
Carlmac Jul 29, 2024
4f95fec
Merge branch 'ft_editor' into ft_resource_import
Carlmac Jul 29, 2024
4056179
refactor: 优化i18n插值调用
Carlmac Jul 29, 2024
27d9ee0
fix: 修复编辑器 ResizeLayout 折叠后的高度错误问题
Carlmac Jul 29, 2024
be0b5c2
Merge branch 'master' into ft_resource_import
Carlmac Jul 29, 2024
e92432d
Merge branch 'master' into ft_resource_import
Carlmac Jul 29, 2024
fa2cfef
Merge Master
Carlmac Jul 29, 2024
8644c1b
Merge Master
Carlmac Jul 29, 2024
98cbb97
fix: 修复编辑器错误消息不能折叠/展开的问题
Carlmac Jul 30, 2024
f2ef848
fix: 修复对数组成员的行号解析错误问题
Carlmac Jul 30, 2024
6854cd7
fix: 修复对数组成员的行号解析错误问题
Carlmac Jul 30, 2024
b30d787
feat: 优化编辑器行号解析逻辑
Carlmac Jul 30, 2024
c934f69
Merge branch 'refs/heads/ft_editor' into ft_resource_import
Carlmac Jul 30, 2024
a12cc84
Merge branch 'master' into ft_resource_import
Carlmac Jul 30, 2024
5f3161f
Merge branch 'master' into ft_resource_import
Carlmac Jul 30, 2024
c517ed7
chore: 整理代码
Carlmac Jul 30, 2024
5de154f
fix: 修复整数判断
Carlmac Jul 30, 2024
e03c6b5
Merge branch 'master' into ft_resource_import
Carlmac Jul 31, 2024
80e0b3f
fix: 修复行号解析
Carlmac Jul 31, 2024
c12c066
fix: 修复代码校验按钮被遮挡的问题
Carlmac Jul 31, 2024
20f2c0b
Merge branch 'refs/heads/fix-line-number' into ft_resource_import
Carlmac Jul 31, 2024
c8ed286
fix: 修复资源配置修改不生效的问题
Carlmac Jul 31, 2024
ae71d4f
feat: 文档生成与语言选择
Carlmac Jul 31, 2024
43e7c88
feat: 表格翻页
Carlmac Jul 31, 2024
1fa5495
feat: 资源文档回归旧ui;表格展示“未生成”文本
Carlmac Jul 31, 2024
fcf8048
fix: 插件 tooltip 文本防错
Carlmac Jul 31, 2024
ce62725
feat: 表头 min-width
Carlmac Jul 31, 2024
6c1bb38
feat: 认证方式列 tooltip
Carlmac Jul 31, 2024
956af60
feat: 导入结果展示页
Carlmac Jul 31, 2024
ac85b79
fix: 步骤指示器固定宽度
Carlmac Aug 1, 2024
8b85fb2
fix: “上传文件”按钮样式
Carlmac Aug 1, 2024
d98e00e
feat: 添加语法校验前后的tooltip
Carlmac Aug 1, 2024
83d054c
deps(release-note): 更新release-note版本至beta14
Carlmac Aug 1, 2024
a2169f9
Merge branch 'refs/heads/update-release-note' into ft_resource_import
Carlmac Aug 1, 2024
dc5cc06
fix: 修复编辑器全屏后的边框
Carlmac Aug 1, 2024
b20e5b7
fix: 编辑器右上方工具改用用iconcool字体图标
Carlmac Aug 1, 2024
9394f14
feat: 更改编辑器消息跳转为切换光标位置
Carlmac Aug 1, 2024
2e64f88
fix: 修复确定导入dialog样式
Carlmac Aug 1, 2024
a6e9fa6
feat: 确定导入接口对接;结果页下载资源功能;i18n修复
Carlmac Aug 2, 2024
3ea1c8b
fix: 修复i18n翻译缺失
Carlmac Aug 2, 2024
3caf1ac
Merge branch 'master' into ft_resource_import
Carlmac Aug 2, 2024
edcdaf5
deps: yarn.lock
Carlmac Aug 2, 2024
417ee40
fix: 修复编辑器折叠区样式
Carlmac Aug 2, 2024
17e96bc
fix: 修复i18n
Carlmac Aug 2, 2024
9a08a87
fix: 返回编辑器页时自动折叠错误消息
Carlmac Aug 2, 2024
c0d302f
feat: 优化校验错误消息展示;语意化变量名
Carlmac Aug 2, 2024
5090d43
fix: 调整编辑器主题色和其他样式
Carlmac Aug 5, 2024
a56f2ef
fix: 修复类型错误
Carlmac Aug 5, 2024
c9a74ec
fix: 调整列宽;修复i18n
Carlmac Aug 5, 2024
2e04266
feat: 编辑器glyph动态更改
Carlmac Aug 5, 2024
b64786e
fix: 去掉重复tooltip
Carlmac Aug 5, 2024
c7bff30
feat: 优化导出dialog文本
Carlmac Aug 5, 2024
0254b4a
feat: 替换图标,调整样式
Carlmac Aug 5, 2024
29ec95d
feat: 替换字体图标;编辑器glyph图标
Carlmac Aug 5, 2024
980b39a
fix: 修正图标和样式
Carlmac Aug 5, 2024
45c6858
feat: 资源确认页重构
Carlmac Aug 5, 2024
de8d772
fix: 修复折叠区错误
Carlmac Aug 5, 2024
cd8d715
fix: 修复文档列单元格样式
Carlmac Aug 5, 2024
e3f51e1
feat: 编辑配置slider样式
Carlmac Aug 5, 2024
f7eb9b8
fix: 调整popover样式
Carlmac Aug 5, 2024
74f3e4a
fix: 修复vue-router无法使用的问题
Carlmac Aug 6, 2024
0f7fa82
feat: 导入中离开页面时的info提示
Carlmac Aug 6, 2024
cadb998
fix: 补充表单描述
Carlmac Aug 6, 2024
2dcdfca
fix: 修复编辑后端服务错误的问题
Carlmac Aug 6, 2024
f6e1460
chore: 清理多余代码
Carlmac Aug 6, 2024
ccfae32
fix: 修复地址校验错误后不清除提示的问题
Carlmac Aug 6, 2024
f89040d
fix: 修复便签编辑select失焦后input不随之失焦的问题
Carlmac Aug 6, 2024
f678cbe
feat: 标签列最小宽度
Carlmac Aug 6, 2024
e34d8e8
fix: 修复资源文档编辑器高度问题
Carlmac Aug 6, 2024
587c611
feat: 资源导入确认页只展示查看态文档
Carlmac Aug 6, 2024
df61b17
fix: 修复行号解析逻辑
Carlmac Aug 6, 2024
423093c
fix: 修复行号解析逻辑(2)
Carlmac Aug 6, 2024
497c208
fix: 修复行号解析逻辑(3)
Carlmac Aug 6, 2024
067cfa3
Merge branch 'master' into ft_resource_import
Carlmac Aug 6, 2024
61ddb22
Merge branch 'master' into ft_resource_import
Carlmac Aug 6, 2024
235a803
fix: ESLint & style & v-if/v-show
Carlmac Aug 7, 2024
517bfa3
Merge branch 'master' into ft_resource_import
Carlmac Aug 7, 2024
e5e8adf
fix: 修复代码校验报错逻辑
Carlmac Aug 7, 2024
1db3bb4
fix: 去掉错误消息 all 计数
Carlmac Aug 7, 2024
6285ee0
feat: 文档预览部分逻辑
Carlmac Aug 7, 2024
4d6b7e5
feat: 完成文档预览逻辑
Carlmac Aug 7, 2024
3bb4fb7
feat: 完成插件预览功能
Carlmac Aug 7, 2024
cf585e4
feat: 资源页表格条数按视口高度自适应
Carlmac Aug 8, 2024
aba88c6
Merge branch 'refs/heads/master' into ft_resource_import
Carlmac Aug 9, 2024
d2a6bf4
fix: 修复资源文档编辑器样式
Carlmac Aug 9, 2024
e1c8d2b
fix: 更换上传文件button图标
Carlmac Aug 12, 2024
4222cce
feat: 自动隐藏折叠按钮;修复一些行为和样式
Carlmac Aug 12, 2024
3bd1980
feat: 折叠区 min max 范围
Carlmac Aug 12, 2024
e842d75
feat: 折叠区拖动时显示蓝线
Carlmac Aug 12, 2024
c05a5c7
fix: 修复logo英文文本错误
Carlmac Aug 12, 2024
c4e3419
Merge branch 'refs/heads/master' into ft_resource_import
Carlmac Aug 12, 2024
d2d1241
Merge branch 'refs/heads/master' into ft_resource_import
Carlmac Aug 12, 2024
f62f498
fix: 修复行号解析逻辑
Carlmac Aug 12, 2024
b8c4a77
fix: 修复i18n
Carlmac Aug 13, 2024
507c5f6
fix: 更换资源发布确认弹窗样式
Carlmac Aug 13, 2024
0435eb3
fix: 修复图标样式
Carlmac Aug 13, 2024
c99e726
Merge branch 'master' into ft_resource_import
Carlmac Aug 13, 2024
56bf254
Merge branch 'master' into ft_resource_import
Carlmac Aug 13, 2024
b30b83f
Merge branch 'master' into ft_resource_import
Carlmac Aug 14, 2024
8de57c3
fix: 调整资源导入页样式
Carlmac Aug 14, 2024
b9248a3
fix: 调整资源导入页样式
Carlmac Aug 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ watch(() => props.isSliderShow, (val) => {
padding: 24px 24px 0 24px;

:deep(.collapse-cls) {
margin-bottom: 52px;
margin-bottom: 24px;

.bk-collapse-item {
background: #fff;
Expand Down
26 changes: 19 additions & 7 deletions src/dashboard-front/src/views/resource/setting/import.vue
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,6 @@
v-if="curView === 'resources'"
>
<bk-button
class="mr10"
theme="primary"
type="button"
:disabled="(tableDataToAdd.length < 1) && (tableDataToUpdate.length < 1)"
Expand Down Expand Up @@ -1577,10 +1576,14 @@ const handleErrorCountClick = (type: CodeErrorMsgType) => {
activeCodeMsgType.value = (type === activeCodeMsgType.value) ? 'All' : type;
activeVisibleErrorMsgIndex.value = -1;
updateEditorDecorations();
// 如果有错误消息,点击后可以展开错误消息栏
if (isEditorMsgCollapsed && visibleErrorReasons.value.length > 0) {
// 如果有错误消息,点击后可以展开/收起错误消息栏
if (visibleErrorReasons.value.length > 0) {
nextTick(() => {
resizeLayoutRef?.value?.setCollapse(false);
if (isEditorMsgCollapsed) {
resizeLayoutRef.value?.setCollapse(false);
} else {
resizeLayoutRef.value?.setCollapse(true);
}
});
}
};
Expand Down Expand Up @@ -1893,6 +1896,12 @@ const handleReturnClick = () => {
bottom: 0;
padding-left: 48px;
border-top: 1px solid #DCDEE5;

.page-actions {
display: flex;
align-items: center;
gap: 8px;
}
}
}

Expand Down Expand Up @@ -2109,8 +2118,11 @@ const handleReturnClick = () => {
:deep(.bk-resize-layout > .bk-resize-layout-aside .bk-resize-collapse) {
margin-bottom: 9px;
margin-left: -16px;
background: #1a1a1a;
box-shadow: 0 0 2px 0 rgba(255, 255, 255, 0.1);
background: #313238;

&:hover {
background-color: #63656E;
}
}

&.hide-collapse-btn {
Expand Down Expand Up @@ -2177,7 +2189,7 @@ const handleReturnClick = () => {
.res-counter-banner {
height: 40px;
padding: 0 24px 0 12px;
margin-bottom: 8px;
margin-bottom: 16px;
display: flex;
justify-content: space-between;
align-items: center;
Expand Down
Loading