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.

Sign up for GitHub

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

帮助文档样式和vModel绑定修复 #1423

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+359 −42
Open

帮助文档样式和vModel绑定修复 #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75f8f63
fix: 帮助文档详情样式放开
LivySara Dec 11, 2024
f0b5e99
fix: vue3/vue2的bk组件带有vModel的属性tips修改&vue3的bk组件可配置vModel指令添加
LivySara Dec 11, 2024
b252a86
fix: 源码生成公共样式优化
LivySara Dec 13, 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
6 changes: 3 additions & 3 deletions lib/client/src/components/help-doc-detail/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</div>
</aside>
<div class="main-content">
<div v-if="isExistDoc" :class="['container', detailBodyCls]">
<div v-if="isExistDoc" :class="['doc-container', detailBodyCls]">
<components :is="selectDoc" />
</div>
<bk-exception v-else type="empty" scene="part" ext-cls="excep-cls">
Expand Down Expand Up @@ -182,9 +182,9 @@
})
</script>

<style lang="postcss" scoped>
<style lang="postcss">
@import './index.css';
.container{
.doc-container{
width: 1000px;
margin: 0 auto;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/client/src/element-materials/materials/vue2/bk/cascade/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default {
]
}],
displayName: '当前被选中值',
tips: '当前被选中的值，支持v-model，多选时配置一个二维数组',
tips: '当前被选中的值，多选时配置一个二维数组，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'selection'
},
list: {
Expand Down
2 changes: 2 additions & 0 deletions lib/client/src/element-materials/materials/vue2/bk/checkbox-group/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ export default {
value: {
type: 'array',
val: [],
directive: 'v-model',
displayName: '选中的数值',
tips: '选中的数值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
name: {
Expand Down
1 change: 1 addition & 0 deletions lib/client/src/element-materials/materials/vue2/bk/checkbox/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export default {
type: 'boolean',
val: false,
displayName: '选中的数值',
tips: '选中的数值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
name: {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/src/element-materials/materials/vue2/bk/color-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default {
type: 'string',
val: '#3A84FF',
displayName: '初始RGB颜色值',
tips: '当前选择的RGB颜色值',
tips: '当前选择的RGB颜色值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
size: {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/src/element-materials/materials/vue2/bk/date-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default {
// 正则校验错误时的提示文本，默认值为"格式错误，请重新输入"
regErrorText: '请输入正确的日期格式，如"2020-01-01"',
displayName: '日历值',
tips: '日期，如"2020-01-01"',
tips: '日期，如"2020-01-01"，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
placeholder: {
Expand Down
1 change: 1 addition & 0 deletions lib/client/src/element-materials/materials/vue2/bk/input-textarea/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export default {
type: 'text',
val: '',
displayName: '输入框内容',
tips: '输入框内容，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'input'
},
type: {
Expand Down
1 change: 1 addition & 0 deletions lib/client/src/element-materials/materials/vue2/bk/input/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ export default {
type: ['string', 'number'],
val: '',
displayName: '输入框内容',
tips: '输入框内容，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'input'
},
type: {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/src/element-materials/materials/vue2/bk/radio-button-group/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default {
type: 'string',
val: 'qq',
displayName: '选中的数值',
tips: '当前选中的value值',
tips: '当前选中的value值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
name: {
Expand Down
2 changes: 2 additions & 0 deletions lib/client/src/element-materials/materials/vue2/bk/radio-group/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ export default {
props: {
value: {
type: ['string', 'number', 'boolean'],
directive: 'v-model',
displayName: '选中的数值',
tips: '选中的数值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
name: {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/src/element-materials/materials/vue2/bk/search-select/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export default {
type: 'array',
val: [],
displayName: '查询条件',
tips: '选择中查询条件',
tips: '选择中查询条件，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'queryCondition'
},
'split-code': {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/src/element-materials/materials/vue2/bk/select/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default {
},
// defaultValList: ['sss', [1, 2, 3], 3],
displayName: '选中的值',
tips: '当前被选中的值',
tips: '当前被选中的值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
multiple: {
Expand Down
1 change: 1 addition & 0 deletions lib/client/src/element-materials/materials/vue2/bk/slider/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export default {
type: 'number',
val: 30,
displayName: '滑动数值',
tips: '滑动数值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
'min-value': {
Expand Down
1 change: 1 addition & 0 deletions lib/client/src/element-materials/materials/vue2/bk/switcher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export default {
type: 'boolean',
val: false,
displayName: '是否打开',
tips: '是否打开，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
disabled: {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/src/element-materials/materials/vue2/bk/time-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default {
return ['timerange'].includes(renderProps?.type?.renderValue) ? 'array' : 'string'
},
displayName: '时间值',
tips: '时间选择器组件的值',
tips: '时间选择器组件的值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
placeholder: {
Expand Down
8 changes: 7 additions & 1 deletion lib/client/src/element-materials/materials/vue3/bk/cascader/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ export default {
verticalAlign: 'middle',
background: '#fff'
},
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '数据源', value: 'data' },
{ label: '选中值', value: 'selectVal' },
Expand All @@ -68,7 +74,7 @@ export default {
type: 'array',
val: [],
displayName: '当前被选中值',
tips: '当前被选中的值，支持v-model，多选时配置一个二维数组',
tips: '当前被选中的值，多选时配置一个二维数组，支持v-model双向绑定，v-model优先级更高',
directive: 'v-model',
belongGroup: 'selectVal'
},
Expand Down
9 changes: 8 additions & 1 deletion lib/client/src/element-materials/materials/vue3/bk/checkbox-group/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,24 @@ export default {
display: 'inline-block',
verticalAlign: 'middle'
},
directives: [
{
type: 'v-model',
prop: 'modelValue'
}
],
groups: [
{ label: '值', value: 'value' },
{ label: '状态', value: 'state' },
{ label: '其他', value: 'other' }
],
props: {
'model-value': {
'modelValue': {
type: 'array',
val: [],
directive: 'v-model',
displayName: '选中的数值',
tips: '选中的数值，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'value'
},
name: {
Expand Down
8 changes: 7 additions & 1 deletion lib/client/src/element-materials/materials/vue3/bk/checkbox/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ export default {
display: 'inline-block',
verticalAlign: 'middle'
},
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '值', value: 'value' },
{ label: '状态', value: 'state' },
Expand All @@ -49,7 +55,7 @@ export default {
type: ['boolean', 'string', 'number'],
val: false,
displayName: '设置绑定值',
tips: '绑定值',
tips: '绑定值，支持v-model双向绑定，v-model优先级更高',
directive: 'v-model',
belongGroup: 'value'
},
Expand Down
7 changes: 7 additions & 0 deletions lib/client/src/element-materials/materials/vue3/bk/collapse/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ export default {
{ displayName: '点击标题', name: 'item-click', tips: '点击时触发，回调参数为点击的面板对象 (item)' }
],
styles: ['position', 'size', 'margin', 'pointer', 'opacity'],
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '激活面板', value: 'activePanel' },
{ label: '头部', value: 'header' },
Expand All @@ -33,6 +39,7 @@ export default {
val: [],
displayName: '当前激活面板的key',
directive: 'v-model',
tips: '当前激活面板的key，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'activePanel'
},
accordion: {
Expand Down
8 changes: 7 additions & 1 deletion lib/client/src/element-materials/materials/vue3/bk/color-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ export default {
display: 'inline-flex',
verticalAlign: 'middle'
},
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '值', value: 'value' },
{ label: '显示', value: 'display' },
Expand All @@ -50,7 +56,7 @@ export default {
type: 'string',
val: '#3A84FF',
displayName: '初始RGB颜色值',
tips: '当前选择的RGB颜色值',
tips: '当前选择的RGB颜色值，支持v-model双向绑定，v-model优先级更高',
directive: 'v-model',
belongGroup: 'value'
},
Expand Down
8 changes: 7 additions & 1 deletion lib/client/src/element-materials/materials/vue3/bk/date-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ export default {
width: '300px',
verticalAlign: 'middle'
},
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '值', value: 'value' },
{ label: '值的格式', value: 'format' },
Expand All @@ -85,7 +91,7 @@ export default {
// 正则校验错误时的提示文本，默认值为"格式错误，请重新输入"
regErrorText: '请输入正确的日期格式，如"2020-01-01"',
displayName: '日历值',
tips: '日期，如"2020-01-01"',
tips: '日期，如"2020-01-01"，支持v-model双向绑定，v-model优先级更高',
directive: 'v-model',
belongGroup: 'value'
},
Expand Down
6 changes: 6 additions & 0 deletions lib/client/src/element-materials/materials/vue3/bk/dialog/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ export default {
renderStyles: {
display: 'inline-block'
},
directives: [
{
type: 'v-model',
prop: 'is-show'
}
],
groups: [
{ label: '显示', value: 'display' },
{ label: '状态', value: 'state' },
Expand Down
7 changes: 7 additions & 0 deletions lib/client/src/element-materials/materials/vue3/bk/input-textarea/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ export default {
verticalAlign: 'middle',
width: '300px'
},
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '输入内容', value: 'input' },
{ label: '提示', value: 'tip' },
Expand All @@ -89,6 +95,7 @@ export default {
val: '',
directive: 'v-model',
displayName: '输入框内容',
tips: '输入框内容，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'input'
},
type: {
Expand Down
7 changes: 7 additions & 0 deletions lib/client/src/element-materials/materials/vue3/bk/input/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ export default {
display: 'inline-flex',
width: '300px'
},
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '输入内容', value: 'input' },
{ label: '类型', value: 'type' },
Expand All @@ -101,6 +107,7 @@ export default {
val: '',
directive: 'v-model',
displayName: '输入框内容',
tips: '输入框内容，支持v-model双向绑定，v-model优先级更高',
belongGroup: 'input'
},
type: {
Expand Down
8 changes: 7 additions & 1 deletion lib/client/src/element-materials/materials/vue3/bk/pagination/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ export default {
],
renderStyles: {
},
directives: [
{
type: 'v-model',
prop: 'model-value'
}
],
groups: [
{ label: '数据量', value: 'data' },
{ label: '页码', value: 'pageNumber' },
Expand All @@ -87,7 +93,7 @@ export default {
type: 'number',
val: 1,
displayName: '当前页码',
tips: '当前页码',
tips: '当前页码，支持v-model双向绑定，v-model优先级更高',
directive: 'v-model',
belongGroup: 'pageNumber'
},
Expand Down
8 changes: 7 additions & 1 deletion lib/client/src/element-materials/materials/vue3/bk/process/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ export default {
'pointer',
'opacity'
],
directives: [
{
type: 'v-model',
prop: 'cur-process'
}
],
groups: [
{ label: '数据源', value: 'dataSource' },
{ label: '步骤索引', value: 'stepIndex' },
Expand Down Expand Up @@ -77,7 +83,7 @@ export default {
type: 'number',
val: 0,
displayName: '步骤索引值',
tips: '当前步骤的索引值，支持 .sync 修饰符',
tips: '当前步骤的索引值，支持 .sync 修饰符，也支持v-model双向绑定，v-model优先级更高',
regExp: /^(0|[1-9][0-9]*)$/,
regErrorText: '请输入大于等于0的整数',
directive: 'v-model',
Expand Down
Loading