bri-components 1.4.36 → 1.4.37

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/controls/DshControlInput.vue +2 -1
  3. package/src/components/controls/base/DshCascader/components/cascaderPicker.vue +2 -1
  4. package/src/components/controls/mixins/controlMixin.js +1 -1
  5. package/src/components/controls/mixins/userAndDepartMixin.js +1 -0
  6. package/src/components/small/DshTags.vue +18 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.4.36",
3
+ "version": "1.4.37",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/DshControlInput.vue CHANGED
@@ -22,7 +22,8 @@
22
22
  :list="value"
23
23
  :propsObj="{
24
24
  disabled: disabled,
25
- closable: true
25
+ closable: true,
26
+ useDeleteTip: propsObj._useDeleteTip
26
27
  }"
27
28
  @delete="clickDeleteItem"
28
29
  @clickItem="clickItem"
package/src/components/controls/base/DshCascader/components/cascaderPicker.vue CHANGED
@@ -359,12 +359,13 @@
359
359
  &-list {
360
360
  width: 100%;
361
361
  min-height: 280px;
362
- max-height: 340px;
362
+ max-height: 360px;
363
363
  padding: 5px 10px 10px;
364
364
  overflow: auto;
365
365
 
366
366
  &-menu {
367
367
  .item {
368
+ margin: 2px 0px;
368
369
  padding: 8px 10px;
369
370
  border-radius: @borderRadius;
370
371
  line-height: 16px;
package/src/components/controls/mixins/controlMixin.js CHANGED
@@ -110,7 +110,7 @@ export default {
110
110
  ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
111
111
  : "",
112
112
  _clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
113
- _disabled: !this.finalCanEdit || !!this.propsObj._disabled || !!this.propsObj._readonly
113
+ _disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly)
114
114
  };
115
115
  },
116
116
  // 是否为多选模式
package/src/components/controls/mixins/userAndDepartMixin.js CHANGED
@@ -53,6 +53,7 @@ export default {
53
53
  return {
54
54
  _highSearch: false,
55
55
  _searchString: "",
56
+ _useDeleteTip: false, // 删除项进行提示
56
57
 
57
58
  _reverseFilter: false, // 反向过滤
58
59
  _userDepartFilterVals: [], // 过滤的数据的第一级选项
package/src/components/small/DshTags.vue CHANGED
@@ -172,10 +172,24 @@
172
172
  },
173
173
  // 删除标签
174
174
  deleteTag (event, item, index) {
175
- this.list.splice(index, 1);
176
- this.callEliipsis();
177
- this.$emit("change", [...this.list]);
178
- this.$emit("delete", item, index);
175
+ const cb = () => {
176
+ this.list.splice(index, 1);
177
+ this.callEliipsis();
178
+ this.$emit("change", [...this.list]);
179
+ this.$emit("delete", item, index);
180
+ };
181
+
182
+ if (this.propsObj.useDeleteTip === true) {
183
+ this.$Modal.confirm({
184
+ title: "提示",
185
+ content: `确定删除"${this.getItemName(item)}"吗？`,
186
+ onOk: () => {
187
+ cb();
188
+ }
189
+ });
190
+ } else {
191
+ cb();
192
+ }
179
193
  },
180
194
  // 改变标签状态
181
195
  changeChecked (checked, name) {