Skip to content

Commit

Permalink
Fix 一些样式和行为调整 (#91)
Browse files Browse the repository at this point in the history 
* feat: 资源配置页代码编辑器静态样式

* feat: 调整样式

* feat: 编辑器行号左侧 linting 提示静态样式

* feat: 编辑器跳转和高亮

* feat: 编辑器错误消息台开关逻辑及滚动条样式

* feat: 编辑器错误消息行号解析

* feat: 完成编辑器错误代码行高亮及跳转

* feat: 错误消息显示行号列号

* feat: 代码校验后可选择是否跳转

* feat: 代码校验失败禁止跳转，行号推导逻辑优化

* feat: 用正则重写行号解析逻辑

* feat: 搜索面板切换逻辑

* fix: 修复代码样式

* feat: 编辑器页新样式

* feat: “导入资源配置”页基本样式

* feat: 表头批量修改 config 的 UI

* chore: 整理代码

* feat: 批量修改认证和公开设置

* feat: 资源编辑逻辑

* fix: 修复 footer 样式

* feat: 资源名称路径快筛

* feat: 插件列 Tooltip 显示插件名称

* feat: 导入确认 Dialog

* feat: 文本高亮

* feat: 接口文档 Slider

* feat: 覆盖文档的 Switcher

* chore: 整理代码

* feat: 编辑器语法校验button及校验通过消息

* feat: 编辑器语法校验button及校验通过消息
# Reviewed, transaction id: 13205

* feat: 语法校验按钮的loading/disabled状态
# Reviewed, transaction id: 13212

* feat: 把 json_path 展示到错误消息中
# Reviewed, transaction id: 13214

* fix: 修复行号解析逻辑
# Reviewed, transaction id: 13215

* fix: 修复router报错
# Reviewed, transaction id: 13224

* refactor: 优化并列的 await 调用
# Reviewed, transaction id: 13231

* feat: 编辑器错误消息跳转按钮

* feat: 编辑器全屏功能

* fix: 修复样式

* feat: 更新 i18n 翻译

* feat: 切换字号功能

* feat: 切换字号功能
# Reviewed, transaction id: 13338

* feat: 错误消息栏自动折叠

* refactor: 优化i18n插值调用
# Reviewed, transaction id: 13370

* fix: 修复编辑器 ResizeLayout 折叠后的高度错误问题
# Reviewed, transaction id: 13388

* Merge branch 'master' into ft_resource_import
, # Reviewed, transaction id: 13397

* Merge Master
, # Reviewed, transaction id: 13401

* fix: 修复编辑器错误消息不能折叠/展开的问题
# Reviewed, transaction id: 13437

* fix: 修复对数组成员的行号解析错误问题

* fix: 修复对数组成员的行号解析错误问题
# Reviewed, transaction id: 13466

* feat: 优化编辑器行号解析逻辑

* Merge branch 'master' into ft_resource_import
, # Reviewed, transaction id: 13507

* chore: 整理代码
# Reviewed, transaction id: 13509

* fix: 修复整数判断
# Reviewed, transaction id: 13517

* fix: 修复行号解析

* fix: 修复代码校验按钮被遮挡的问题

* fix: 修复资源配置修改不生效的问题

* feat: 文档生成与语言选择
# Reviewed, transaction id: 13594

* feat: 表格翻页
# Reviewed, transaction id: 13620

* feat: 资源文档回归旧ui；表格展示“未生成”文本

* fix: 插件 tooltip 文本防错

* feat: 表头 min-width

* feat: 认证方式列 tooltip

* feat: 导入结果展示页
# Reviewed, transaction id: 13691

* fix: 步骤指示器固定宽度

* fix: “上传文件”按钮样式

* feat: 添加语法校验前后的tooltip

* deps(release-note): 更新release-note版本至beta14
# Reviewed, transaction id: 13755

* fix: 修复编辑器全屏后的边框

* fix: 编辑器右上方工具改用用iconcool字体图标

* feat: 更改编辑器消息跳转为切换光标位置

* fix: 修复确定导入dialog样式
# Reviewed, transaction id: 13809

* feat: 确定导入接口对接；结果页下载资源功能；i18n修复

* fix: 修复i18n翻译缺失

* deps: yarn.lock
# Reviewed, transaction id: 13894

* fix: 修复编辑器折叠区样式

* fix: 修复i18n

* fix: 返回编辑器页时自动折叠错误消息

* feat: 优化校验错误消息展示；语意化变量名
# Reviewed, transaction id: 13932

* fix: 调整编辑器主题色和其他样式

* fix: 修复类型错误

* fix: 调整列宽；修复i18n

* feat: 编辑器glyph动态更改

* fix: 去掉重复tooltip

* feat: 优化导出dialog文本

* feat: 替换图标，调整样式

* feat: 替换字体图标；编辑器glyph图标

* fix: 修正图标和样式

* feat: 资源确认页重构

* fix: 修复折叠区错误

* fix: 修复文档列单元格样式

* feat: 编辑配置slider样式

* fix: 调整popover样式
# Reviewed, transaction id: 14126

* fix: 修复vue-router无法使用的问题
# Reviewed, transaction id: 14155

* feat: 导入中离开页面时的info提示

* fix: 补充表单描述

* fix: 修复编辑后端服务错误的问题

* chore: 清理多余代码

* fix: 修复地址校验错误后不清除提示的问题

* fix: 修复便签编辑select失焦后input不随之失焦的问题
# Reviewed, transaction id: 14214

* feat: 标签列最小宽度

* fix: 修复资源文档编辑器高度问题

* feat: 资源导入确认页只展示查看态文档

* fix: 修复行号解析逻辑

* fix: 修复行号解析逻辑(2)

* fix: 修复行号解析逻辑(3)
# Reviewed, transaction id: 14274

* Merge branch 'master' into ft_resource_import
, # Reviewed, transaction id: 14276

* fix: ESLint & style & v-if/v-show
# Reviewed, transaction id: 14291

* fix: 修复代码校验报错逻辑

* fix: 去掉错误消息 all 计数

* feat: 文档预览部分逻辑

* feat: 完成文档预览逻辑

* feat: 完成插件预览功能
# Reviewed, transaction id: 14456

* feat: 资源页表格条数按视口高度自适应
# Reviewed, transaction id: 14627

* fix: 修复资源文档编辑器样式
# Reviewed, transaction id: 14832

* fix: 更换上传文件button图标
# Reviewed, transaction id: 14918

* feat: 自动隐藏折叠按钮；修复一些行为和样式

* feat: 折叠区 min max 范围

* feat: 折叠区拖动时显示蓝线

* fix: 修复logo英文文本错误

* Merge branch 'refs/heads/master' into ft_resource_import
, # Reviewed, transaction id: 14990

* fix: 修复行号解析逻辑
# Reviewed, transaction id: 15027

* fix: 修复i18n

* fix: 更换资源发布确认弹窗样式
# Reviewed, transaction id: 15125

* fix: 修复图标样式
# Reviewed, transaction id: 15127

* Merge branch 'master' into ft_resource_import
, # Reviewed, transaction id: 15147

* fix: 调整资源导入页样式
# Reviewed, transaction id: 15242

* fix: 调整资源导入页样式
# Reviewed, transaction id: 15265
  • Loading branch information
@Carlmac
Carlmac authored Aug 14, 2024
1 parent 886cd41 commit ac9b794
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/dashboard-front/src/views/resource/setting/comps/edit-import-resource-side-slider.vue
View file
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
View file
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

0 comments on commit ac9b794

Please sign in to comment.