diff --git a/package.json b/package.json index c9c79fb57bc12948418e9c8836dc3804e33dd605..e558394bd2209ce602d1f5e343ab427dd4a506f6 100755 --- a/package.json +++ b/package.json @@ -88,8 +88,9 @@ "@babel/eslint-parser": "^7.12.16", "@babel/plugin-transform-runtime": "^7.24.3", "@babel/preset-env": "^7.24.5", - "@rsbuild/core": "^0.6.15", - "@rsbuild/plugin-vue2": "^0.6.15", + "@rsbuild/core": "^1.2.4", + "@rsbuild/plugin-less": "^1.1.0", + "@rsbuild/plugin-vue2": "^1.0.2", "@vue/cli-plugin-babel": "~5.0.6", "@vue/cli-plugin-eslint": "^5.0.6", "@vue/cli-service": "~5.0.6", diff --git a/rsbuild.config.ts b/rsbuild.config.ts index 9fe0ac18a13b157925671de228c9b1e5a4f16581..734d87bf484f9ff72121831ec488b207d7569bba 100644 --- a/rsbuild.config.ts +++ b/rsbuild.config.ts @@ -1,6 +1,6 @@ -import { rspack } from '@rsbuild/core'; -import { defineConfig } from '@rsbuild/core'; +import { rspack, defineConfig } from '@rsbuild/core'; import { pluginVue2 } from '@rsbuild/plugin-vue2'; +import { pluginLess } from '@rsbuild/plugin-less'; let commercialModule = './src/commercial-module'; import path from 'path'; import glob from 'glob'; @@ -114,7 +114,21 @@ const copyFavicon = faviconPath ? [ } ] : []; export default defineConfig({ - plugins: [pluginVue2()], + plugins: [pluginVue2(), pluginLess({ + lessLoaderOptions: { + lessOptions: { + javascriptEnabled: true, + globalVars: { + 'top-height': '50px', + 'actionbar-height': '50px', + 'space-normal': '16px', + 'space-md': '12px', + 'space-sm': '10px', + 'space-icon': '3px' + } + } + } + })], html: { template: './public/rs-index.html', title: pageTitle, @@ -136,19 +150,6 @@ export default defineConfig({ patterns: [...copyRsPack, ...copyFavicon] }) ] - }, - less: { - lessOptions: { - javascriptEnabled: true, - globalVars: { - 'top-height': '50px', - 'actionbar-height': '50px', - 'space-normal': '16px', - 'space-md': '12px', - 'space-sm': '10px', - 'space-icon': '3px' - } - } } }, source: { @@ -217,5 +218,17 @@ export default defineConfig({ wasm: 'resource/js', css: 'resource/css' } + }, + resolve: { + alias: { + /** + * 解决报错：You are using the runtime-only build of Vue where the template compiler is not available. Either pre-compile the templates into render functions, or use the compiler-included build. + * vue/dist/vue.esm.js 表示完整版的vue文件，同时包含编辑器和运行时的版本 + * + * 解决错误的原理：通过设置这个别名，让项目从引入 Runtime-only 版本转变为引入包含编译器的 vue.esm.js 文件。 + * 这样，当代码中使用 template 选项定义模板字符串时，在运行时 Vue 就可以使用其自带的编译器将模板字符串编译成渲染函数，从而避免了因缺少编译器而产生的错误 + * */ + 'vue$': 'vue/dist/vue.esm.js' // 将vue的模式改成运行时才编译，解决template动态编译模板的问题 + } } }); diff --git a/src/resources/assets/css/compare.less b/src/resources/assets/css/compare.less index 7fef16e201978491b111d3181d248f328919bdb4..15a6048e8e64d988bc2d6825762d777185f3e165 100644 --- a/src/resources/assets/css/compare.less +++ b/src/resources/assets/css/compare.less @@ -2,54 +2,54 @@ .theme(@success-color, @success-bg-color, @warning-bg-color,@error-color,@error-bg-color,@text){ .compare { padding-bottom: 16px; - /deep/ .bg-insert{ + ::v-deep .bg-insert{ background: @success-bg-color; color: @text; } - /deep/ .bg-delete{ + ::v-deep .bg-delete{ background: @error-bg-color; color: @text; } - /deep/ .bg-update{ + ::v-deep .bg-update{ background: @warning-bg-color; color: @text; } - /deep/ .bg-fillblank{ + ::v-deep .bg-fillblank{ opacity: 0; } - /deep/ .insert { + ::v-deep .insert { color: @success-color; } - /deep/ .delete { + ::v-deep .delete { color: @error-color; } - /deep/ .update { + ::v-deep .update { color: @warning-color; } - /deep/ .fillblank { + ::v-deep .fillblank { opacity: 0; pointer-events: none; } - /deep/ tr.insert{ + ::v-deep tr.insert{ background: @success-bg-color; } - /deep/ tr.update{ + ::v-deep tr.update{ background: @warning-bg-color; } - /deep/ tr.delete{ + ::v-deep tr.delete{ background: @error-bg-color; } - /deep/ .nav-insert { + ::v-deep .nav-insert { background: @success-bg-color; } - /deep/ .nav-change { + ::v-deep .nav-change { background: @warning-bg-color; } - /deep/ .nav-update { + ::v-deep .nav-update { background: @warning-bg-color; } - /deep/ .nav-delete { + ::v-deep .nav-delete { background: @error-bg-color; } .table-insert { diff --git a/src/resources/assets/css/process/taskdispatch.less b/src/resources/assets/css/process/taskdispatch.less index 3609bdca34300467b04d93a0497fddb850b23c5c..1de04d08bd325d566bb5d5ef0d9c776040af1e96 100644 --- a/src/resources/assets/css/process/taskdispatch.less +++ b/src/resources/assets/css/process/taskdispatch.less @@ -169,7 +169,7 @@ height: 100%; } - /deep/ .tscontain-body { + ::v-deep .tscontain-body { overflow-y: hidden; } } diff --git a/src/resources/base.md b/src/resources/base.md index 57e64453c77b1c868d87feb96141a97737141fff..b1c56a5baab7d7ba5c470ca6839b7fcf1fdaaed9 100644 --- a/src/resources/base.md +++ b/src/resources/base.md @@ -1,213 +1,213 @@ # 全局基础样式、方法 -## 全局通用样式 ->>> 页面栅格布局说明:(sm:800px,md:1024px,lg:1280px,xl:1400px,xxl:1920px) +## 样式传透 + +rsbuild升级到v1版本之后，内置的less从v3升级到v4，导致`/deep/`样式的传透失效，所以后续需要使用`::v-deep`来实现样式的传透。 + + +## 全局通用样式 + +> > > 页面栅格布局说明:(sm:800px,md:1024px,lg:1280px,xl:1400px,xxl:1920px) + #### 通用类样式class -class名|用途|说明 -:---:|:---:|:---| -h1|特大标题(登录页系统)|字号28行高36| -h2|弹窗对话框标题文字|字号18行高26| -h3|大屏展示统计图标题、大标题|字号16行高24| -h4|一二级菜单|字号14行高22| -fz10|提示类文字|字号10（待调整）| -fz16 | 无 | 字号16 -fz18 | 无 | 字号18 -fz20 | 无 | 字号20 -text|正文、基本字号|字号13行高21| -tips|表格头部、错误提示|字号12行高20| -cursor-pointer | 鼠标上移显示可点击的手型 | 悬浮于连接上时，手 +| class名 | 用途 | 说明 | +| :------------: | :------------------------: | :----------------- | +| h1 | 特大标题(登录页系统) | 字号28行高36 | +| h2 | 弹窗对话框标题文字 | 字号18行高26 | +| h3 | 大屏展示统计图标题、大标题 | 字号16行高24 | +| h4 | 一二级菜单 | 字号14行高22 | +| fz10 | 提示类文字 | 字号10（待调整） | +| fz16 | 无 | 字号16 | +| fz18 | 无 | 字号18 | +| fz20 | 无 | 字号20 | +| text | 正文、基本字号 | 字号13行高21 | +| tips | 表格头部、错误提示 | 字号12行高20 | +| cursor-pointer | 鼠标上移显示可点击的手型 | 悬浮于连接上时，手 | #### 通用类颜色样式class -class名|用途|说明 -:---:|:---:|:---| -text-title|标题字体|颜色为标题色，比正文字体颜色深| -text-action|可操作类文字|默认正文颜色，移上去变可点击的蓝色+pointer| -text-href |跳转类文字|字体颜色可点击颜色+移上去pointer| -text-white|白色文字|不会随主题色发生改变的白色，目前是#fff| -text-op|相反色|适用于需要根据主题色改变的反色| -text-disabled|不可操作文字|移上去鼠标显示不可操作+0.6透明度| -text-info|info颜色字体|-| -text-primary|主题色字体|-| -text-success|绿色成功色字体|-| -text-danger|红色告警色字体|-| -text-warning|橙色告警色字体|-| -text-error|红色错误色字体|-| -border-error|红色边框|-| -border-primary|主题色边框|-| -text-tip|提示类文字，颜色浅色|跟着主题走| -text-grey|提示类文字|此class尽量少用，早期class，用text-tip| -text-tip-active|提示类文字，颜色浅色，移上去后显示主题色移上去交互，提供提示类问题可激活样式|跟着主题走| -require-label|必填的文字（会在左边带一个*必填的提示），后期调整ui把提示的红色字体去掉|跟着主题走| -bg-grey|背景色灰色|-| -bg-tip-grey|提示灰色背景（弱化）|-| -bg-hover-grey|移上去背景色为灰色|-| -bg-op|背景色与字体颜色相反（浅色主题为白色，深色主题为墨蓝色）|-| -bg-block|主体区域的块状元素的背景色（目前是浅灰色）|-| -bg-info|蓝色背景|-| -bg-info-grey|浅蓝色背景|用于蓝色背景（弱化）| -bg-success|绿色背景|-| -bg-success-grey|浅绿色背景|用于绿色背景（弱化）| -bg-warning|橙色色背景|-| -bg-warning-grey|浅橙色背景|用于橙色背景（弱化）| -bg-error|红色背景|-| -bg-error-grey|浅红色背景|用于红色背景（弱化）| -bg-code|代码片段的背景色|-| -bg-selected|选中的带浅色主题色背景色的样式|适用于部分场景选中只需要背景色| -item-selected|选中的主题色字体颜色带浅色背景色的样式|适用于部分场景选中需要背景色+字体颜色| -bg-modal|模态窗背景色|非白的，浅浅灰| -bg-footer-btn|卡片式的底部操作栏背景色|前期为白色后期调整为浅灰色| -lh-2|行高2倍字号|用于有时候需要文字行高比一般的高一些（比如空数据提示等）| -input-border |输入框需要带边框|不推荐使用（早期风格为整体底框时专门处理需要四边框的输入框用） +| class名 | 用途 | 说明 | +| :-------------: | :--------------------------------------------------------------------------: | :------------------------------------------------------------- | +| text-title | 标题字体 | 颜色为标题色，比正文字体颜色深 | +| text-action | 可操作类文字 | 默认正文颜色，移上去变可点击的蓝色+pointer | +| text-href | 跳转类文字 | 字体颜色可点击颜色+移上去pointer | +| text-white | 白色文字 | 不会随主题色发生改变的白色，目前是#fff | +| text-op | 相反色 | 适用于需要根据主题色改变的反色 | +| text-disabled | 不可操作文字 | 移上去鼠标显示不可操作+0.6透明度 | +| text-info | info颜色字体 | - | +| text-primary | 主题色字体 | - | +| text-success | 绿色成功色字体 | - | +| text-danger | 红色告警色字体 | - | +| text-warning | 橙色告警色字体 | - | +| text-error | 红色错误色字体 | - | +| border-error | 红色边框 | - | +| border-primary | 主题色边框 | - | +| text-tip | 提示类文字，颜色浅色 | 跟着主题走 | +| text-grey | 提示类文字 | 此class尽量少用，早期class，用text-tip | +| text-tip-active | 提示类文字，颜色浅色，移上去后显示主题色移上去交互，提供提示类问题可激活样式 | 跟着主题走 | +| require-label | 必填的文字（会在左边带一个\*必填的提示），后期调整ui把提示的红色字体去掉 | 跟着主题走 | +| bg-grey | 背景色灰色 | - | +| bg-tip-grey | 提示灰色背景（弱化） | - | +| bg-hover-grey | 移上去背景色为灰色 | - | +| bg-op | 背景色与字体颜色相反（浅色主题为白色，深色主题为墨蓝色） | - | +| bg-block | 主体区域的块状元素的背景色（目前是浅灰色） | - | +| bg-info | 蓝色背景 | - | +| bg-info-grey | 浅蓝色背景 | 用于蓝色背景（弱化） | +| bg-success | 绿色背景 | - | +| bg-success-grey | 浅绿色背景 | 用于绿色背景（弱化） | +| bg-warning | 橙色色背景 | - | +| bg-warning-grey | 浅橙色背景 | 用于橙色背景（弱化） | +| bg-error | 红色背景 | - | +| bg-error-grey | 浅红色背景 | 用于红色背景（弱化） | +| bg-code | 代码片段的背景色 | - | +| bg-selected | 选中的带浅色主题色背景色的样式 | 适用于部分场景选中只需要背景色 | +| item-selected | 选中的主题色字体颜色带浅色背景色的样式 | 适用于部分场景选中需要背景色+字体颜色 | +| bg-modal | 模态窗背景色 | 非白的，浅浅灰 | +| bg-footer-btn | 卡片式的底部操作栏背景色 | 前期为白色后期调整为浅灰色 | +| lh-2 | 行高2倍字号 | 用于有时候需要文字行高比一般的高一些（比如空数据提示等） | +| input-border | 输入框需要带边框 | 不推荐使用（早期风格为整体底框时专门处理需要四边框的输入框用） | #### 场景类样式class ##### 页面排版涉及到圆角弧度,边框，阴影 -class名|用途|说明 -:---:|:---:|:---| -radius-lg|圆角10px,用于大块的元素| -radius-md|圆角8px,一般用于table，卡片等等| -radius-sm|圆角6px,一般用于条状元素，比如操作栏、输入框等等| -radius-mi|圆角4px,一般用于按钮| -block-border|块状元素边框|-| -shadow|块状元素阴影|-| - +| class名 | 用途 | 说明 | +| :----------: | :----------------------------------------------: | :--- | +| radius-lg | 圆角10px,用于大块的元素 | +| radius-md | 圆角8px,一般用于table，卡片等等 | +| radius-sm | 圆角6px,一般用于条状元素，比如操作栏、输入框等等 | +| radius-mi | 圆角4px,一般用于按钮 | +| block-border | 块状元素边框 | - | +| shadow | 块状元素阴影 | - | ##### 超过内容区域显示处理 -class名|用途|说明 -:---:|:---:|:---| -overflow|超过宽度显示省略号|-| -line-2|超过2行显示省略号|以2倍行高为标准| -line-3|超过3行显示省略号|以3倍行高为标准| -block-add|添加按钮块状样式|需要独占一行的| -tsscroll-container|如果溢出则出现滚动条|该样式处理了滚动条样式| +| class名 | 用途 | 说明 | +| :----------------: | :------------------: | :--------------------- | +| overflow | 超过宽度显示省略号 | - | +| line-2 | 超过2行显示省略号 | 以2倍行高为标准 | +| line-3 | 超过3行显示省略号 | 以3倍行高为标准 | +| block-add | 添加按钮块状样式 | 需要独占一行的 | +| tsscroll-container | 如果溢出则出现滚动条 | 该样式处理了滚动条样式 | ##### 对齐方式 -class名|用途|说明 -:---:|:---:|:---| -clearfix|清除子级浮动造成的样式问题|-| -float-left|元素左浮动|父级元素需加上清除浮动的样式，比如加上clearfix的classname| -float-right|元素右浮动|父级元素需加上清除浮动的样式，比如加上clearfix的classname| -text-center|元素水平方向（横轴）居中对齐|-| -text-left|元素水平方向（横轴）左对齐|-| -text-right|元素水平方向（横轴）右对齐|-| -flex-start|flex布局下水平方向（横轴）元素开始方向对齐|-| -flex-end|flex布局下水平方向（横轴）元素结束方向对齐|-| -flex-center|flex布局下水平方向（横轴）元素中心对齐|-| -flex-between|flex布局下水平方向（横轴）项目位于各行之间留有空白的容器内|-| -flex-around|flex布局下水平方向（横轴）项目位于各行之前、之间、之后都留有空白的容器内|-| -align-start|flex布局下垂直方向（竖轴）顶对齐（开始方向对齐）|-| - +| class名 | 用途 | 说明 | +| :----------: | :----------------------------------------------------------------------: | :-------------------------------------------------------- | +| clearfix | 清除子级浮动造成的样式问题 | - | +| float-left | 元素左浮动 | 父级元素需加上清除浮动的样式，比如加上clearfix的classname | +| float-right | 元素右浮动 | 父级元素需加上清除浮动的样式，比如加上clearfix的classname | +| text-center | 元素水平方向（横轴）居中对齐 | - | +| text-left | 元素水平方向（横轴）左对齐 | - | +| text-right | 元素水平方向（横轴）右对齐 | - | +| flex-start | flex布局下水平方向（横轴）元素开始方向对齐 | - | +| flex-end | flex布局下水平方向（横轴）元素结束方向对齐 | - | +| flex-center | flex布局下水平方向（横轴）元素中心对齐 | - | +| flex-between | flex布局下水平方向（横轴）项目位于各行之间留有空白的容器内 | - | +| flex-around | flex布局下水平方向（横轴）项目位于各行之前、之间、之后都留有空白的容器内 | - | +| align-start | flex布局下垂直方向（竖轴）顶对齐（开始方向对齐） | - | ##### 间隙 + > p 前缀的表示 padding，t/r/b/l 分别表示 top/right/bottom/left (上右下左) 四个方向的边距 > m 前缀的表示 margin，t/r/b/l 分别表示 top/right/bottom/left (上右下左) 四个方向的边距 > 其中lg 表示 24像素，nm表示16像素，md表示12像素，sm表示10像素， xs表示6像素 -内边距类名|用途|说明 -:---:|:---:|:---| -padding-lg|内间隙最大尺寸|padding: 24px| -padding|内间距尺寸|padding: 16px| -padding-md|内间隙普通尺寸|padding: 12px| -padding-sm|内间隙小尺寸|padding: 10px，一般用于文字间隙| -padding-xs|内间隙较小|padding: 6px; 比如分页的页数之间的间隙| -pt-nm|上内间隙16px|padding-top: 16px;| -pb-nm|下内间隙16px|padding-bottom: 16px;| -pl-nm|左内间隙16px|padding-left: 16px;| -pr-nm|右内间隙16px|padding-right: 16px;| -pr-md|右内间隙普通尺寸|padding-right: 12px;| -pl-md|左内间隙普通尺寸|padding-left: 12px;| -pt-md|右内间隙普通尺寸|padding-top: 12px;| -pb-md|左内间隙普通尺寸|padding-bottom: 12px;| -pt-sm|上内间隙10px|padding-top: 10px;| -pb-sm|下内间隙10px|padding-bottom: 10px;| -pl-sm|左内间隙10px|padding-left: 10px;| -pr-sm|右内间隙10px|padding-right: 10px;| -pt-xs|上内间隙6px|padding-top: 6px;| -pb-xs|下内间隙6px|padding-bottom: 6px;| -pl-xs|左内间隙6px|padding-left: 6px;| -pr-xs|右内间隙6px|padding-right: 6px;| - - - -外边距类名|说明 -:---:|:---| -margin-lg| margin: 24px;| -margin-md| margin: 12px;| -margin-sm | margin: 10px| -mr-nm|margin-right: 16px;| -ml-nm|margin-left: 16px| -mt-nm|margin-top: 16px| -mb-nm|margin-bottom: 16px| -mr-md|margin-right: 12px;| -ml-md|margin-left: 12px| -mt-md|margin-top: 12px| -mb-md|margin-bottom: 12px| -mr-sm|margin-right: 10px;| -ml-sm|margin-left: 10px| -mt-sm|margin-top: 10px| -mb-sm|margin-bottom: 10px| -mr-xs|margin-right: 6px;| -ml-xs|margin-left: 6px| -mt-xs|margin-top: 6px| -mb-xs|margin-bottom: 6px| - +| 内边距类名 | 用途 | 说明 | +| :--------: | :--------------: | :------------------------------------- | +| padding-lg | 内间隙最大尺寸 | padding: 24px | +| padding | 内间距尺寸 | padding: 16px | +| padding-md | 内间隙普通尺寸 | padding: 12px | +| padding-sm | 内间隙小尺寸 | padding: 10px，一般用于文字间隙 | +| padding-xs | 内间隙较小 | padding: 6px; 比如分页的页数之间的间隙 | +| pt-nm | 上内间隙16px | padding-top: 16px; | +| pb-nm | 下内间隙16px | padding-bottom: 16px; | +| pl-nm | 左内间隙16px | padding-left: 16px; | +| pr-nm | 右内间隙16px | padding-right: 16px; | +| pr-md | 右内间隙普通尺寸 | padding-right: 12px; | +| pl-md | 左内间隙普通尺寸 | padding-left: 12px; | +| pt-md | 右内间隙普通尺寸 | padding-top: 12px; | +| pb-md | 左内间隙普通尺寸 | padding-bottom: 12px; | +| pt-sm | 上内间隙10px | padding-top: 10px; | +| pb-sm | 下内间隙10px | padding-bottom: 10px; | +| pl-sm | 左内间隙10px | padding-left: 10px; | +| pr-sm | 右内间隙10px | padding-right: 10px; | +| pt-xs | 上内间隙6px | padding-top: 6px; | +| pb-xs | 下内间隙6px | padding-bottom: 6px; | +| pl-xs | 左内间隙6px | padding-left: 6px; | +| pr-xs | 右内间隙6px | padding-right: 6px; | + +| 外边距类名 | 说明 | +| :--------: | :------------------ | +| margin-lg | margin: 24px; | +| margin-md | margin: 12px; | +| margin-sm | margin: 10px | +| mr-nm | margin-right: 16px; | +| ml-nm | margin-left: 16px | +| mt-nm | margin-top: 16px | +| mb-nm | margin-bottom: 16px | +| mr-md | margin-right: 12px; | +| ml-md | margin-left: 12px | +| mt-md | margin-top: 12px | +| mb-md | margin-bottom: 12px | +| mr-sm | margin-right: 10px; | +| ml-sm | margin-left: 10px | +| mt-sm | margin-top: 10px | +| mb-sm | margin-bottom: 10px | +| mr-xs | margin-right: 6px; | +| ml-xs | margin-left: 6px | +| mt-xs | margin-top: 6px | +| mb-xs | margin-bottom: 6px | ##### 图标文字间隙 -class名|用途|说明 -:---:|:---:|:---| -icon-right | 字体图标到右侧文案的间隙 | 间隙大小为4像素 - +| class名 | 用途 | 说明 | +| :--------: | :----------------------: | :-------------- | +| icon-right | 字体图标到右侧文案的间隙 | 间隙大小为4像素 | ##### 操作栏 -class名|用途|说明 -:---:|:---:|:---| -.action-group>.action-item*n(.disable)|操作分类组，常用于各种多个操作并列|禁用时action-item添加disable类名| +| class名 | 用途 | 说明 | +| :-------------------------------------: | :--------------------------------: | :------------------------------- | +| .action-group>.action-item\*n(.disable) | 操作分类组，常用于各种多个操作并列 | 禁用时action-item添加disable类名 | ##### 动画 ->调用：直接动画里加上动画名字，其他参数按照实际（比如：animation: water-wave linear infinite;） +> 调用：直接动画里加上动画名字，其他参数按照实际（比如：animation: water-wave linear infinite;） -动画名|用途|说明 -:---:|:---:|:---| -fade|渐明减暗效果|透明度从0.6到1的轮播，一般css这么写:animation: fade linear infinite;| -rocking|晃铃效果|一般css这么写:animation: rocking 2s;| -water-wave|水波纹效果|一般css这么写:animation: fade linear infinite;| -rubberBand|animatecss的rubberBand弹橡皮筋动画|一般css这么写:animation: rubberBand 1s;| +| 动画名 | 用途 | 说明 | +| :--------: | :--------------------------------: | :------------------------------------------------------------------- | +| fade | 渐明减暗效果 | 透明度从0.6到1的轮播，一般css这么写:animation: fade linear infinite; | +| rocking | 晃铃效果 | 一般css这么写:animation: rocking 2s; | +| water-wave | 水波纹效果 | 一般css这么写:animation: fade linear infinite; | +| rubberBand | animatecss的rubberBand弹橡皮筋动画 | 一般css这么写:animation: rubberBand 1s; | ##### 兼容老的样式的表单布局 -class名|用途|说明 -:---:|:---:|:---| -.form-block>(.block-left+.block-right)|左侧label（宽度120px）右侧表单或者文字的布局|不推荐使用| - -## 全局方法 +| class名 | 用途 | 说明 | +| :------------------------------------: | :------------------------------------------: | :--------- | +| .form-block>(.block-left+.block-right) | 左侧label（宽度120px）右侧表单或者文字的布局 | 不推荐使用 | +## 全局方法 #### 全局变量 -名称|用途|说明|其他 -:---:|:---:|:---:|:---| -TENANT|获取当前租户|通过当前浏览器的TENANT变量可以获取|-| -HOME|获取当前访问地址的前缀|目前是‘/租户’，主要用于写地址跳转时拼接路径前缀|-| -BASEURLPREFIX|获取默认接口前缀|目前是‘/租户’，api调用路径只需要从租户后的路径开始|例如：调用‘/租户/api/rest/auth/module/get’时，api入口的路径为：‘/api/rest/auth/module/get’| -BASELANGUAGES|获取当前页面的语言|目前支持中英文，zh/en| -MODULEID|获取当前模块的id|需要跟rest/auth/module/get的接口返回的对应当前模块的数据的group的值对应上|模块的英文键名| -MENUTYPE|获取当前的菜单的分类类型映射|为{key:分类名字,...}对象数据，需要跟左侧菜单的分类类型对应上，对应体现在路由的meta.type| - +| 名称 | 用途 | 说明 | 其他 | +| :-----------: | :--------------------------: | :-------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------- | +| TENANT | 获取当前租户 | 通过当前浏览器的TENANT变量可以获取 | - | +| HOME | 获取当前访问地址的前缀 | 目前是‘/租户’，主要用于写地址跳转时拼接路径前缀 | - | +| BASEURLPREFIX | 获取默认接口前缀 | 目前是‘/租户’，api调用路径只需要从租户后的路径开始 | 例如：调用‘/租户/api/rest/auth/module/get’时，api入口的路径为：‘/api/rest/auth/module/get’ | +| BASELANGUAGES | 获取当前页面的语言 | 目前支持中英文，zh/en | +| MODULEID | 获取当前模块的id | 需要跟rest/auth/module/get的接口返回的对应当前模块的数据的group的值对应上 | 模块的英文键名 | +| MENUTYPE | 获取当前的菜单的分类类型映射 | 为{key:分类名字,...}对象数据，需要跟左侧菜单的分类类型对应上，对应体现在路由的meta.type | +#### utils +> > > 模版调用方法： -#### utils ->>>模版调用方法： ```javascript this.$utils.*** ``` @@ -242,8 +242,7 @@ this.$utils.jumpDialog.call(this, { }, to, from, next, url); ``` - -## 全局指令 +## 全局指令 > download（点击从指定地址下载文件） @@ -262,36 +261,32 @@ downloaderror|下载接口回调失败回调事件|-|-| > clipboard（点击复制指定内容到剪切板供其他地方粘贴复制用） ```javascript - + ``` -参数|用途|使用|其他 -:---:|:---:|:---:|:---| -value|粘贴的内容|-|-| -ok|粘贴成功的回调事件|-|-| -error|粘贴失败的回调事件|-|-| - - +| 参数 | 用途 | 使用 | 其他 | +| :---: | :----------------: | :--: | :--- | +| value | 粘贴的内容 | - | - | +| ok | 粘贴成功的回调事件 | - | - | +| error | 粘贴失败的回调事件 | - | - | > img-viewer（图片预览，指令使用在需要预览图片的容器上，监听点击事件） ```javascript -
+
``` -参数|用途|使用|其他 -:---:|:---:|:---:|:---| - +| 参数 | 用途 | 使用 | 其他 | +| :--: | :--: | :--: | :--- | > scroll-hidden（容器滚动时隐藏drop的内容，指令使用在滚动的容器里面，监听滚动事件） ```javascript -
+
``` -参数|用途|使用|其他 -:---:|:---:|:---:|:---| - +| 参数 | 用途 | 使用 | 其他 | +| :--: | :--: | :--: | :--- | > v-auth 指令 （控制用户权限，指令使用在需要控制当前用户是否需要显示某个元素或者按钮） @@ -303,9 +298,7 @@ error|粘贴失败的回调事件|-|-| ``` - - -## 全局过滤器 +## 全局过滤器 参数|用途|使用|其他 :---:|:---:|:---:|:---| @@ -313,49 +306,45 @@ formatDate|时间格式处理|{{ 时间戳 \| formatDate(指定格式) }}|指定 formatTimeCost|处理耗时|{{ timeCost\|formatTimeCost({textUnit:’second’,valueUnit:’second’,unitType:’en’}) }}|通用场景：timecost为精确到毫秒的时间戳转化为标准时间格式，后面参数为非必填（默认显示文案单位textUnit为秒second、值的单位valueUnit为毫秒millisecond,单位语言类型默认为中文zh）更多设置：textUnit和valueUnit可供设置的有：{'day': '天','hour': '小时','minute': '分钟','second': '秒','millisecond': '毫秒'},unitType目前只支持中文zh和英文en| unescapeHtml|转义特殊字符为html|{{ 字符串 \| unescapeHtml}}|-| -## 全局状态管理 +## 全局状态管理 -用途|state.\*|示例| -:---:|:---:|:---| -获取当前用户权限列表|userAuthList|this.$store.getters.userAuthList| +| 用途 | state.\* | 示例 | +| :------------------: | :----------: | :------------------------------- | +| 获取当前用户权限列表 | userAuthList | this.$store.getters.userAuthList | ## 全局通用组件 -### 布局类 +### 布局类 #### 基础组件 -名称|用途|说明|其他 -:---:|:---:|:---:|:---| -TsContain|基本排版（页面最外层）|见TsContain组件api|全局组件，直接调用即可| -Button|按钮|iview的组件|全局组件，直接调用即可| -Tabs|标签页|iview的组件|全局组件，直接调用即可| -Dropdown|下拉菜单|iview的组件|全局组件，直接调用即可| -Badge|徽标数|iview的组件|全局组件，直接调用即可| -Loading|加载中组件|封装过的组件|全局组件，直接调用即可| -NoData|无数据提示组件|封装过的组件|全局组件，直接调用即可| - +| 名称 | 用途 | 说明 | 其他 | +| :-------: | :--------------------: | :----------------: | :--------------------- | +| TsContain | 基本排版（页面最外层） | 见TsContain组件api | 全局组件，直接调用即可 | +| Button | 按钮 | iview的组件 | 全局组件，直接调用即可 | +| Tabs | 标签页 | iview的组件 | 全局组件，直接调用即可 | +| Dropdown | 下拉菜单 | iview的组件 | 全局组件，直接调用即可 | +| Badge | 徽标数 | iview的组件 | 全局组件，直接调用即可 | +| Loading | 加载中组件 | 封装过的组件 | 全局组件，直接调用即可 | +| NoData | 无数据提示组件 | 封装过的组件 | 全局组件，直接调用即可 | #### 拓展定制组件 -名称|用途|说明|其他 -:---:|:---:|:---:|:---| -TsForm|表单组件|见TsForm组件api|需要注册组件| - - +| 名称 | 用途 | 说明 | 其他 | +| :----: | :------: | :-------------: | :----------- | +| TsForm | 表单组件 | 见TsForm组件api | 需要注册组件 | #### 表单搜索、选择类组件 -名称|用途|说明|其他 -:---:|:---:|:---:|:---| -CombineSearcher|组合下拉搜索|见CombineSearcher组件api|需要注册组件| -PoptipSelect|下拉选择器|见PoptipSelect组件api|一般用于固定选项下拉展开后有描述等内容，需要注册组件| -TimeSelect|时间下拉选择器|见TimeSelect组件api|一般用于选择固定时间范围和具体时间范围，需要注册组件| - +| 名称 | 用途 | 说明 | 其他 | +| :-------------: | :------------: | :----------------------: | :--------------------------------------------------- | +| CombineSearcher | 组合下拉搜索 | 见CombineSearcher组件api | 需要注册组件 | +| PoptipSelect | 下拉选择器 | 见PoptipSelect组件api | 一般用于固定选项下拉展开后有描述等内容，需要注册组件 | +| TimeSelect | 时间下拉选择器 | 见TimeSelect组件api | 一般用于选择固定时间范围和具体时间范围，需要注册组件 | #### 表格的类 -`tstable-container border bg-grey radius-lg` 然后 `table标签上` 添加类名`tstable-body`，最后记得在`tbody`标签上添加`tbody-main`类名 +`tstable-container border bg-grey radius-lg` 然后 `table标签上` 添加类名`tstable-body`，最后记得在`tbody`标签上添加`tbody-main`类名 ```vue
diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue index fbab58c3a847a54924205e7b1bfdaba36d6ec640..0ba61ab66e858772126f7363bc331b8a21e54266 100644 --- a/src/resources/components/CombineSearcher/CombineSearcher.vue +++ b/src/resources/components/CombineSearcher/CombineSearcher.vue @@ -692,7 +692,7 @@ export default { } } } - /deep/ .ivu-input-wrapper { + ::v-deep .ivu-input-wrapper { display: block; .ivu-input { height: 30px; @@ -721,7 +721,7 @@ export default { margin-right: 2px; } } - /deep/ .ivu-tag-text{ + ::v-deep .ivu-tag-text{ >*{ vertical-align: initial; } diff --git a/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue b/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue index f2744c6342f55e6e0d0c31a45fdd9adebfb6f445..c0beff03a89c0f1b584fa78663c7ce5101f99127 100644 --- a/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue +++ b/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue @@ -371,10 +371,10 @@ export default { } } } - /deep/ .ivu-checkbox { + ::v-deep .ivu-checkbox { line-height: revert; } - /deep/ .ivu-checkbox-checked .ivu-checkbox-inner:after { + ::v-deep .ivu-checkbox-checked .ivu-checkbox-inner:after { top: -1px; } } diff --git a/src/resources/components/Condition/condition-group.vue b/src/resources/components/Condition/condition-group.vue index 6b1d13c0068812670cd45996419e470c0971b47d..57db5ac870e1a06ca47dfeb4c6ccc8257236dafc 100644 --- a/src/resources/components/Condition/condition-group.vue +++ b/src/resources/components/Condition/condition-group.vue @@ -353,7 +353,7 @@ export default { diff --git a/src/resources/components/FormItems/time.vue b/src/resources/components/FormItems/time.vue index 3494378674f7725411b16fc75d9a48a70f31b350..d75252e11c03b0b066cb03735b1b38112e474b7e 100644 --- a/src/resources/components/FormItems/time.vue +++ b/src/resources/components/FormItems/time.vue @@ -106,7 +106,7 @@ export default { }; diff --git a/src/resources/components/FormMaker/formedit/items/date.vue b/src/resources/components/FormMaker/formedit/items/date.vue index e213c88c99922ebe823943f11340ac58e688baff..e11aa32ec531a72e33d31703b8b21c13ff2ca3f2 100644 --- a/src/resources/components/FormMaker/formedit/items/date.vue +++ b/src/resources/components/FormMaker/formedit/items/date.vue @@ -104,7 +104,7 @@ export default { }; diff --git a/src/resources/components/FormMaker/formedit/items/time.vue b/src/resources/components/FormMaker/formedit/items/time.vue index 354de15eb1a2d1db928f6d4e8da94c525ae94c76..40a71fdad651230ab4fb46b90a7e60a6178460dd 100644 --- a/src/resources/components/FormMaker/formedit/items/time.vue +++ b/src/resources/components/FormMaker/formedit/items/time.vue @@ -96,7 +96,7 @@ export default { }; diff --git a/src/resources/components/TsContain/TsContain.vue b/src/resources/components/TsContain/TsContain.vue index b7602d6b521dd0fa357b618953faaf3330686b91..c9bf66f3268eec133b7508f37b93707584cdfaae 100644 --- a/src/resources/components/TsContain/TsContain.vue +++ b/src/resources/components/TsContain/TsContain.vue @@ -326,7 +326,7 @@ export default { diff --git a/src/views/pages/autoexec/components/param/edit/password.vue b/src/views/pages/autoexec/components/param/edit/password.vue index bdfee23fab7ff77149eaf35e29e2facfa5e71c21..6dc316a4c758955fcf2a2b8813ecd7504ab69872 100644 --- a/src/views/pages/autoexec/components/param/edit/password.vue +++ b/src/views/pages/autoexec/components/param/edit/password.vue @@ -91,7 +91,7 @@ export default { }; diff --git a/src/views/pages/autoexec/detail/job-detail.vue b/src/views/pages/autoexec/detail/job-detail.vue index 103d6104375de38d370619e231176ca0bf6b83e8..b5329d7671d7d37db8505e07a5e8a4bc7f1cc9d0 100644 --- a/src/views/pages/autoexec/detail/job-detail.vue +++ b/src/views/pages/autoexec/detail/job-detail.vue @@ -546,7 +546,7 @@ export default { diff --git a/src/views/pages/autoexec/detail/scriptDetail/common/version-valid.vue b/src/views/pages/autoexec/detail/scriptDetail/common/version-valid.vue index 8b4f6a7ae0bbd7a94df79aa8ffe9e5db483c754f..a36bbff70940936772d1075d5cd2fe8e380922d7 100644 --- a/src/views/pages/autoexec/detail/scriptDetail/common/version-valid.vue +++ b/src/views/pages/autoexec/detail/scriptDetail/common/version-valid.vue @@ -90,7 +90,7 @@ export default { .icon{ font-size: 20px; } - /deep/ .ivu-cell-item{ + ::v-deep .ivu-cell-item{ position: relative; padding-left: 30px; word-break: initial; diff --git a/src/views/pages/autoexec/detail/scriptDetail/edit/version-compare.vue b/src/views/pages/autoexec/detail/scriptDetail/edit/version-compare.vue index f409e5dad370096896eb2d24951a48649b30b812..ca1369bc27b734fb4abd54b7c2b124a25485648e 100644 --- a/src/views/pages/autoexec/detail/scriptDetail/edit/version-compare.vue +++ b/src/views/pages/autoexec/detail/scriptDetail/edit/version-compare.vue @@ -262,7 +262,7 @@ export default { .text-tip{ padding-bottom: 10px; } - /deep/ .top-content{ + ::v-deep .top-content{ text-align: center; padding-bottom: 16px; } diff --git a/src/views/pages/autoexec/detail/scriptDetail/edit/version-detail.vue b/src/views/pages/autoexec/detail/scriptDetail/edit/version-detail.vue index 3c68941d6ff60a5cb29b36d85618129818ad7dda..4740c9b6dec82b39410949bd7ab32efe0c9ecdfd 100644 --- a/src/views/pages/autoexec/detail/scriptDetail/edit/version-detail.vue +++ b/src/views/pages/autoexec/detail/scriptDetail/edit/version-detail.vue @@ -140,7 +140,7 @@ export default { position: relative; height: 100%; overflow-y: auto; - /deep/ .version-top{ + ::v-deep .version-top{ display: flex; justify-content: space-between; padding-bottom: 16px; @@ -155,7 +155,7 @@ export default { } } } - /deep/ .item-list{ + ::v-deep .item-list{ padding-bottom: 16px; .text-title{ padding-bottom: 8px; diff --git a/src/views/pages/autoexec/detail/test-detail.vue b/src/views/pages/autoexec/detail/test-detail.vue index a47e8ceea1b9c42c003501f169ff0aadf3d1b358..79e5a34e76563b676bbd18792242ae2bef30af5c 100644 --- a/src/views/pages/autoexec/detail/test-detail.vue +++ b/src/views/pages/autoexec/detail/test-detail.vue @@ -333,7 +333,7 @@ export default { vertical-align: middle; } } - /deep/.btn-icon{ + ::v-deep .btn-icon{ vertical-align: baseline; margin: 0px; &::before{ diff --git a/src/views/pages/autoexec/detail/time-job-add.vue b/src/views/pages/autoexec/detail/time-job-add.vue index c9061169a3fd517ef2d9a74a2eb77f4d6e591719..cb94a476d63d2abd2617fba2437138b62301cfb2 100644 --- a/src/views/pages/autoexec/detail/time-job-add.vue +++ b/src/views/pages/autoexec/detail/time-job-add.vue @@ -351,7 +351,7 @@ export default { .time-job-add { .runner-detail-wrap { height: calc(100vh - 100px - 130px); - /deep/ .left-top-no-border-radius { + ::v-deep .left-top-no-border-radius { border-radius: 10px; } } @@ -363,10 +363,10 @@ export default { display: inline-block; padding-right: 10px; } - /deep/ .step-container { + ::v-deep .step-container { padding: 10px 10px 10px 0 !important; } - /deep/ .top { + ::v-deep .top { button { margin-left: 8px; } @@ -374,7 +374,7 @@ export default { .content-padding { padding: 0 24px 24px; } - /deep/ .content { + ::v-deep .content { height: 100%; .step { width: 60%; @@ -394,13 +394,13 @@ export default { } } } - /deep/ .ivu-tabs-nav .ivu-tabs-tab { + ::v-deep .ivu-tabs-nav .ivu-tabs-tab { padding: 0px; } - /deep/ .ivu-tabs-bar { + ::v-deep .ivu-tabs-bar { border: none; } - /deep/ .ivu-tabs { + ::v-deep .ivu-tabs { height: 100%; } } diff --git a/src/views/pages/autoexec/detail/time-job-detail.vue b/src/views/pages/autoexec/detail/time-job-detail.vue index e443262247410dbd8dc950ab21a52b79512da179..3b8ba7a09a8692000e3685403f98dbcbfef6c500 100644 --- a/src/views/pages/autoexec/detail/time-job-detail.vue +++ b/src/views/pages/autoexec/detail/time-job-detail.vue @@ -314,24 +314,24 @@ export default { display: inline-block; padding-right: 10px; } - /deep/ .step-container { + ::v-deep .step-container { padding: 16px 10px 10px 0 !important; } - /deep/ .top { + ::v-deep .top { button { margin-left: 8px; } } - /deep/ .content { + ::v-deep .content { height: 100%; } - /deep/ .ivu-tabs-nav .ivu-tabs-tab { + ::v-deep .ivu-tabs-nav .ivu-tabs-tab { padding: 0px; } - /deep/ .ivu-tabs-bar { + ::v-deep .ivu-tabs-bar { border: none; } - /deep/ .ivu-tabs { + ::v-deep .ivu-tabs { height: 100%; } .runner-detail { diff --git a/src/views/pages/autoexec/form/component/formresoureces/index.vue b/src/views/pages/autoexec/form/component/formresoureces/index.vue index 2ab9f0d2376a9c537cbdd889905f0af309f93c6b..f8933b59a7b4ffa9e244033b4faf2a9836293657 100644 --- a/src/views/pages/autoexec/form/component/formresoureces/index.vue +++ b/src/views/pages/autoexec/form/component/formresoureces/index.vue @@ -135,7 +135,7 @@ export default { margin-right: 10px; border-radius: 4px; } - /deep/ .tag-item-text{ + ::v-deep .tag-item-text{ margin-bottom: 10px; } } diff --git a/src/views/pages/autoexec/manage/operate-manage.vue b/src/views/pages/autoexec/manage/operate-manage.vue index 7d692bbe82aef7aa31cba173f88bc4bade320216..5cbef68b7c841eb8ceb4e997238057806544783c 100644 --- a/src/views/pages/autoexec/manage/operate-manage.vue +++ b/src/views/pages/autoexec/manage/operate-manage.vue @@ -209,10 +209,10 @@ export default { diff --git a/src/views/pages/cmdb/cientity/cientity-edit-core.vue b/src/views/pages/cmdb/cientity/cientity-edit-core.vue index 403b971a3d1637c37c40b83014eac62bc547173f..535a46c00417eba3ef867c89b89598009d7feeac 100644 --- a/src/views/pages/cmdb/cientity/cientity-edit-core.vue +++ b/src/views/pages/cmdb/cientity/cientity-edit-core.vue @@ -650,22 +650,22 @@ export default { .ivu-form-item { margin-bottom: 24px !important; } -/deep/.tstabs { +::v-deep .tstabs { .tstable-main { max-height: initial !important; } } -/deep/.ivu-collapse { +::v-deep .ivu-collapse { border-top: 0px; border-bottom: 0px; } -/deep/.ivu-collapse-header { +::v-deep .ivu-collapse-header { border-bottom: 0px; } -/deep/.ivu-collapse-content-box { +::v-deep .ivu-collapse-content-box { padding-bottom: 0px; } -/deep/.ivu-collapse-content { +::v-deep .ivu-collapse-content { padding: 0px; } diff --git a/src/views/pages/cmdb/cientity/cientity-edit.vue b/src/views/pages/cmdb/cientity/cientity-edit.vue index 9355db7137523b60b0eedd241fb535020d34a208..9731fac2ece13dcbc39e4df05f730fe17035b292 100644 --- a/src/views/pages/cmdb/cientity/cientity-edit.vue +++ b/src/views/pages/cmdb/cientity/cientity-edit.vue @@ -588,7 +588,7 @@ export default { }; diff --git a/src/views/pages/cmdb/cientity/cientity-list.vue b/src/views/pages/cmdb/cientity/cientity-list.vue index 422b7ecf598d812d00947701c738da2851e3a90e..ef4fa9747bcdee3d6b9c9b416c87f73d1eaddd28 100644 --- a/src/views/pages/cmdb/cientity/cientity-list.vue +++ b/src/views/pages/cmdb/cientity/cientity-list.vue @@ -1387,7 +1387,7 @@ export default { diff --git a/src/views/pages/cmdb/components/ci/ci-type-list.vue b/src/views/pages/cmdb/components/ci/ci-type-list.vue index ab90b1a30f2f00ab9d830c9663303b1dca769c19..fd0f35bc66152cdb988501e37e6d4959bc98000f 100644 --- a/src/views/pages/cmdb/components/ci/ci-type-list.vue +++ b/src/views/pages/cmdb/components/ci/ci-type-list.vue @@ -316,7 +316,7 @@ export default { .tsbg-block { border-radius: 6px; } -/deep/.icon-pr-6 { +::v-deep .icon-pr-6 { &::before { padding-right: 6px; } diff --git a/src/views/pages/cmdb/components/condition/condition-group.vue b/src/views/pages/cmdb/components/condition/condition-group.vue index 29fd19016d7fa76925b751ab27e3ddeb2d5b6508..717f0e265d10bb34feb45ecf8ad03b7c25853706 100644 --- a/src/views/pages/cmdb/components/condition/condition-group.vue +++ b/src/views/pages/cmdb/components/condition/condition-group.vue @@ -392,7 +392,7 @@ export default { diff --git a/src/views/pages/cmdb/discovery/discovery-data.vue b/src/views/pages/cmdb/discovery/discovery-data.vue index 97d9fc56e88993aa640384e1163a76f99e2d69c0..be2420fce81af6d0a25218f05535b26c21700029 100644 --- a/src/views/pages/cmdb/discovery/discovery-data.vue +++ b/src/views/pages/cmdb/discovery/discovery-data.vue @@ -247,13 +247,13 @@ export default { border-width: 1px; border-style: solid; } -/deep/.jv-light { +::v-deep .jv-light { background: transparent !important; } -/deep/.jv-code { +::v-deep .jv-code { padding: 0px !important; } -/deep/.top { +::v-deep .top { vertical-align: top !important; } .table th { diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue index 3f65ba2fb7c6c1064f6d31e4ccda85edacd5e993..f64eca626378f22b48716abcb5938bbd3487cde1 100644 --- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue +++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue @@ -674,16 +674,16 @@ export default { .ivu-form-item { margin-bottom: 24px !important; } -/deep/.tstabs { +::v-deep .tstabs { .tstable-main { max-height: initial !important; } } -/deep/.ivu-collapse { +::v-deep .ivu-collapse { border-top: 0px; border-bottom: 0px; } -/deep/.ivu-collapse-header { +::v-deep .ivu-collapse-header { border-bottom: 0px; } .formTableComponent { diff --git a/src/views/pages/cmdb/globalsearch/global-search.vue b/src/views/pages/cmdb/globalsearch/global-search.vue index d980779f6bf15346c01a69d3649e983bd1ea3a43..5176bf6718ce7ae687e738375a54f723ae29bc02 100644 --- a/src/views/pages/cmdb/globalsearch/global-search.vue +++ b/src/views/pages/cmdb/globalsearch/global-search.vue @@ -190,7 +190,7 @@ export default { } } .hide-border-bottom-tabs { - /deep/ .ivu-tabs-bar { + ::v-deep .ivu-tabs-bar { border-bottom: none; } } diff --git a/src/views/pages/cmdb/sync/collection-data.vue b/src/views/pages/cmdb/sync/collection-data.vue index 8775fce8b7ab705c6567ccc2f7c2b20d2a04da7f..031083c0ae5cf3d0e9855a29945c1034b489728a 100644 --- a/src/views/pages/cmdb/sync/collection-data.vue +++ b/src/views/pages/cmdb/sync/collection-data.vue @@ -185,13 +185,13 @@ export default { .top { vertical-align: top; } -/deep/.jv-light { +::v-deep .jv-light { background: transparent !important; } -/deep/.jv-code { +::v-deep .jv-code { padding: 0px !important; } -/deep/.top { +::v-deep .top { vertical-align: top !important; } .table td { diff --git a/src/views/pages/cmdb/sync/sync-wizard.vue b/src/views/pages/cmdb/sync/sync-wizard.vue index b37fb881b0dd709df0db254cc92fc74c1e228eda..6af29db1480059f0ce77ea71da3d9f5e0fd27c0c 100644 --- a/src/views/pages/cmdb/sync/sync-wizard.vue +++ b/src/views/pages/cmdb/sync/sync-wizard.vue @@ -137,7 +137,7 @@ export default { margin-bottom:10px; } .tscard-container { - /deep/.tscard-body{ + ::v-deep .tscard-body{ min-height: initial!important; padding: 16px 6px 0px 6px!important; } diff --git a/src/views/pages/cmdb/sync/syncpolicy-edit.vue b/src/views/pages/cmdb/sync/syncpolicy-edit.vue index 100e748d7cd1e59a282a3cbcb55bbd1b6893bd19..63e3628ffa447a183c7ee6d809fea9040f3db705 100644 --- a/src/views/pages/cmdb/sync/syncpolicy-edit.vue +++ b/src/views/pages/cmdb/sync/syncpolicy-edit.vue @@ -355,12 +355,12 @@ export default { margin-right: 16px; } } -/deep/.tscontain-body { +::v-deep .tscontain-body { position: inherit; z-index: inherit; } .tableEdit { - /deep/.ivu-form-item-content { + ::v-deep .ivu-form-item-content { position: inherit; } } diff --git a/src/views/pages/dashboard/dashboard-edit.vue b/src/views/pages/dashboard/dashboard-edit.vue index 5a8f2a013b3373678b316e1075b709657dd83772..434c9b7c7db2c8927bcc5ea42c4e7ce862f08004 100644 --- a/src/views/pages/dashboard/dashboard-edit.vue +++ b/src/views/pages/dashboard/dashboard-edit.vue @@ -539,13 +539,13 @@ export default { } .theme(@background-color) { .formitem-container { - /deep/ .ivu-collapse-content { + ::v-deep .ivu-collapse-content { background-color: @background-color; > .ivu-collapse-content-box { padding-top: 0; } } - /deep/ .ivu-collapse { + ::v-deep .ivu-collapse { border: none; } } diff --git a/src/views/pages/dashboard/widget/chart-headerlist.vue b/src/views/pages/dashboard/widget/chart-headerlist.vue index 2fc1cb204408020b57312d5d72cc634edcf556f5..35bb1997ef37f49c2d355cfd7ba04f4de9688c2d 100644 --- a/src/views/pages/dashboard/widget/chart-headerlist.vue +++ b/src/views/pages/dashboard/widget/chart-headerlist.vue @@ -141,7 +141,7 @@ export default { diff --git a/src/views/pages/dashboard/widget/dashboard-widge.old.vue b/src/views/pages/dashboard/widget/dashboard-widge.old.vue index bd696b12b6cf62d1a2e22c563e9f553aaa09b1ba..e260da31ef206506a0a9ad2b03ca825742af42e7 100644 --- a/src/views/pages/dashboard/widget/dashboard-widge.old.vue +++ b/src/views/pages/dashboard/widget/dashboard-widge.old.vue @@ -252,7 +252,7 @@ export default { diff --git a/src/views/pages/framework/form/form-edit_deprecated.vue b/src/views/pages/framework/form/form-edit_deprecated.vue index 50531260bc722f228c23bae0ccdb7bcf70e1f4df..f9373984101df2b41ac53a4f6e2e17f7afa71545 100644 --- a/src/views/pages/framework/form/form-edit_deprecated.vue +++ b/src/views/pages/framework/form/form-edit_deprecated.vue @@ -1022,7 +1022,7 @@ function getActiveVersionUuid(versionList) { .formedit-content { padding-left: 185px; } - /deep/ .tscontain-container .tscontain-body { + ::v-deep .tscontain-container .tscontain-body { height: calc(100vh - 50px - 50px); } } diff --git a/src/views/pages/framework/healthcheck/sqldump.vue b/src/views/pages/framework/healthcheck/sqldump.vue index 2084c1d28a6a86cc127dd33712bf6dfb498b558a..f71a646d774632fc90eb7f3faabd36cbf1fad7f6 100644 --- a/src/views/pages/framework/healthcheck/sqldump.vue +++ b/src/views/pages/framework/healthcheck/sqldump.vue @@ -295,11 +295,11 @@ export default { display: inline-block; float: right; } -/deep/.ivu-radio-wrapper { +::v-deep .ivu-radio-wrapper { background: transparent !important; color: @default-title; } -/deep/.ivu-radio-wrapper-checked { +::v-deep .ivu-radio-wrapper-checked { color: @default-info-color!important; } diff --git a/src/views/pages/framework/homepage/edit-homepage-dialog.vue b/src/views/pages/framework/homepage/edit-homepage-dialog.vue index 927f648df05a4950d6bc9d6207cdc5fc9ab4b478..d59b698790834981582279c3297687ab2355669d 100644 --- a/src/views/pages/framework/homepage/edit-homepage-dialog.vue +++ b/src/views/pages/framework/homepage/edit-homepage-dialog.vue @@ -285,7 +285,7 @@ export default { } .menu-select { width: 50%; - /deep/ .ivu-select-selection { + ::v-deep .ivu-select-selection { border: 1px solid @border-color-base !important; } } diff --git a/src/views/pages/framework/matrix/components/UploadDialog.vue b/src/views/pages/framework/matrix/components/UploadDialog.vue index dbe660708164ca3436183d64ad52fc9dc0ae946e..365a0808d3149a3ff88d6a611f54c4c7f5b298d6 100644 --- a/src/views/pages/framework/matrix/components/UploadDialog.vue +++ b/src/views/pages/framework/matrix/components/UploadDialog.vue @@ -578,7 +578,7 @@ export default { diff --git a/src/views/pages/framework/runner/runner-relate.vue b/src/views/pages/framework/runner/runner-relate.vue index ff703ca9b604810d81c7a11198f9473ae73ad37a..61aaa81ba5019c3a80eca432013b62ef3f1edd85 100644 --- a/src/views/pages/framework/runner/runner-relate.vue +++ b/src/views/pages/framework/runner/runner-relate.vue @@ -171,13 +171,13 @@ export default { diff --git a/src/views/pages/framework/theme/input/colorpickerlist-type.vue b/src/views/pages/framework/theme/input/colorpickerlist-type.vue index fe9cc116fde48c710a91e593ba75939cf5ff3e56..7846a5c5fad6f59182a010ae0dc2da81d17a5053 100644 --- a/src/views/pages/framework/theme/input/colorpickerlist-type.vue +++ b/src/views/pages/framework/theme/input/colorpickerlist-type.vue @@ -36,22 +36,21 @@ export default { }; diff --git a/src/views/pages/framework/users/role-addview.vue b/src/views/pages/framework/users/role-addview.vue index ecc8bc699cfc686f156ed56bb563f263f24c0085..c051a4df7821c45fdae4b95745787f82bbb96722 100644 --- a/src/views/pages/framework/users/role-addview.vue +++ b/src/views/pages/framework/users/role-addview.vue @@ -725,15 +725,15 @@ export default { diff --git a/src/views/pages/framework/worktime/worktime-manage.vue b/src/views/pages/framework/worktime/worktime-manage.vue index 0f6d01d229719e620965aa3c788cd2d14346d9cf..295080e5e666b0a866829cf55c45860dd4ff9aaa 100644 --- a/src/views/pages/framework/worktime/worktime-manage.vue +++ b/src/views/pages/framework/worktime/worktime-manage.vue @@ -749,9 +749,10 @@ export default { .ivu-input-word-count { background: #fff; } - /deep/tr { - th, td{ - &:first-child{ + ::v-deep tr { + th, + td { + &:first-child { padding-left: 8px; } } @@ -777,7 +778,6 @@ export default { right: 32px; z-index: 100; } - } .table { diff --git a/src/views/pages/index/navigation/navigation.vue b/src/views/pages/index/navigation/navigation.vue index d20ef3c17cd2302700134935888c5fdae92bd075..1ee815b94d7a90ec3a2e856711cab98e3cf68f4b 100644 --- a/src/views/pages/index/navigation/navigation.vue +++ b/src/views/pages/index/navigation/navigation.vue @@ -172,7 +172,7 @@ export default { align-items: flex-start; } - /deep/ .ivu-card-body { + ::v-deep .ivu-card-body { padding: 0; } } diff --git a/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue b/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue index 2d5edee08fdbc340092caed98baa1b41c5352dbf..2667eeab892895204dba961a175a38deb42a09da 100644 --- a/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue +++ b/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue @@ -624,10 +624,10 @@ export default { white-space: pre-wrap; } .ivu-dropdown { - /deep/ .ivu-dropdown-rel { + ::v-deep .ivu-dropdown-rel { display: flex; } - /deep/ .ivu-select-dropdown { + ::v-deep .ivu-select-dropdown { width: 100%; } } diff --git a/src/views/pages/inspect/recentIssues/recent-issues.vue b/src/views/pages/inspect/recentIssues/recent-issues.vue index 5b17e45fde2accee641558c5f5cb696ee24ee870..66a57cb7385bac25345f4e6afe6c09990bf4d01f 100644 --- a/src/views/pages/inspect/recentIssues/recent-issues.vue +++ b/src/views/pages/inspect/recentIssues/recent-issues.vue @@ -855,7 +855,7 @@ export default { font-size: 12px; } .combine-searcher-text-align { - /deep/ .tag-item { + ::v-deep .tag-item { line-height: 0 !important; } } diff --git a/src/views/pages/knowledge/common/markdown-editor.vue b/src/views/pages/knowledge/common/markdown-editor.vue index c19b5f23069d65b2f735b98787f28f31d23ef6f7..5c0dd7f561bf1836eef78706201cc086c4110ca2 100644 --- a/src/views/pages/knowledge/common/markdown-editor.vue +++ b/src/views/pages/knowledge/common/markdown-editor.vue @@ -256,10 +256,10 @@ export default { .editor-editor{ position: relative; padding: 10px; - /deep/ .markdown-body table { + ::v-deep .markdown-body table { display: table; } - /deep/ .markdown-body em { + ::v-deep .markdown-body em { font-style: italic; // 修复markdown中的倾斜样式不生效问题 } &:hover{ @@ -295,20 +295,20 @@ export default { height: 16px; } } - /deep/ .hljs { + ::v-deep .hljs { background: transparent; } .knowledge-markdown-editor { - /deep/ textarea { + ::v-deep textarea { background-color: transparent; } - /deep/ &.v-note-wrapper { + ::v-deep &.v-note-wrapper { z-index: 2; // 修改层级，会导致选择表格行列会被遮挡 } } .theme(@text-color) { .knowledge-markdown-editor { - /deep/ .auto-textarea-wrapper .auto-textarea-input { + ::v-deep .auto-textarea-wrapper .auto-textarea-input { color: @text-color; } } diff --git a/src/views/pages/knowledge/common/nav-detail.vue b/src/views/pages/knowledge/common/nav-detail.vue index 093e1edbceed61e56ca1bcc8051ee0c3129fb3bb..abf210cadccc1bc3825e7304997b2529c7224592 100644 --- a/src/views/pages/knowledge/common/nav-detail.vue +++ b/src/views/pages/knowledge/common/nav-detail.vue @@ -156,7 +156,7 @@ ul.nav-detail{ white-space: pre; .nav-text{ display: inline-block; - /deep/ span{ + ::v-deep span{ vertical-align: baseline; } } diff --git a/src/views/pages/knowledge/common/tag-list.vue b/src/views/pages/knowledge/common/tag-list.vue index 85a039874fcb1d417a15b0aa4b176aeeebd1239a..d4fcc0fd1f2bb42f77dd9f6d21dc1bb51cc95836 100644 --- a/src/views/pages/knowledge/common/tag-list.vue +++ b/src/views/pages/knowledge/common/tag-list.vue @@ -44,7 +44,7 @@ export default { .icon-padding { padding-right: 10px; } - /deep/ .ivu-tag { + ::v-deep .ivu-tag { margin-right: 10px; margin-bottom: 6px; } diff --git a/src/views/pages/knowledge/detail/document-detail.vue b/src/views/pages/knowledge/detail/document-detail.vue index 52d3f44e50373d988006d37aa95cb7685862dca3..d5678ba53496c2e965ac5c20f6e77880dfa04d0d 100644 --- a/src/views/pages/knowledge/detail/document-detail.vue +++ b/src/views/pages/knowledge/detail/document-detail.vue @@ -269,7 +269,7 @@ export default { text-align: right; } .config-item-wrap { - /deep/ i { + ::v-deep i { font-style: italic; // 保留倾斜原有样式 } } diff --git a/src/views/pages/knowledge/detail/items/code.vue b/src/views/pages/knowledge/detail/items/code.vue index 753101f464cc77fd28b3e65914205e744f0967cf..e72df9dcbe45a629b8f9be615a61a91aa72b2bb7 100644 --- a/src/views/pages/knowledge/detail/items/code.vue +++ b/src/views/pages/knowledge/detail/items/code.vue @@ -45,7 +45,7 @@ export default { diff --git a/src/views/pages/knowledge/detail/items/ol.vue b/src/views/pages/knowledge/detail/items/ol.vue index a4e3281b029342a6e9556ee807b2474865af217c..c24783d695c8b3123d9d478f0a38e87c584588bb 100644 --- a/src/views/pages/knowledge/detail/items/ol.vue +++ b/src/views/pages/knowledge/detail/items/ol.vue @@ -52,16 +52,16 @@ ol { } ol { list-style: decimal inside; - /deep/ li { + ::v-deep li { word-break: break-all; list-style: decimal; } &.cjk-ideographic { - /deep/ li { + ::v-deep li { list-style: cjk-ideographic; } } - /deep/span.line-through { + ::v-deep span.line-through { text-decoration: line-through; vertical-align: baseline; } diff --git a/src/views/pages/knowledge/detail/items/p.vue b/src/views/pages/knowledge/detail/items/p.vue index 797d082d518b36e5e831a84112b4de9c16ed33a8..d2240de8e79df882b2f4da4da20bae0ebf0a702a 100644 --- a/src/views/pages/knowledge/detail/items/p.vue +++ b/src/views/pages/knowledge/detail/items/p.vue @@ -45,7 +45,7 @@ export default { } p{ word-break: break-all; - /deep/span.line-through{ + ::v-deep span.line-through{ text-decoration:line-through; vertical-align: baseline; } diff --git a/src/views/pages/knowledge/detail/items/ul.vue b/src/views/pages/knowledge/detail/items/ul.vue index 2516a473d8ce7fcb14ae83dfb5268ba8680d1c17..b9bc16ed175a55509b000dfc6a32be8f28a3772b 100644 --- a/src/views/pages/knowledge/detail/items/ul.vue +++ b/src/views/pages/knowledge/detail/items/ul.vue @@ -52,21 +52,21 @@ ul { } ul { // list-style: disc inside; - /deep/ li { + ::v-deep li { word-break: break-all; list-style: disc; } &.circle { - /deep/ li { + ::v-deep li { list-style: circle; } } &.square { - /deep/ li { + ::v-deep li { list-style: square; } } - /deep/span.line-through{ + ::v-deep span.line-through{ text-decoration:line-through; vertical-align: baseline; } diff --git a/src/views/pages/knowledge/detail/knowledge-detail.vue b/src/views/pages/knowledge/detail/knowledge-detail.vue index a30dfcdddd3b4c9529f371950dfddf08da21c5d4..6871b837eaa59e7227157f2e992fad75e86def5a 100644 --- a/src/views/pages/knowledge/detail/knowledge-detail.vue +++ b/src/views/pages/knowledge/detail/knowledge-detail.vue @@ -331,7 +331,7 @@ export default { } } .KnowledgeDetail { - /deep/ .ivu-poptip-body { + ::v-deep .ivu-poptip-body { padding: 8px 0; } } diff --git a/src/views/pages/knowledge/edit/component/code.vue b/src/views/pages/knowledge/edit/component/code.vue index 3cbe33ba794e912eaf4b3acd3f14a03b015239de..ed52f1965c6378e76590d2b30deb0ea2e83612ec 100644 --- a/src/views/pages/knowledge/edit/component/code.vue +++ b/src/views/pages/knowledge/edit/component/code.vue @@ -136,7 +136,7 @@ export default { padding: 0px 4px; line-height: 32px; height: 32px; - /deep/.TsFormSelect .ivu-input{ + ::v-deep .TsFormSelect .ivu-input{ text-align: right; } } diff --git a/src/views/pages/knowledge/edit/component/editor.vue b/src/views/pages/knowledge/edit/component/editor.vue index 8bc25fe9ba0e975fc210a3442d92e8ac32b672a7..9b2790576adb837dcf12dfc588f6a7280697f174 100644 --- a/src/views/pages/knowledge/edit/component/editor.vue +++ b/src/views/pages/knowledge/edit/component/editor.vue @@ -97,11 +97,11 @@ export default { padding: 0px 4px; line-height: 32px; height: 32px; - /deep/.TsFormSelect .ivu-input{ + ::v-deep .TsFormSelect .ivu-input{ text-align: right; } } - /deep/ .ck-editor__editable:hover, .ck-editor__editable:focus { + ::v-deep .ck-editor__editable:hover, .ck-editor__editable:focus { border-color: #dcdee1 !important; } } diff --git a/src/views/pages/knowledge/edit/component/formtable.vue b/src/views/pages/knowledge/edit/component/formtable.vue index 874e747e2b801b1011da8c07cfae20f2f8e482f0..960ca759066dfd05beb04dced32af58715709c63 100644 --- a/src/views/pages/knowledge/edit/component/formtable.vue +++ b/src/views/pages/knowledge/edit/component/formtable.vue @@ -8,10 +8,10 @@ @paste.stop.prevent >
-
+
@@ -75,7 +75,7 @@ export default { @import '~@/resources/plugins/TsCkeditor/ckeditor.less'; section { position: relative; - /deep/.editor-form { + ::v-deep .editor-form { position: relative; padding: 10px; &:hover { @@ -88,7 +88,7 @@ section { padding: 0px 4px; line-height: 32px; height: 32px; - /deep/.TsFormSelect .ivu-input { + ::v-deep .TsFormSelect .ivu-input { text-align: right; } } @@ -99,36 +99,35 @@ section { word-break: break-all; display: block; } - //静态列表样式 - - .tstable-container { - overflow: auto; - border-top: 0px !important; - .table-list { - width:100%; - border-top: none; - border-collapse: collapse; - table-layout: fixed; - } - .table-list > thead, - .table-list > thead > tr > th { - visibility: visible !important; - border: none !important; - vertical-align: middle; - height: 38px; - padding-top: 0px; - padding-bottom: 0px; - text-align: left; - } - .table-list > tbody > tr > td { - border-left: none !important; - border-right: none !important; - border-bottom: none !important; - border-top: none !important; - vertical-align: top; - } - } + //静态列表样式 + .tstable-container { + overflow: auto; + border-top: 0px !important; + .table-list { + width: 100%; + border-top: none; + border-collapse: collapse; + table-layout: fixed; + } + .table-list > thead, + .table-list > thead > tr > th { + visibility: visible !important; + border: none !important; + vertical-align: middle; + height: 38px; + padding-top: 0px; + padding-bottom: 0px; + text-align: left; + } + .table-list > tbody > tr > td { + border-left: none !important; + border-right: none !important; + border-bottom: none !important; + border-top: none !important; + vertical-align: top; + } + } } &:hover { border: 1px solid transparent !important; @@ -142,9 +141,9 @@ section { border-radius: 2px; padding: 5px; display: none; - &>span{ - padding: 7px 8px; - cursor: pointer; + & > span { + padding: 7px 8px; + cursor: pointer; } } .editorSpan { @@ -157,7 +156,7 @@ section { z-index: 3; } } -/deep/.sheet-table { +::v-deep .sheet-table { width: 100%; border-collapse: collapse; border-spacing: 0px; diff --git a/src/views/pages/knowledge/edit/component/ol.vue b/src/views/pages/knowledge/edit/component/ol.vue index 53ecde92523cf8effbd21b0efd9d4659f4867d23..bc67449471dac1bfabacced1c98e4cee83a2b09f 100644 --- a/src/views/pages/knowledge/edit/component/ol.vue +++ b/src/views/pages/knowledge/edit/component/ol.vue @@ -61,12 +61,12 @@ ol { } ol { list-style: decimal inside; - /deep/ li { + ::v-deep li { word-break: break-all; list-style: decimal; } &.cjk-ideographic { - /deep/ li { + ::v-deep li { list-style: cjk-ideographic; } } diff --git a/src/views/pages/knowledge/edit/component/ul.vue b/src/views/pages/knowledge/edit/component/ul.vue index 3f78a7582bb0e60675cf80f1ed0c1ca369ab9bf7..b3100ce2ed7ae00b277a3236e6ee219601e6c281 100644 --- a/src/views/pages/knowledge/edit/component/ul.vue +++ b/src/views/pages/knowledge/edit/component/ul.vue @@ -57,17 +57,17 @@ ul { } ul { // list-style: disc inside; - /deep/ li { + ::v-deep li { word-break: break-all; list-style: disc; } &.circle { - /deep/ li { + ::v-deep li { list-style: circle; } } &.square { - /deep/ li { + ::v-deep li { list-style: square; } } diff --git a/src/views/pages/knowledge/edit/knowledge-edit.vue b/src/views/pages/knowledge/edit/knowledge-edit.vue index 836ff3af66ac85ae949c484023bf40671f7b5ca7..a40b2f6dc5a4fd928e16f8b803338dc4f89a641f 100644 --- a/src/views/pages/knowledge/edit/knowledge-edit.vue +++ b/src/views/pages/knowledge/edit/knowledge-edit.vue @@ -339,10 +339,10 @@ export default { .padding-t{ padding-top:4px; } -/deep/.left-sider{ +::v-deep .left-sider{ border-right: 0px solid #ccc!important; } -/deep/.bg-three{ +::v-deep .bg-three{ background:transparent!important; } diff --git a/src/views/pages/knowledge/edit/main/edit-component.vue b/src/views/pages/knowledge/edit/main/edit-component.vue index 3c356066419ef952cfa45c9a357800b4559ab398..d5a941848e05a4840d11203027c17813eae60a3c 100644 --- a/src/views/pages/knowledge/edit/main/edit-component.vue +++ b/src/views/pages/knowledge/edit/main/edit-component.vue @@ -784,7 +784,7 @@ function childParent(node, isLast) { diff --git a/src/views/pages/process/task/processdetail/process-automatic.vue b/src/views/pages/process/task/processdetail/process-automatic.vue index 9ea5db0e0286c5f4dbe52a327ef3416fd5f99514..c1b5b75e10fedd3ca137ab857bd4e02b3b570f98 100644 --- a/src/views/pages/process/task/processdetail/process-automatic.vue +++ b/src/views/pages/process/task/processdetail/process-automatic.vue @@ -554,7 +554,7 @@ export default { margin-right: 4px; border-radius: 20px; } -/deep/ .ivu-layout-content{ +::v-deep .ivu-layout-content{ overflow-y: hidden !important; } .retry-btn{ diff --git a/src/views/pages/process/task/processdetail/process-changecreate.vue b/src/views/pages/process/task/processdetail/process-changecreate.vue index d508cf40d2d74e4e0a1a4fe8aceffef5a4b50269..b7ec6c910694833106963a6ff138316f26019fed 100644 --- a/src/views/pages/process/task/processdetail/process-changecreate.vue +++ b/src/views/pages/process/task/processdetail/process-changecreate.vue @@ -536,7 +536,7 @@ export default { margin-right: 4px; border-radius: 20px; } -/deep/ .ivu-layout-content{ +::v-deep .ivu-layout-content{ overflow-y: hidden !important; } .line-bottom{ diff --git a/src/views/pages/process/task/processdetail/process-changehandle.vue b/src/views/pages/process/task/processdetail/process-changehandle.vue index f77c27e867defc458feac44552d86935c33b06ef..66a9bd88a3a2430f571b5be9b0bae84e6e2d52eb 100644 --- a/src/views/pages/process/task/processdetail/process-changehandle.vue +++ b/src/views/pages/process/task/processdetail/process-changehandle.vue @@ -893,7 +893,7 @@ export default { margin-right: 4px; border-radius: 20px; } -/deep/ .ivu-layout-content{ +::v-deep .ivu-layout-content{ overflow-y: scroll !important; } .line-bottom{ diff --git a/src/views/pages/process/task/processdetail/process-cmdbsync.vue b/src/views/pages/process/task/processdetail/process-cmdbsync.vue index 6dd487ec202f7f3fe4f55d54ef3b01519ea3aa1c..8bfe95f4e0c153bab87dfda525a1eafa8fd56ddf 100644 --- a/src/views/pages/process/task/processdetail/process-cmdbsync.vue +++ b/src/views/pages/process/task/processdetail/process-cmdbsync.vue @@ -469,7 +469,7 @@ export default { height: 100%; overflow-y: hidden; } -/deep/ .ivu-layout-content{ +::v-deep .ivu-layout-content{ overflow-y: hidden !important; } diff --git a/src/views/pages/process/task/processdetail/process-createjob.vue b/src/views/pages/process/task/processdetail/process-createjob.vue index 23c093306b9260292832e5d582db120d4f813fae..38128d08f718afe629bef653144fa6c64484e854 100644 --- a/src/views/pages/process/task/processdetail/process-createjob.vue +++ b/src/views/pages/process/task/processdetail/process-createjob.vue @@ -508,7 +508,7 @@ export default { margin-right: 4px; border-radius: 20px; } -/deep/ .ivu-layout-content{ +::v-deep .ivu-layout-content{ overflow-y: hidden !important; } diff --git a/src/views/pages/process/task/processdetail/process-event.vue b/src/views/pages/process/task/processdetail/process-event.vue index 607d0bd89c17f05ef59d707032bdcab2fd7cfd96..55976093c7d196486b62012b93811765fb813472 100644 --- a/src/views/pages/process/task/processdetail/process-event.vue +++ b/src/views/pages/process/task/processdetail/process-event.vue @@ -489,7 +489,7 @@ export default { margin-right: 4px; border-radius: 20px; } -/deep/ .ivu-layout-content{ +::v-deep .ivu-layout-content{ overflow-y: hidden !important; } diff --git a/src/views/pages/process/task/processdetail/process-omnipotent.vue b/src/views/pages/process/task/processdetail/process-omnipotent.vue index 57683fc74068259b2fa280291ba5ac954cefd469..4c7f0242cc25c29c3b3b5453bdbfbc6b2c4ab410 100644 --- a/src/views/pages/process/task/processdetail/process-omnipotent.vue +++ b/src/views/pages/process/task/processdetail/process-omnipotent.vue @@ -541,7 +541,7 @@ export default { margin-right: 4px; border-radius: 20px; } -// /deep/ .ivu-layout-sider { +// ::v-deep .ivu-layout-sider { // transition: none; // } diff --git a/src/views/pages/process/task/processdetail/process-timer.vue b/src/views/pages/process/task/processdetail/process-timer.vue index 3d2922f0f2da67bff05e43d90e66799631abbfbc..c89cb957f80ff293f3963c464033752c11dba57e 100644 --- a/src/views/pages/process/task/processdetail/process-timer.vue +++ b/src/views/pages/process/task/processdetail/process-timer.vue @@ -299,7 +299,7 @@ export default { margin-right: 4px; border-radius: 20px; } -/deep/ .ivu-layout-content{ +::v-deep .ivu-layout-content{ overflow-y: hidden !important; } diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue index 4fffda6f841af4a0cebcdec0b0a1390a2b7fce86..42561ecdb6553a7ffa0c7c6f4dcbbf4840160acf 100644 --- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue +++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue @@ -1728,10 +1728,10 @@ function getParent(node) { } diff --git a/src/views/pages/process/task/processdetail/workorder/score/score-edit.vue b/src/views/pages/process/task/processdetail/workorder/score/score-edit.vue index c5289770138854d858e596c96a4bc83697247b36..5e83bda6ce1ab69e1a0d3b5cf63f3ea86de36f14 100644 --- a/src/views/pages/process/task/processdetail/workorder/score/score-edit.vue +++ b/src/views/pages/process/task/processdetail/workorder/score/score-edit.vue @@ -156,7 +156,7 @@ export default { } .editor { padding-bottom: 16px; - /deep/ .ck-content { + ::v-deep .ck-content { min-height: 90px; } } diff --git a/src/views/pages/process/task/processdetail/workorder/step-carousel.vue b/src/views/pages/process/task/processdetail/workorder/step-carousel.vue index 1efa5a2fddf5891eb5c57eea166c5c703b179716..e56b664ddb764b18d65332740a9b15150e53d23d 100644 --- a/src/views/pages/process/task/processdetail/workorder/step-carousel.vue +++ b/src/views/pages/process/task/processdetail/workorder/step-carousel.vue @@ -300,10 +300,10 @@ export default { .Carousel { width: 248px; height: auto; - /deep/.ivu-carousel-item { + ::v-deep .ivu-carousel-item { padding: 0 1px; } - /deep/.ivu-carousel-dots { + ::v-deep .ivu-carousel-dots { bottom: 0px; position: relative; li { diff --git a/src/views/pages/process/task/processdetail/workorder/step-sla-delay.vue b/src/views/pages/process/task/processdetail/workorder/step-sla-delay.vue index 7e3c650307c5f067581eed49638132bde7fcee1a..46b80cc98b8921d389a1cf1d267f54159ada80df 100644 --- a/src/views/pages/process/task/processdetail/workorder/step-sla-delay.vue +++ b/src/views/pages/process/task/processdetail/workorder/step-sla-delay.vue @@ -145,15 +145,15 @@ export default { .list-main{ padding-bottom: 10px; } - /deep/ .ivu-scroll-container { + ::v-deep .ivu-scroll-container { height: auto !important; max-height: 190px; padding-left: 6px; } - /deep/ .ivu-dropdown-item{ + ::v-deep .ivu-dropdown-item{ padding: 0; } - /deep/ a{ + ::v-deep a{ display: block; padding: 8px 16px; } diff --git a/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue b/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue index 04f2d71eb654dd8f25b9ec90f95de4ec5fbb419b..26a438fb6820fd38e619068b22d5fa26c6bf0195 100644 --- a/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue +++ b/src/views/pages/process/task/processdetail/workorder/taskstep/step-overview.vue @@ -379,7 +379,7 @@ export default { padding-right: 18px; // 处理收起之后，右边不对齐问题 } } - /deep/ .activity-step { + ::v-deep .activity-step { margin-left: 150px; .step-log-common-box { .ivu-timeline-item-tail { @@ -448,7 +448,7 @@ export default { } } .activity-box-list{ - /deep/ .image > img { + ::v-deep .image > img { max-width: 100%; } } diff --git a/src/views/pages/process/task/processtask-manage.vue b/src/views/pages/process/task/processtask-manage.vue index 504ddd9134846b799d53d7dc834b8b49f44ea70e..c9f5beb3731f971569c5223b6ffc4e9a029188d5 100644 --- a/src/views/pages/process/task/processtask-manage.vue +++ b/src/views/pages/process/task/processtask-manage.vue @@ -903,7 +903,7 @@ html { } } .workcenter-table { - /deep/ .table-action { + ::v-deep .table-action { .icon-setting { padding-right: 9px; padding-left: 4px; @@ -912,19 +912,19 @@ html { } .tstable-box { // 修复关注工单列左右间隙过大问题 - /deep/ td:nth-of-type(1) { + ::v-deep td:nth-of-type(1) { padding-right: 0 !important; } - /deep/ td:nth-of-type(2) { + ::v-deep td:nth-of-type(2) { padding-right: 0 !important; } - /deep/ td:nth-of-type(2) { + ::v-deep td:nth-of-type(2) { padding-left: 4px !important; } - /deep/ th:nth-of-type(3) { + ::v-deep th:nth-of-type(3) { padding-left: 0 !important; } - /deep/ td:nth-of-type(3) { + ::v-deep td:nth-of-type(3) { padding-left: 0 !important; } .text-wrap { diff --git a/src/views/pages/rdm/project/content-handler/content-handler-dialog.vue b/src/views/pages/rdm/project/content-handler/content-handler-dialog.vue index beb6ca90be5e489d6d0930c4423835ed2aaa1238..d84a379357cf629c125e760b20025e31682ab564 100644 --- a/src/views/pages/rdm/project/content-handler/content-handler-dialog.vue +++ b/src/views/pages/rdm/project/content-handler/content-handler-dialog.vue @@ -71,16 +71,16 @@ export default { }; diff --git a/src/views/pages/rdm/project/content-handler/content-handler.vue b/src/views/pages/rdm/project/content-handler/content-handler.vue index f911e3ac66e2a5b9f19bb0248f2d9854c0c65f01..c1b9305da6585895ab2db1f4771cc5882e20bfdd 100644 --- a/src/views/pages/rdm/project/content-handler/content-handler.vue +++ b/src/views/pages/rdm/project/content-handler/content-handler.vue @@ -125,16 +125,16 @@ export default { }; diff --git a/src/views/pages/rdm/project/edittab/components/app-status-edit.vue b/src/views/pages/rdm/project/edittab/components/app-status-edit.vue index ecf2b0b012a9395b4c2d83f941db0d8ccc4d29af..d25d109418ab4116c0b7f6b8d384fa1c8d4e298c 100644 --- a/src/views/pages/rdm/project/edittab/components/app-status-edit.vue +++ b/src/views/pages/rdm/project/edittab/components/app-status-edit.vue @@ -425,7 +425,7 @@ export default { left: 50%; width: 50%; } -/deep/.folder-tr > td { +::v-deep .folder-tr > td { padding: 0px; } diff --git a/src/views/pages/rdm/project/viewtab/components/condition-group.vue b/src/views/pages/rdm/project/viewtab/components/condition-group.vue index 09772fb582fbb0ddaac50a5d25fdc3f09eaffc6d..749f67b5cda864c61d8433500dc7b478b61a0b95 100644 --- a/src/views/pages/rdm/project/viewtab/components/condition-group.vue +++ b/src/views/pages/rdm/project/viewtab/components/condition-group.vue @@ -361,7 +361,7 @@ export default { diff --git a/src/views/pages/rdm/project/viewtab/dashboard/dashboard-edit.vue b/src/views/pages/rdm/project/viewtab/dashboard/dashboard-edit.vue index eb587416f003d62398fa46b6bf8d69134fc7db99..3fed78d630e9eca3a0b46650627d40fba0426bc3 100644 --- a/src/views/pages/rdm/project/viewtab/dashboard/dashboard-edit.vue +++ b/src/views/pages/rdm/project/viewtab/dashboard/dashboard-edit.vue @@ -556,13 +556,13 @@ export default { } .theme(@background-color) { .formitem-container { - /deep/ .ivu-collapse-content { + ::v-deep .ivu-collapse-content { background-color: @background-color; > .ivu-collapse-content-box { padding-top: 0; } } - /deep/ .ivu-collapse { + ::v-deep .ivu-collapse { border: none; } } diff --git a/src/views/pages/rdm/project/viewtab/iteration/iteration.vue b/src/views/pages/rdm/project/viewtab/iteration/iteration.vue index 7e6461affd247a3bd6dd2372ffcb5cb8140715d9..04340181a1c18d96d1cfc62e3eae218090b9c8a4 100644 --- a/src/views/pages/rdm/project/viewtab/iteration/iteration.vue +++ b/src/views/pages/rdm/project/viewtab/iteration/iteration.vue @@ -205,7 +205,7 @@ export default { diff --git a/src/views/pages/report/report/report-show.vue b/src/views/pages/report/report/report-show.vue index c143e5d7254682cab833d9295b50ba140ed031d2..19490fd55f6edb4423390a28f3a22bfc75d65af0 100644 --- a/src/views/pages/report/report/report-show.vue +++ b/src/views/pages/report/report/report-show.vue @@ -271,7 +271,7 @@ export default { @import '~@/resources/assets/css/report/report.less'; diff --git a/src/views/pages/report/report/reportinstance-show.vue b/src/views/pages/report/report/reportinstance-show.vue index b483159b0dcee5adbf670a6889ecaec8cd160355..2de18a1bdaf1e67d9f7aeeda65807f9dbfa898b7 100644 --- a/src/views/pages/report/report/reportinstance-show.vue +++ b/src/views/pages/report/report/reportinstance-show.vue @@ -232,7 +232,7 @@ export default {