bri-components 1.1.0 → 1.1.1

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.
Files changed (50) hide show
  1. package/lib/2.bri-components.min.js +1 -1
  2. package/lib/4.bri-components.min.js +1 -1
  3. package/lib/6.bri-components.min.js +1 -1
  4. package/lib/7.bri-components.min.js +1 -1
  5. package/lib/8.bri-components.min.js +1 -1
  6. package/lib/bri-components.min.js +4 -4
  7. package/package.json +1 -1
  8. package/src/components/controls/base/BriLabels.vue +116 -10
  9. package/src/components/controls/base/DshCascader.vue +1 -5
  10. package/src/components/controls/base/DshCoordinates.vue +84 -79
  11. package/src/components/controls/base/DshEditor.vue +9 -4
  12. package/src/components/controls/base/controlShow.vue +5 -5
  13. package/src/components/controls/senior/flatTable.vue +58 -53
  14. package/src/components/form/DshForm.vue +4 -0
  15. package/src/components/list/BriFlatTable.vue +13 -8
  16. package/src/components/list/BriTable.vue +1 -1
  17. package/src/components/list/DshBox/DshBox.vue +1 -1
  18. package/src/components/list/DshBox/DshCard.vue +1 -1
  19. package/src/components/list/DshBox/DshCrossTable.vue +1 -1
  20. package/src/components/list/DshBox/DshList.vue +3 -3
  21. package/src/components/list/DshBox/DshPanel.vue +1 -1
  22. package/src/components/list/DshBox/DshSingleData.vue +1 -1
  23. package/src/components/list/DshCascaderTable.vue +2 -1
  24. package/src/components/list/DshFlatTable.vue +1 -1
  25. package/src/components/list/easyTable/v-table/src/table.vue +3 -3
  26. package/src/components/list/evTable/EvTable.vue +1 -1
  27. package/src/components/other/BriTransfer.vue +1 -1
  28. package/src/components/other/ZGantt.vue +2 -2
  29. package/src/components/small/DshControlDefine.vue +2 -1
  30. package/src/components/small/DshDropdown.vue +1 -1
  31. package/src/components/small/DshTdRender.js +1 -1
  32. package/src/styles/common/control.less +1 -0
  33. package/src/styles/components/controls/BriLabels.less +99 -3
  34. package/src/styles/components/controls/DshCoordinates.less +6 -1
  35. package/src/styles/components/controls/DshInput.less +6 -0
  36. package/src/styles/components/controls/controlShow.less +0 -2
  37. package/src/styles/components/index.less +1 -1
  38. package/src/styles/components/small/DshControlDefine.less +13 -35
  39. package/src/styles/components/small/DshTitle.less +0 -3
  40. package/src/styles/components/unit/DshFormItem.less +1 -1
  41. package/src/styles/iconfont/iconfont.css +254 -0
  42. package/src/styles/iconfont/iconfont.eot +0 -0
  43. package/src/styles/iconfont/iconfont.js +1 -0
  44. package/src/styles/iconfont/iconfont.json +422 -0
  45. package/src/styles/iconfont/iconfont.svg +137 -0
  46. package/src/styles/iconfont/iconfont.ttf +0 -0
  47. package/src/styles/iconfont/iconfont.woff +0 -0
  48. package/src/styles/iconfont/iconfont.woff2 +0 -0
  49. package/src/styles/index.less +1 -0
  50. package/src/styles/plugin/iview.less +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.1.0",
3
+ "version": "1.1.1",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
@@ -1,22 +1,38 @@
1
1
  <!-- 动态标签 -->
2
2
  <template>
3
3
  <div class="BriLabels">
4
+ <!-- 编辑 -->
4
5
  <Dropdown
6
+ v-if="finalCanEdit"
5
7
  class="BriLabels-dropdown"
6
8
  trigger="custom"
7
9
  placement="bottom-start"
8
- transfer
9
10
  :visible="listVisible"
10
11
  @on-clickoutside="clickInput"
11
12
  >
12
- <Input
13
- class="BriLabels-dropdown-input"
14
- :value="showValStr"
15
- :suffix="inputIcon"
16
- readonly
17
- @click.native="clickInput"
13
+ <div
14
+ :class="{
15
+ 'BriLabels-dropdown-show':true,
16
+ 'BriLabels-dropdown-show-active':listVisible
17
+ }"
18
+ @click="clickInput"
18
19
  >
19
- </Input>
20
+ <div>
21
+ <Tag
22
+ v-for="item in val"
23
+ :key="item._key"
24
+ closable
25
+ @on-close="handleCancel(item)"
26
+ >
27
+ {{item.name}}
28
+ </Tag>
29
+ </div>
30
+ <Icon
31
+ class="BriLabels-dropdown-show-arrow"
32
+ color="#808695"
33
+ :type="inputIcon"
34
+ />
35
+ </div>
20
36
  <template #list>
21
37
  <DropdownMenu>
22
38
  <DropdownItem
@@ -26,12 +42,75 @@
26
42
  'BriLabels-dropdown-item':true,
27
43
  'BriLabels-dropdown-item-active':!!val.find(i=>i._key == item._key)
28
44
  }"
45
+ @click.native="clickItem(item)"
29
46
  >
30
- {{item.name}}
47
+ <div
48
+ class="BriLabels-dropdown-item-show"
49
+ v-if="!item.isEdit"
50
+ >
51
+ {{item.name}}
52
+ <span class="BriLabels-dropdown-item-show-icons">
53
+ <Icon
54
+ class="BriLabels-dropdown-item-show-icons-edit"
55
+ custom="bri bri-bianji"
56
+ @click.stop="clickEdit(item)"
57
+ />
58
+ <Icon
59
+ class="BriLabels-dropdown-item-show-icons-del"
60
+ custom="bri bri-shanchu"
61
+ />
62
+ </span>
63
+ </div>
64
+ <div
65
+ class="BriLabels-dropdown-item-edit"
66
+ v-else
67
+ >
68
+ <Input
69
+ v-model="item.name"
70
+ @click.native="editItem($event)"
71
+ >
72
+ <template #suffix>
73
+ <Icon
74
+ color="#3DB8C5"
75
+ custom="bri bri-duigou"
76
+ @click.native.stop="confirmEdit(item)"
77
+ />
78
+ </template>
79
+ </Input>
80
+ </div>
31
81
  </DropdownItem>
82
+ sds
32
83
  </DropdownMenu>
33
84
  </template>
34
85
  </Dropdown>
86
+ <!-- 查看 -->
87
+ <div
88
+ v-else
89
+ class="BriLabels-view"
90
+ >
91
+ <template v-if="val.length">
92
+ <Tag
93
+ v-for="tagItem in val"
94
+ :key="tagItem._key"
95
+ size="medium"
96
+ class="BriLabels-view-tag"
97
+ >
98
+ {{ tagItem.name }}
99
+ </Tag>
100
+ </template>
101
+
102
+ <div
103
+ v-else
104
+ class="BriLabels-view-nodata"
105
+ >
106
+ <template v-if="isUnit">
107
+ -
108
+ </template>
109
+ <template v-else>
110
+ 暂无内容
111
+ </template>
112
+ </div>
113
+ </div>
35
114
  </div>
36
115
  </template>
37
116
 
@@ -98,17 +177,44 @@
98
177
  }
99
178
  },
100
179
  callback: data => {
101
- this.listData = data.list;
180
+ this.listData = data.list.map(item => {
181
+ return {
182
+ ...item,
183
+ isEdit: false
184
+ };
185
+ });
102
186
  }
103
187
  });
104
188
  },
105
189
  clickInput () {
190
+ if (!this.finalCanEdit) return;
106
191
  this.listVisible = !this.listVisible;
107
192
  if (this.listVisible) {
108
193
  this.inputIcon = "ios-arrow-up";
109
194
  } else {
110
195
  this.inputIcon = "ios-arrow-down";
111
196
  }
197
+ },
198
+ clickItem (item) {
199
+ if (this.val.findIndex(i => i._key == item._key) > -1) {
200
+ this.val = this.val.filter(i => i._key != item._key);
201
+ } else {
202
+ this.val.push(item);
203
+ }
204
+ },
205
+ clickEdit (item) {
206
+ item.isEdit = true;
207
+ this.$forceUpdate();
208
+ },
209
+ editItem (e) {
210
+ e.stopPropagation();
211
+ },
212
+ confirmEdit (item) {
213
+ item.isEdit = false;
214
+ this.$forceUpdate();
215
+ },
216
+ handleCancel (item) {
217
+ this.val = this.val.filter(i => i._key != item._key);
112
218
  }
113
219
  },
114
220
  watch: {
@@ -36,11 +36,7 @@
36
36
  <!-- 弹框模式 -->
37
37
  <template v-if="selfPropsObj._showMode === 'custom'">
38
38
  <div
39
- :class="{
40
- 'DshCascader-single': true,
41
- 'dsh-control-readonly': $isReadonly(canEdit, propsObj),
42
- 'dsh-control-disabled': $isDisabled(canEdit, propsObj)
43
- }"
39
+ :class="commonClass"
44
40
  @click="openModal"
45
41
  >
46
42
  <div
@@ -37,107 +37,112 @@
37
37
  </div>
38
38
 
39
39
  <!-- 查看模式 -->
40
- <span v-else :class="commonClass">
40
+ <span v-else :class="{
41
+ ...commonClass,
42
+ 'DshCoordinates-show': !isUnit
43
+ }">
41
44
  {{ showText }}
42
45
  </span>
43
46
  </Ctooltip>
44
47
 
45
48
  <!-- 模态框 -->
46
- <Modal
47
- class="DshCoordinates-modal clearFlex-modal"
48
- v-model="showModal"
49
- title="选择位置"
50
- :footer-hide="true"
51
- :styles="modalStyles"
52
- @on-cancel="clickCancel"
53
- >
54
- <div
55
- slot="header"
56
- class="DshCoordinates-modal-header"
49
+ <template v-if="canEdit">
50
+ <Modal
51
+ class="DshCoordinates-modal clearFlex-modal"
52
+ v-model="showModal"
53
+ title="选择位置"
54
+ :footer-hide="true"
55
+ :styles="modalStyles"
56
+ @on-cancel="clickCancel"
57
57
  >
58
- <Row
59
- v-if="finalCanEdit"
60
- type="flex"
61
- justify="center"
62
- align="bottom"
58
+ <div
59
+ slot="header"
60
+ class="DshCoordinates-modal-header"
63
61
  >
64
- <Col span="8">
65
- <div>
66
- <RadioGroup v-model="formData.kind">
67
- <Radio label="keyword">按关键字搜索</Radio>
68
- <Radio label="coordinate">按坐标搜索</Radio>
69
- </RadioGroup>
70
- </div>
71
- <Row class="dsh-margin-top5">
72
- <Col span="16">
73
- <Input
74
- v-model="formData.searchText"
75
- placeholder="请输入..."
76
- :clearable="true"
77
- @on-enter="clickSearch"
78
- />
79
- <span class="DshCoordinates-message">{{ searchMessage }}</span>
62
+ <Row
63
+ v-if="finalCanEdit"
64
+ type="flex"
65
+ justify="center"
66
+ align="bottom"
67
+ >
68
+ <Col span="8">
69
+ <div>
70
+ <RadioGroup v-model="formData.kind">
71
+ <Radio label="keyword">按关键字搜索</Radio>
72
+ <Radio label="coordinate">按坐标搜索</Radio>
73
+ </RadioGroup>
74
+ </div>
75
+ <Row class="dsh-margin-top5">
76
+ <Col span="16">
77
+ <Input
78
+ v-model="formData.searchText"
79
+ placeholder="请输入..."
80
+ :clearable="true"
81
+ @on-enter="clickSearch"
82
+ />
83
+ <span class="DshCoordinates-message">{{ searchMessage }}</span>
84
+ </Col>
85
+ <Col span="8">&nbsp;
86
+ <Button
87
+ type="primary"
88
+ @click="clickSearch"
89
+ >搜索</Button>
90
+ </Col>
91
+ </Row>
80
92
  </Col>
81
- <Col span="8">&nbsp;
82
- <Button
83
- type="primary"
84
- @click="clickSearch"
85
- >搜索</Button>
93
+
94
+ <Col span="8">
95
+ <div class="DshCoordinates-modal-header-text">坐标获取结果</div>
96
+ <Row class="dsh-margin-top5">
97
+ <Col span="16">
98
+ <Input
99
+ :value="curVal.name"
100
+ :readonly="true"
101
+ :clearable="true"
102
+ @on-clear="clickClear"
103
+ @click.native="clickMapFitView"
104
+ />
105
+ </Col>
106
+ <Col span="8">&nbsp;
107
+ <Button
108
+ type="primary"
109
+ @click="clickConfirm"
110
+ >确认</Button>
111
+ </Col>
112
+ </Row>
86
113
  </Col>
87
114
  </Row>
88
- </Col>
89
115
 
90
- <Col span="8">
91
- <div class="DshCoordinates-modal-header-text">坐标获取结果</div>
92
- <Row class="dsh-margin-top5">
93
- <Col span="16">
116
+ <Row v-else>
117
+ <Col
118
+ span="6"
119
+ class="textRight dsh-padding-top10"
120
+ >当前位置:</Col>
121
+ <Col span="12">
94
122
  <Input
95
123
  :value="curVal.name"
96
124
  :readonly="true"
97
- :clearable="true"
98
- @on-clear="clickClear"
99
125
  @click.native="clickMapFitView"
100
126
  />
101
127
  </Col>
102
- <Col span="8">&nbsp;
103
- <Button
104
- type="primary"
105
- @click="clickConfirm"
106
- >确认</Button>
128
+ <Col span="6">
107
129
  </Col>
108
130
  </Row>
109
- </Col>
110
- </Row>
111
-
112
- <Row v-else>
113
- <Col
114
- span="6"
115
- class="textRight dsh-padding-top10"
116
- >当前位置:</Col>
117
- <Col span="12">
118
- <Input
119
- :value="curVal.name"
120
- :readonly="true"
121
- @click.native="clickMapFitView"
122
- />
123
- </Col>
124
- <Col span="6">
125
- </Col>
126
- </Row>
127
- </div>
131
+ </div>
128
132
 
129
- <transition>
133
+ <transition>
134
+ <div
135
+ v-if="showModal"
136
+ id="mapContain"
137
+ class="DshCoordinates-map"
138
+ ></div>
139
+ </transition>
130
140
  <div
131
- v-if="showModal"
132
- id="mapContain"
133
- class="DshCoordinates-map"
141
+ ref="divCoordinate"
142
+ style="display: none; position:absolute;background:#fff;padding: 5px 10px"
134
143
  ></div>
135
- </transition>
136
- <div
137
- ref="divCoordinate"
138
- style="display: none; position:absolute;background:#fff;padding: 5px 10px"
139
- ></div>
140
- </Modal>
144
+ </Modal>
145
+ </template>
141
146
  </div>
142
147
  </template>
143
148
 
@@ -1,11 +1,16 @@
1
1
  <template>
2
2
  <div class="DshEditor">
3
3
  <!-- 有值、无值 可编辑 -->
4
- <div v-if="isUnit" class="DshEditor-unit">
5
- <span class="DshEditor-unit-text">
6
- {{ unitVal }}
4
+ <template v-if="isUnit">
5
+ <div v-if="value[controlKey]" class="DshEditor-unit">
6
+ <span class="DshEditor-unit-text">
7
+ 富文本
8
+ </span>
9
+ </div>
10
+ <span v-else class="control-notext">
11
+ -
7
12
  </span>
8
- </div>
13
+ </template>
9
14
 
10
15
  <template v-else-if="finalCanEdit">
11
16
  <div class="DshEditor-show DshEditor-edit"
@@ -5,18 +5,18 @@
5
5
  maxWidth="200"
6
6
  :content="showVal"
7
7
  >
8
- <span
8
+ <div
9
9
  v-if="$isFormItemHasData(showVal)"
10
10
  class="dsh-ellipsis controlShow-val"
11
11
  >
12
12
  {{ showVal }}
13
- </span>
14
- <span
13
+ </div>
14
+ <div
15
15
  v-else
16
16
  class="controlShow-nodata dsh-ellipsis"
17
17
  >
18
18
  {{noDataText}}
19
- </span>
19
+ </div>
20
20
  </Ctooltip>
21
21
  </div>
22
22
  </template>
@@ -41,7 +41,7 @@
41
41
  },
42
42
  computed: {
43
43
  noDataText () {
44
- return this.isUnit ? "-" : "暂无数据";
44
+ return this.isUnit ? "-" : "暂无内容";
45
45
  }
46
46
  },
47
47
  created () {
@@ -1,64 +1,68 @@
1
1
  <template>
2
2
  <div class="flatTable">
3
- <span v-if="isUnit" class="flatTable-unit">
4
- <dsh-icons
5
- :list="$getOperationList(['link'])"
6
- ></dsh-icons>
3
+ <span
4
+ v-if="isUnit"
5
+ class="flatTable-unit"
6
+ >
7
+ <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
7
8
  <span class="flatTable-unit-text">
8
- {{ val.list.length || 0 }}行
9
+ {{ val.list.length }}行
9
10
  </span>
10
11
  </span>
11
12
 
12
- <!-- 设置默认值所用的控件 -->
13
- <dsh-btn-modal v-else-if="propsObj._key === '_default'">
14
- <bri-flat-table
15
- :canEdit="finalCanEdit"
16
- :columns="columns"
17
- :data="val.list"
18
- :rowDefault="val.rowDefault"
19
- :propsObj="propsObj"
20
- @change="change"
21
- ></bri-flat-table>
22
- </dsh-btn-modal>
23
-
24
- <!-- 操作按钮 -->
25
13
  <template v-else>
26
- <dsh-buttons
27
- class="flatTable-btns"
28
- itemClass="flatTable-btns-item"
29
- :list="$getOperationList(['canEnlarge'])"
30
- @click="$dispatchEvent($event)"
31
- ></dsh-buttons>
14
+ <!-- 设置默认值所用的控件 -->
15
+ <dsh-btn-modal v-if="propsObj._key === '_default'">
16
+ <bri-flat-table
17
+ :canEdit="finalCanEdit"
18
+ :columns="columns"
19
+ :data="val.list"
20
+ :rowDefault="val.rowDefault"
21
+ :outObj="value"
22
+ :propsObj="propsObj"
23
+ @change="change"
24
+ ></bri-flat-table>
25
+ </dsh-btn-modal>
32
26
 
33
- <bri-flat-table
34
- ref="dshFatTable"
35
- :canEdit="finalCanEdit"
36
- :columns="columns"
37
- :data="val.list"
38
- :oldData="val.oldList"
39
- :rowDefault="val.rowDefault"
40
- :isShare="isShare"
41
- :propsObj="propsObj"
42
- @change="change"
43
- ></bri-flat-table>
27
+ <!-- 操作按钮 -->
28
+ <template v-else>
29
+ <dsh-buttons
30
+ class="flatTable-btns"
31
+ itemClass="flatTable-btns-item"
32
+ :list="$getOperationList(['canEnlarge'])"
33
+ @click="$dispatchEvent($event)"
34
+ ></dsh-buttons>
44
35
 
45
- <dsh-modal
46
- v-model="isEnlarge"
47
- mode="custom"
48
- :propsObj="modalPropsObj"
49
- >
50
36
  <bri-flat-table
51
- v-if="value[controlKey] && isEnlarge"
37
+ ref="dshFatTable"
52
38
  :canEdit="finalCanEdit"
53
39
  :columns="columns"
54
40
  :data="val.list"
55
41
  :oldData="val.oldList"
56
42
  :rowDefault="val.rowDefault"
57
- :isShare="isShare"
43
+ :outObj="value"
58
44
  :propsObj="propsObj"
59
45
  @change="change"
60
46
  ></bri-flat-table>
61
- </dsh-modal>
47
+
48
+ <dsh-modal
49
+ v-model="isEnlarge"
50
+ mode="custom"
51
+ :propsObj="modalPropsObj"
52
+ >
53
+ <bri-flat-table
54
+ v-if="value[controlKey] && isEnlarge"
55
+ :canEdit="finalCanEdit"
56
+ :columns="columns"
57
+ :data="val.list"
58
+ :oldData="val.oldList"
59
+ :rowDefault="val.rowDefault"
60
+ :outObj="value"
61
+ :propsObj="propsObj"
62
+ @change="change"
63
+ ></bri-flat-table>
64
+ </dsh-modal>
65
+ </template>
62
66
  </template>
63
67
  </div>
64
68
  </template>
@@ -68,12 +72,15 @@
68
72
 
69
73
  export default {
70
74
  name: "flatTable",
71
- mixins: [controlMixin],
75
+ mixins: [
76
+ controlMixin
77
+ ],
72
78
  components: {},
73
- props: {
74
- },
79
+ props: {},
75
80
  data () {
76
81
  return {
82
+ isEnlarge: false,
83
+
77
84
  operationMap: {
78
85
  canEnlarge: {
79
86
  name: "全屏展示",
@@ -86,8 +93,7 @@
86
93
  link: {
87
94
  customIcon: "bico-internaltable"
88
95
  }
89
- },
90
- isEnlarge: false
96
+ }
91
97
  };
92
98
  },
93
99
  computed: {
@@ -117,14 +123,13 @@
117
123
  validate () {
118
124
  return this.$refs.dshFatTable.validate();
119
125
  },
120
-
121
- change (...params) {
122
- this.$emit("change", ...params);
123
- },
124
-
125
126
  // 打开全屏模态框
126
127
  enlarge () {
127
128
  this.isEnlarge = true;
129
+ },
130
+
131
+ change (...params) {
132
+ this.$emit("change", ...params);
128
133
  }
129
134
  }
130
135
  };
@@ -331,5 +331,9 @@
331
331
  // font-size: 18px;
332
332
  // }
333
333
  }
334
+ .ivu-form-item-error-tip {
335
+ top: 90%;
336
+ left: 15px;
337
+ }
334
338
  }
335
339
  </style>