bri-components 1.2.46 → 1.2.47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/controls/BriControlInput.vue +70 -30
- package/src/styles/components/index.less +0 -2
- package/src/styles/components/list/BriTable.less +5 -5
- package/src/styles/global/animate.less +11 -0
- package/src/styles/{common/common.less → global/base.less} +2 -2
- package/src/styles/global/global.less +6 -0
- package/src/styles/{common → global}/text.less +3 -3
- package/src/styles/{variables.less → global/variables.less} +0 -2
- package/src/styles/index.less +11 -7
- package/src/styles/{plugin/easytable.less → reset-easytable.less} +0 -1
- package/src/styles/{plugin/iview.less → reset-iview.less} +0 -3
- package/src/styles/reset.less +0 -1
- package/src/styles/animate.less +0 -16
- package/src/styles/common/index.less +0 -5
- package/src/styles/components/controls/BriControlInput.less +0 -34
- package/src/styles/plugin/index.less +0 -2
- /package/src/styles/{common/control.less → control.less} +0 -0
- /package/src/styles/{common → global}/box.less +0 -0
- /package/src/styles/{common → global}/flex.less +0 -0
package/package.json
CHANGED
|
@@ -4,41 +4,43 @@
|
|
|
4
4
|
@mouseenter="isHover = true"
|
|
5
5
|
@mouseleave="isHover = false"
|
|
6
6
|
>
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
7
|
+
<template>
|
|
8
|
+
<!-- 有值 -->
|
|
9
|
+
<template v-if="!$isEmptyData(value)">
|
|
10
|
+
<!-- 数组的 -->
|
|
11
|
+
<dsh-tags
|
|
12
|
+
v-if="Array.isArray(value)"
|
|
13
|
+
class="overflow"
|
|
14
|
+
:list="value"
|
|
15
|
+
:propsObj="{
|
|
15
16
|
disabled: !canEdit,
|
|
16
17
|
closable: true
|
|
17
18
|
}"
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
@delete="clickDeleteItem"
|
|
20
|
+
></dsh-tags>
|
|
20
21
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
<!-- 对象的 地理坐标 -->
|
|
23
|
+
<div
|
|
24
|
+
v-else-if="$dataType(value, 'object')"
|
|
25
|
+
class="text"
|
|
26
|
+
>
|
|
27
|
+
{{ value._name || value.name || value.lnglat }}
|
|
28
|
+
</div>
|
|
28
29
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
30
|
+
<!-- 文字的 -->
|
|
31
|
+
<div
|
|
32
|
+
v-else
|
|
33
|
+
class="text"
|
|
34
|
+
>
|
|
35
|
+
{{ value }}
|
|
36
|
+
</div>
|
|
37
|
+
</template>
|
|
38
|
+
<!-- 无值 -->
|
|
39
|
+
<template v-else>
|
|
40
|
+
<div class="placeholder">
|
|
41
|
+
{{ propsObj._placeholder }}
|
|
42
|
+
</div>
|
|
43
|
+
</template>
|
|
42
44
|
</template>
|
|
43
45
|
|
|
44
46
|
<!-- 图标 -->
|
|
@@ -92,3 +94,41 @@
|
|
|
92
94
|
}
|
|
93
95
|
};
|
|
94
96
|
</script>
|
|
97
|
+
|
|
98
|
+
<style lang="less" scoped>
|
|
99
|
+
.BriControlInput {
|
|
100
|
+
height: 32px;
|
|
101
|
+
padding: 4px 0 4px 7px;
|
|
102
|
+
line-height: 24px;
|
|
103
|
+
.dsh-flex-row-between-center();
|
|
104
|
+
|
|
105
|
+
.text {
|
|
106
|
+
.dsh-ellipsis();
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
.overflow {
|
|
110
|
+
overflow: auto;
|
|
111
|
+
.bri-scrollbar3();
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
.placeholder {
|
|
115
|
+
flex: 1;
|
|
116
|
+
min-width: 0px;
|
|
117
|
+
overflow: hidden;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
.ivu-icon {
|
|
121
|
+
padding: 5px;
|
|
122
|
+
color: @placeholder-disabled-color;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
.icon {
|
|
126
|
+
&-default {
|
|
127
|
+
|
|
128
|
+
}
|
|
129
|
+
&-close {
|
|
130
|
+
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
</style>
|
|
@@ -38,13 +38,13 @@
|
|
|
38
38
|
&-empty {
|
|
39
39
|
width: 100%;
|
|
40
40
|
height: 100%;
|
|
41
|
-
|
|
42
|
-
text-align: center;
|
|
41
|
+
padding: 9px 20px;
|
|
43
42
|
border: 1px solid @borderColor;
|
|
44
43
|
border-top: none;
|
|
45
|
-
|
|
46
|
-
border-bottom-
|
|
47
|
-
|
|
44
|
+
// border-bottom-left-radius: @borderRadius;
|
|
45
|
+
// border-bottom-right-radius: @borderRadius;
|
|
46
|
+
text-align: center;
|
|
47
|
+
color: @textColor;
|
|
48
48
|
.dsh-flex-row-center-center();
|
|
49
49
|
}
|
|
50
50
|
|
|
@@ -5,9 +5,7 @@
|
|
|
5
5
|
font-weight: 600;
|
|
6
6
|
color: @textColor;
|
|
7
7
|
}
|
|
8
|
-
.dsh-subtitle {
|
|
9
8
|
|
|
10
|
-
}
|
|
11
9
|
.dsh-tip {
|
|
12
10
|
width: 100%;
|
|
13
11
|
padding: 20px 10px;
|
|
@@ -16,6 +14,7 @@
|
|
|
16
14
|
font-weight: 500;
|
|
17
15
|
color: @textColor;
|
|
18
16
|
}
|
|
17
|
+
|
|
19
18
|
.dsh-subtip {
|
|
20
19
|
width: 100%;
|
|
21
20
|
text-align: center;
|
|
@@ -24,6 +23,7 @@
|
|
|
24
23
|
color: @placeholderColor;
|
|
25
24
|
// background-color: #f3f3f3;
|
|
26
25
|
}
|
|
26
|
+
|
|
27
27
|
// 出现三个点
|
|
28
28
|
.dsh-ellipsis {
|
|
29
29
|
display: block;
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
white-space: nowrap;
|
|
33
33
|
text-overflow: ellipsis;
|
|
34
34
|
}
|
|
35
|
-
.dsh-ellipsis2{
|
|
35
|
+
.dsh-ellipsis2 {
|
|
36
36
|
overflow: hidden;
|
|
37
37
|
text-overflow: -o-ellipsis-lastline;
|
|
38
38
|
text-overflow: ellipsis;
|
package/src/styles/index.less
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
@import "
|
|
2
|
-
@import "
|
|
3
|
-
@import "./reset.less"; //
|
|
4
|
-
@import "./
|
|
5
|
-
@import "./
|
|
6
|
-
|
|
7
|
-
@import "./
|
|
1
|
+
@import "~vue-easytable/packages/theme-default/index.less"; // 引入官方提供的less样式入口文件
|
|
2
|
+
@import "~view-design/src/styles/index.less"; // 第三方组件库样式
|
|
3
|
+
@import "./reset-easytable.less"; // 重置easytable样式
|
|
4
|
+
@import "./reset-iview.less"; // 重置iview样式
|
|
5
|
+
@import "./reset.less"; // 重置样式
|
|
6
|
+
|
|
7
|
+
// @import "./global/global.less"; // 全局公共css
|
|
8
|
+
@import "./iconfont/iconfont.css"; // 字体图标样式
|
|
9
|
+
@import "./control.less"; // 控件共用样式，不需混入方式使用，所以不用放global
|
|
10
|
+
|
|
11
|
+
@import "./components/index.less"; // 组件样式
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
@import '~view-design/src/styles/index.less';
|
|
2
|
-
|
|
3
1
|
// 可替换样式 https://github.com/view-design/ViewUI/blob/master/src/styles/custom.less
|
|
4
|
-
// 直接引入变量custom_web报错，其他项目不报错，
|
|
5
2
|
@primary-color : #3DB8C5; // @themeColor;
|
|
6
3
|
@text-color : rgba(0, 0, 0, 0.9);
|
|
7
4
|
@border-radius-base : 4px;
|
package/src/styles/reset.less
CHANGED
package/src/styles/animate.less
DELETED
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
.BriControlInput {
|
|
2
|
-
height: 32px;
|
|
3
|
-
padding: 4px 0 4px 7px;
|
|
4
|
-
line-height: 24px;
|
|
5
|
-
.dsh-flex-row-between-center();
|
|
6
|
-
|
|
7
|
-
.text {
|
|
8
|
-
.dsh-ellipsis();
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
.overflow {
|
|
12
|
-
overflow: auto;
|
|
13
|
-
.bri-scrollbar3();
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
.placeholder {
|
|
17
|
-
flex: 1;
|
|
18
|
-
min-width: 0px;
|
|
19
|
-
overflow: hidden;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
.ivu-icon {
|
|
23
|
-
padding: 5px;
|
|
24
|
-
color: @placeholder-disabled-color;
|
|
25
|
-
}
|
|
26
|
-
.icon {
|
|
27
|
-
&-default {
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
&-close {
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|