bri-components 1.4.19 → 1.4.21

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 (28) hide show
  1. package/package.json +1 -2
  2. package/src/components/controls/DshControlInput.vue +1 -1
  3. package/src/components/controls/base/BriUpload/BriUpload.vue +9 -5
  4. package/src/components/controls/base/DshCascader/DshCascader.vue +2 -2
  5. package/src/components/controls/base/DshCascader/components/cascaderModal.vue +2 -2
  6. package/src/components/controls/base/DshCascader/components/cascaderPicker.vue +2 -2
  7. package/src/components/controls/base/DshCascader/components/cascaderSimple.vue +3 -3
  8. package/src/components/controls/base/DshCoordinates.vue +5 -5
  9. package/src/components/controls/base/DshDate/DshDate.vue +4 -4
  10. package/src/components/controls/base/DshDate/DshDaterange.vue +5 -5
  11. package/src/components/controls/base/DshEditor.vue +11 -7
  12. package/src/components/controls/base/DshInput/DshInput.vue +2 -2
  13. package/src/components/controls/base/DshNumber/DshNumber.vue +1 -1
  14. package/src/components/controls/base/DshNumber/DshNumberange.vue +2 -2
  15. package/src/components/controls/base/DshSelect/DshCheckbox.vue +1 -1
  16. package/src/components/controls/base/DshSelect/DshSelect.vue +2 -2
  17. package/src/components/controls/base/DshSwitch/DshSwitch.vue +1 -1
  18. package/src/components/controls/extra/DshColor.vue +2 -2
  19. package/src/components/controls/mixins/cascaderPickerMixin.js +1 -1
  20. package/src/components/controls/mixins/controlMixin.js +23 -20
  21. package/src/components/controls/mixins/selectMixin.js +2 -2
  22. package/src/components/controls/senior/BriLabels.vue +2 -2
  23. package/src/components/controls/senior/DshPackage.vue +1 -1
  24. package/src/components/controls/senior/cascaderTable.vue +4 -4
  25. package/src/components/controls/senior/flatTable.vue +2 -2
  26. package/src/components/controls/senior/selectDepartments.vue +9 -5
  27. package/src/components/controls/senior/selectUsers/selectUsers.vue +3 -3
  28. package/src/styles/components/small/DshModal.less +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.4.19",
3
+ "version": "1.4.21",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
@@ -61,7 +61,6 @@
61
61
  "babel-preset-stage-2": "^6.22.0",
62
62
  "babel-register": "^6.22.0",
63
63
  "chalk": "^2.0.1",
64
- "chromedriver": "^120.0.0",
65
64
  "compression-webpack-plugin": "^1.1.12",
66
65
  "copy-webpack-plugin": "^4.0.1",
67
66
  "cross-spawn": "^5.0.1",
@@ -56,7 +56,7 @@
56
56
  <!-- 图标 -->
57
57
  <template>
58
58
  <Icon
59
- v-if="propsObj._clearable && !$isEmptyData(value) && isHover"
59
+ v-if="propsObj._clearable && !disabled && !$isEmptyData(value) && isHover"
60
60
  class="icon-close"
61
61
  type="ios-close-circle"
62
62
  @click.stop="clickClear"
@@ -12,7 +12,7 @@
12
12
  :class="{
13
13
  [prefixCls]: true,
14
14
  'BriUpload': true,
15
- 'BriUpload-disabled': canEdit && !finalCanEdit,
15
+ 'BriUpload-disabled': canEdit && disabled,
16
16
  'BriUpload-readonly': !canEdit,
17
17
  'BriUpload-unit': !canEdit && isInTable,
18
18
  [`BriUpload-${showMode}`]: true,
@@ -34,7 +34,7 @@
34
34
  type="file"
35
35
  :accept="accept"
36
36
  :multiple="multipleMode"
37
- :disabled="!finalCanEdit || percent > 0"
37
+ :disabled="disabled || percent > 0"
38
38
  :webkitdirectory="false"
39
39
  @change="handleChange"
40
40
  >
@@ -82,7 +82,7 @@
82
82
  'bri-control-edit': false
83
83
  }"
84
84
  :showMode="showMode"
85
- :canEdit="finalCanEdit"
85
+ :canEdit="!disabled"
86
86
  :files="curValList"
87
87
  :propsObj="propsObj"
88
88
  :emptyShowVal="emptyShowVal"
@@ -163,7 +163,11 @@
163
163
  return this.selfPropsObj._fileType;
164
164
  },
165
165
  showMode () {
166
- return this.isInTable ? this.selfPropsObj._inTableStyle == "list" && !this.finalCanEdit ? "tableList" : "inline" : this.selfPropsObj._showMode;
166
+ return this.isInTable
167
+ ? this.selfPropsObj._inTableStyle == "list" && !this.finalCanEdit
168
+ ? "tableList"
169
+ : "inline"
170
+ : this.selfPropsObj._showMode;
167
171
  },
168
172
  useType () {
169
173
  return this.selfPropsObj._useType;
@@ -242,7 +246,7 @@
242
246
  this.dealUpload(e.clipboardData.files);
243
247
  },
244
248
  dealUpload (files) {
245
- if (this.finalCanEdit) {
249
+ if (!this.disabled) {
246
250
  let postFiles = Array.prototype.slice.call(files);
247
251
  if (!this.multipleMode) {
248
252
  postFiles = postFiles.slice(0, 1);
@@ -15,7 +15,7 @@
15
15
  <dsh-control-input
16
16
  :class="commonClass"
17
17
  :value="curValName"
18
- :disabled="selfPropsObj._disabled"
18
+ :disabled="disabled"
19
19
  :propsObj="selfPropsObj"
20
20
  @clear="clickClear"
21
21
  ></dsh-control-input>
@@ -87,7 +87,7 @@
87
87
  <dsh-control-input
88
88
  :class="commonClass"
89
89
  :value="curValNameList"
90
- :disabled="selfPropsObj._disabled"
90
+ :disabled="disabled"
91
91
  :heightAuto="isHeightAuto"
92
92
  :propsObj="selfPropsObj"
93
93
  @deleteItem="clickDeleteItem"
@@ -5,9 +5,9 @@
5
5
  <Input
6
6
  v-model="inputStr"
7
7
  :placeholder="selfPropsObj._placeholder"
8
- :disabled="selfPropsObj._disabled"
8
+ :disabled="disabled"
9
9
  :readonly="true"
10
- :clearable="selfPropsObj._clearable"
10
+ :clearable="clearable"
11
11
  :size="selfPropsObj._size"
12
12
  ></Input>
13
13
  </slot>
@@ -16,9 +16,9 @@
16
16
  <Input
17
17
  v-model="inputStr"
18
18
  :placeholder="selfPropsObj._placeholder"
19
- :disabled="selfPropsObj._disabled"
19
+ :disabled="disabled"
20
20
  :readonly="true"
21
- :clearable="selfPropsObj._clearable"
21
+ :clearable="clearable"
22
22
  :size="selfPropsObj._size"
23
23
  ></Input>
24
24
  </slot>
@@ -4,8 +4,8 @@
4
4
  :value="activeCodeValue"
5
5
  :data="renderData"
6
6
  :placeholder="selfPropsObj._placeholder"
7
- :disabled="selfPropsObj._disabled"
8
- :clearable="selfPropsObj._clearable"
7
+ :disabled="disabled"
8
+ :clearable="clearable"
9
9
  :size="selfPropsObj._size"
10
10
  :filterable="useFilter"
11
11
  :render-format="renderFormat"
@@ -77,7 +77,7 @@
77
77
  // 点击级联框 如果是需要搜索,需要先渲染完多有节点,不然搜索起来
78
78
  clickCascader () {
79
79
  // if (
80
- // !this.selfPropsObj._disabled &&
80
+ // !this.disabled &&
81
81
  // this.useFilter === true &&
82
82
  // this.renderAll === false &&
83
83
  // !this.clickFlag
@@ -11,7 +11,7 @@
11
11
  v-if="canEdit"
12
12
  :class="commonClass"
13
13
  :value="curVal"
14
- :disabled="selfPropsObj._disabled"
14
+ :disabled="disabled"
15
15
  :propsObj="selfPropsObj"
16
16
  @clear="clickClear"
17
17
  @click.native="clickInput"
@@ -24,7 +24,7 @@
24
24
  ...commonClass
25
25
  }"
26
26
  >
27
- <span class="text"> {{ showVal }}</span>
27
+ <span class="text"> {{ showVal }}</span>
28
28
  </div>
29
29
  </bri-tooltip>
30
30
 
@@ -43,7 +43,7 @@
43
43
  >
44
44
  <!-- 可编辑 -->
45
45
  <Row
46
- v-if="finalCanEdit"
46
+ v-if="!disabled"
47
47
  class="header-edit"
48
48
  type="flex"
49
49
  justify="center"
@@ -325,10 +325,10 @@
325
325
  this.handleAddMarker(this.newVal.lnglat, true);
326
326
 
327
327
  if (this.showMode === "multipleMarker") { // 多选打开绘图功能
328
- this.finalCanEdit && this.handleOpenDraw();
328
+ !this.disabled && this.handleOpenDraw();
329
329
  }
330
330
  } else {
331
- this.finalCanEdit && this.handleOpenDraw();
331
+ !this.disabled && this.handleOpenDraw();
332
332
  }
333
333
  },
334
334
  handleMouseToolCallback (e) {
@@ -14,8 +14,8 @@
14
14
  v-model="curValDate"
15
15
  :type="subType"
16
16
  :placeholder="selfPropsObj._placeholder"
17
- :disabled="!finalCanEdit"
18
- :clearable="selfPropsObj._clearable"
17
+ :disabled="disabled"
18
+ :clearable="clearable"
19
19
  :transfer="selfPropsObj._transfer"
20
20
  @on-change="change"
21
21
  ></TimePicker>
@@ -28,8 +28,8 @@
28
28
  v-model="curValDate"
29
29
  :type="subType"
30
30
  :placeholder="selfPropsObj._placeholder"
31
- :disabled="!finalCanEdit"
32
- :clearable="selfPropsObj._clearable"
31
+ :disabled="disabled"
32
+ :clearable="clearable"
33
33
  :options="options"
34
34
  :transfer="selfPropsObj._transfer"
35
35
  @on-change="change"
@@ -7,7 +7,7 @@
7
7
  v-model="value[controlKey]"
8
8
  :placeholder="selfPropsObj._placeholder"
9
9
  type="timerange"
10
- :disabled="!finalCanEdit"
10
+ :disabled="disabled"
11
11
  :transfer="true"
12
12
  :transfer-class-name="selfPropsObj._transferClassName"
13
13
  @on-change="change"
@@ -21,7 +21,7 @@
21
21
  :model-value="val0"
22
22
  :placeholder="selfPropsObj._placeholder"
23
23
  :type="subType"
24
- :disabled="!finalCanEdit"
24
+ :disabled="disabled"
25
25
  :options="options0"
26
26
  :open="open0"
27
27
  :transfer="true"
@@ -35,7 +35,7 @@
35
35
  'bri-control-nodata': this.$isEmptyData(this.showVal0)
36
36
  }"
37
37
  :value="showVal0"
38
- :disabled="selfPropsObj._disabled"
38
+ :disabled="disabled"
39
39
  :propsObj="selfPropsObj"
40
40
  @clear="clickClear('', 0)"
41
41
  @click.native="changeOpen(true, 0)"
@@ -49,7 +49,7 @@
49
49
  :model-value="val1"
50
50
  :placeholder="selfPropsObj._placeholder"
51
51
  :type="subType"
52
- :disabled="!finalCanEdit"
52
+ :disabled="disabled"
53
53
  :options="options1"
54
54
  :open="open1"
55
55
  :transfer="true"
@@ -63,7 +63,7 @@
63
63
  'bri-control-nodata': this.$isEmptyData(this.showVal1)
64
64
  }"
65
65
  :value="showVal1"
66
- :disabled="selfPropsObj._disabled"
66
+ :disabled="disabled"
67
67
  :propsObj="selfPropsObj"
68
68
  @clear="clickClear('', 1)"
69
69
  @click.native="changeOpen(true, 1)"
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div class="DshEditor">
3
3
  <!-- 编辑 -->
4
- <template v-if="canEdit">
4
+ <template v-if="canEdit">
5
5
  <div
6
6
  :class="{
7
7
  ...commonClass,
@@ -13,7 +13,7 @@
13
13
  ></div>
14
14
 
15
15
  <div
16
- v-if="finalCanEdit"
16
+ v-if="!disabled"
17
17
  v-show="showStatus === 'edit'"
18
18
  class="DshEditor-wrap"
19
19
  >
@@ -99,7 +99,7 @@
99
99
  },
100
100
  created () {},
101
101
  mounted () {
102
- this.finalCanEdit && this.initEditor();
102
+ !this.disabled && this.initEditor();
103
103
  },
104
104
  methods: {
105
105
  initEditor () {
@@ -163,12 +163,16 @@
163
163
  };
164
164
  // 创建富文本编辑器
165
165
  editor.create();
166
- if (!this.finalCanEdit)editor.disable();
167
- this.editor = editor;
168
- this.handleEdit();
166
+
167
+ if (this.disabled) {
168
+ editor.disable();
169
+ } else {
170
+ this.editor = editor;
171
+ this.handleEdit();
172
+ }
169
173
  },
170
174
  handleEdit () {
171
- if (this.finalCanEdit) {
175
+ if (!this.disabled) {
172
176
  this.editor.txt.html(this.value[this.propsObj._key]);
173
177
  this.showStatus = "edit";
174
178
  }
@@ -10,8 +10,8 @@
10
10
  :type="inputType"
11
11
  :placeholder="selfPropsObj._placeholder"
12
12
  :readonly="selfPropsObj._readonly"
13
- :disabled="selfPropsObj._disabled"
14
- :clearable="selfPropsObj._clearable"
13
+ :disabled="disabled"
14
+ :clearable="clearable"
15
15
  :size="selfPropsObj._size"
16
16
  :rows="selfPropsObj._rows"
17
17
  :search="selfPropsObj._search"
@@ -10,7 +10,7 @@
10
10
  class="DshNumber-edit"
11
11
  v-model="curVal"
12
12
  :placeholder="selfPropsObj._placeholder"
13
- :disabled="selfPropsObj._disabled"
13
+ :disabled="disabled"
14
14
  :formatter="formatterFunc"
15
15
  :max="maxNum"
16
16
  :min="minNum"
@@ -6,7 +6,7 @@
6
6
  <BriInputNumber
7
7
  v-model="value[propsObj._key][0]"
8
8
  :placeholder="selfPropsObj._placeholder ? `${selfPropsObj._placeholder}最小值` : ''"
9
- :disabled="!finalCanEdit"
9
+ :disabled="disabled"
10
10
  :formatter="formatterFunc"
11
11
  :max="maxNum"
12
12
  :min="minNum"
@@ -32,7 +32,7 @@
32
32
  <BriInputNumber
33
33
  v-model="value[propsObj._key][1]"
34
34
  :placeholder="selfPropsObj._placeholder ? `${selfPropsObj._placeholder}最大值` : ''"
35
- :disabled="!finalCanEdit"
35
+ :disabled="disabled"
36
36
  :max="maxNum"
37
37
  :min="minNum"
38
38
  :formatter="formatterFunc"
@@ -52,7 +52,7 @@
52
52
  :value="curValList"
53
53
  :multiple="true"
54
54
  :placeholder="selfPropsObj._placeholder"
55
- :disabled="selfPropsObj._disabled"
55
+ :disabled="disabled"
56
56
  :filterable="selfPropsObj._filterable"
57
57
  :transfer="selfPropsObj._transfer"
58
58
  :transfer-class-name="selfPropsObj._transferClassName"
@@ -51,8 +51,8 @@
51
51
  v-model="curVal"
52
52
  :placeholder="selfPropsObj._placeholder"
53
53
  :multiple="false"
54
- :disabled="!finalCanEdit"
55
- :clearable="selfPropsObj._clearable"
54
+ :disabled="disabled"
55
+ :clearable="clearable"
56
56
  :filterable="selfPropsObj._filterable"
57
57
  :size="selfPropsObj._size"
58
58
  :transfer="selfPropsObj._transfer"
@@ -6,7 +6,7 @@
6
6
  >
7
7
  <i-switch
8
8
  v-model="curVal"
9
- :disabled="selfPropsObj._disabled"
9
+ :disabled="disabled"
10
10
  :loading="selfPropsObj.loading"
11
11
  :size="selfPropsObj._size"
12
12
  :true-color="propsObj._openColor || $appData.themeColor"
@@ -3,7 +3,7 @@
3
3
  <ColorPicker
4
4
  class="DshColor-picker"
5
5
  v-model="curVal"
6
- :disabled="selfPropsObj._disabled"
6
+ :disabled="disabled"
7
7
  :format="selfPropsObj._format"
8
8
  :editable="selfPropsObj._editable"
9
9
  :alpha="selfPropsObj._alpha"
@@ -36,7 +36,6 @@
36
36
  computed: {
37
37
  selfPropsObj () {
38
38
  return {
39
- _disabled: false,
40
39
  _editable: true, // 是否可以输入色值
41
40
  _alpha: false, // 是否支持透明度选择
42
41
  _hue: true, // 是否支持色彩选择
@@ -45,6 +44,7 @@
45
44
  _size: "default", // 尺寸,可选值为large、small、default或者不设置
46
45
  _transfer: true,
47
46
  ...this.propsObj,
47
+ ...this.commonDealPropsObj,
48
48
 
49
49
  _format: this.propsObj._format || (this.propsObj._alpha ? "rgb" : "hex") // 颜色的格式,可选值 hsl、hsv、hex、rgb;开启alpha时为rgb,其它为hex
50
50
  };
@@ -162,7 +162,7 @@ export default {
162
162
  },
163
163
 
164
164
  clickInput (e) {
165
- if (!this.selfPropsObj._disabled) {
165
+ if (!this.disabled) {
166
166
  this.showModal = true;
167
167
  } else {
168
168
  e.stopPropagation();
@@ -102,8 +102,8 @@ export default {
102
102
  _placeholder: this.canEdit && this.propsObj._enterType !== "calculate" && this.propsObj._disabled !== true && this.propsObj._readonly !== true
103
103
  ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
104
104
  : undefined,
105
- _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
106
- _disabled: !this.finalCanEdit || this.propsObj._disabled || this.propsObj._readonly
105
+ _clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
106
+ _disabled: !this.finalCanEdit || !!this.propsObj._disabled || !!this.propsObj._readonly
107
107
  };
108
108
  },
109
109
  // 是否为多选模式
@@ -122,10 +122,26 @@ export default {
122
122
  isTagShow () {
123
123
  return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch", "labels", "refSelect"].includes(this.controlType);
124
124
  },
125
+
126
+ /* ----- 表单相关 ----- */
127
+ clearable () {
128
+ return this.commonDealPropsObj._clearable;
129
+ },
130
+ disabled () {
131
+ return this.commonDealPropsObj._disabled;
132
+ },
133
+ // 单独一行
134
+ isFullRow () {
135
+ return this.propsObj._span === 24 || !this.propsObj._span;
136
+ },
137
+ // 查看页下的展示模式
138
+ showStatusMode () {
139
+ return this.propsObj.showStatusMode || "defaut"; // "default", "frame", "backdrop"
140
+ },
125
141
  commonClass () {
126
142
  return {
127
- "bri-control-edit": this.canEdit && this.finalCanEdit,
128
- "bri-control-disabled": this.canEdit && !this.finalCanEdit,
143
+ "bri-control-edit": this.canEdit && !this.disabled,
144
+ "bri-control-disabled": this.canEdit && this.disabled,
129
145
  "bri-control-unit": this.isUnitShow,
130
146
  "bri-control-show": this.isDetailShow,
131
147
  [`control-show-${this.showStatusMode}${this.isTagShow ? "-tag" : ""}`]: this.isDetailShow,
@@ -135,8 +151,8 @@ export default {
135
151
  },
136
152
  commonClass2 () {
137
153
  return {
138
- "bri-control-edit": this.canEdit && this.finalCanEdit,
139
- "bri-control-disabled": this.canEdit && !this.finalCanEdit,
154
+ "bri-control-edit": this.canEdit && !this.disabled,
155
+ "bri-control-disabled": this.canEdit && this.disabled,
140
156
  "bri-control-unit": this.isUnitShow,
141
157
  "bri-control-show": this.isDetailShow,
142
158
  [`control-show-${this.showStatusMode}${this.isTagShow ? "-tag" : ""}`]: this.isDetailShow,
@@ -144,19 +160,6 @@ export default {
144
160
  };
145
161
  },
146
162
 
147
- /* ----- 表单相关 ----- */
148
- clearable () {
149
- return this.commonDealPropsObj._clearable;
150
- },
151
- // 单独一行
152
- isFullRow () {
153
- return this.propsObj._span === 24 || !this.propsObj._span;
154
- },
155
- // 查看页下的展示模式
156
- showStatusMode () {
157
- return this.propsObj.showStatusMode || "defaut"; // "default", "frame", "backdrop"
158
- },
159
-
160
163
  /* ----- 单元格相关 ----- */
161
164
  unitAlign () {
162
165
  return this.propsObj._align || this.typeInfoData.align || "left"; // "left", "center", "right"
@@ -316,7 +319,7 @@ export default {
316
319
 
317
320
  // 点击输入框
318
321
  clickInput () {
319
- if (!this.selfPropsObj._disabled) {
322
+ if (!this.disabled) {
320
323
  this.openModal();
321
324
  }
322
325
  },
@@ -202,14 +202,14 @@ export default {
202
202
  // 获取单选项的置灰状态
203
203
  getRadioItemDisabled (item) {
204
204
  return !!(
205
- this.selfPropsObj._disabled ||
205
+ this.disabled ||
206
206
  item._disabled
207
207
  );
208
208
  },
209
209
  // 获取多选项的置灰状态
210
210
  getCheckItemDisabled (item) {
211
211
  return !!(
212
- this.selfPropsObj._disabled ||
212
+ this.disabled ||
213
213
  item._disabled ||
214
214
  (this.curValList.length >= this.selfPropsObj._max && !this.getItemCheckStatus(item))
215
215
  );
@@ -15,7 +15,7 @@
15
15
  <dsh-control-input
16
16
  :class="commonClass"
17
17
  :value="curValList"
18
- :disabled="selfPropsObj._disabled"
18
+ :disabled="disabled"
19
19
  :propsObj="selfPropsObj"
20
20
  @deleteItem="clickDeleteItem"
21
21
  @clear="clickClear"
@@ -162,7 +162,7 @@
162
162
  created () {},
163
163
  methods: {
164
164
  clickInput () {
165
- if (this.finalCanEdit) {
165
+ if (!this.disabled) {
166
166
  if (!this.renderList) {
167
167
  if (this.isDftSet) {
168
168
  this.listData = this.originLabels.map(item => {
@@ -4,7 +4,7 @@
4
4
  <dsh-form
5
5
  v-if="curVal"
6
6
  class="DshPackage-form"
7
- :canEdit="finalCanEdit"
7
+ :canEdit="!disabled"
8
8
  :formData="curVal.data || {}"
9
9
  :formList="curVal.form || []"
10
10
  @click.native="clickRow(val)"
@@ -20,7 +20,7 @@
20
20
  <!-- 老版级联表格 -->
21
21
  <dsh-cascader-table
22
22
  v-if="subType === 'old'"
23
- :canEdit="finalCanEdit"
23
+ :canEdit="!disabled"
24
24
  :tableDataObj="curVal"
25
25
  :data="curVal.tree"
26
26
  :rowDefault="curVal.rowDefault"
@@ -40,7 +40,7 @@
40
40
  <!-- 层级表格 -->
41
41
  <dsh-tree-table
42
42
  v-else
43
- :canEdit="finalCanEdit"
43
+ :canEdit="!disabled"
44
44
  :tableDataObj="curVal"
45
45
  :data="curVal.tree"
46
46
  :rowDefault="curVal.rowDefault"
@@ -59,7 +59,7 @@
59
59
  <dsh-cascader-table
60
60
  v-if="subType === 'old'"
61
61
  ref="table"
62
- :canEdit="finalCanEdit"
62
+ :canEdit="!disabled"
63
63
  :tableDataObj="curVal"
64
64
  :data="curVal.tree"
65
65
  :rowDefault="curVal.rowDefault"
@@ -80,7 +80,7 @@
80
80
  <dsh-tree-table
81
81
  v-else
82
82
  ref="table"
83
- :canEdit="finalCanEdit"
83
+ :canEdit="!disabled"
84
84
  :tableDataObj="curVal"
85
85
  :data="curVal.tree"
86
86
  :rowDefault="curVal.rowDefault"
@@ -18,7 +18,7 @@
18
18
  <!-- 配置端 设置默认值用-->
19
19
  <dsh-btn-modal v-if="controlKey === '_default'">
20
20
  <dsh-flat-table
21
- :canEdit="finalCanEdit"
21
+ :canEdit="!disabled"
22
22
  :tableDataObj="curVal"
23
23
  :data="curVal.list"
24
24
  :rowDefault="curVal.rowDefault"
@@ -34,7 +34,7 @@
34
34
  <dsh-flat-table
35
35
  v-else
36
36
  ref="table"
37
- :canEdit="finalCanEdit"
37
+ :canEdit="!disabled"
38
38
  :tableDataObj="curVal"
39
39
  :data="curVal.list"
40
40
  :rowDefault="curVal.rowDefault"
@@ -13,7 +13,7 @@
13
13
  v-if="canEdit"
14
14
  :class="commonClass"
15
15
  :value="curShowValList"
16
- :disabled="selfPropsObj._disabled"
16
+ :disabled="disabled"
17
17
  :heightAuto="isHeightAuto"
18
18
  :propsObj="selfPropsObj"
19
19
  @deleteItem="clickDeleteItem"
@@ -43,7 +43,7 @@
43
43
 
44
44
  <!-- 搜索选择框 -->
45
45
  <dsh-modal
46
- v-if="finalCanEdit && modalInited"
46
+ v-if="!disabled && modalInited"
47
47
  class="selectDepartments-modal bri-modal-center"
48
48
  mode="custom"
49
49
  v-model="showModal"
@@ -311,7 +311,7 @@
311
311
  methods: {
312
312
  // 点击输入框 打开选择模态框
313
313
  clickInput () {
314
- if (this.finalCanEdit) {
314
+ if (!this.disabled) {
315
315
  this.openModal();
316
316
  }
317
317
  },
@@ -410,11 +410,15 @@
410
410
 
411
411
  &-modal {
412
412
  .ivu-modal {
413
- width: 700px!important;
413
+ width: 30%!important;
414
+ min-width: 600px!important;
415
+ height: 70%;
416
+ min-height: 600px;
414
417
  }
415
418
 
416
419
  &-list {
417
- height: 800px;
420
+ width: 100%;
421
+ height: 100%;
418
422
  .dsh-flex-col-start-stretch();
419
423
 
420
424
  .selected {
@@ -13,7 +13,7 @@
13
13
  <dsh-control-input
14
14
  :class="commonClass"
15
15
  :value="curValList"
16
- :disabled="selfPropsObj._disabled"
16
+ :disabled="disabled"
17
17
  :heightAuto="isHeightAuto"
18
18
  :propsObj="selfPropsObj"
19
19
  @clickItem="clickItem"
@@ -29,7 +29,7 @@
29
29
 
30
30
  <!-- 搜索选择框 -->
31
31
  <dsh-modal
32
- v-if="!selfPropsObj._disabled"
32
+ v-if="!disabled"
33
33
  class="selectUsers-modal"
34
34
  v-model="showModal"
35
35
  mode="custom"
@@ -358,7 +358,7 @@
358
358
  created () {},
359
359
  methods: {
360
360
  clickInput () {
361
- if (!this.selfPropsObj._disabled) {
361
+ if (!this.disabled) {
362
362
  this.openModal();
363
363
  this.newValList = this.$deepCopy(this.curValList);
364
364
  this.modalInit();
@@ -199,8 +199,8 @@
199
199
 
200
200
  .ivu-modal-header {
201
201
  width: 100%;
202
- height: 44px;
203
- padding: 15px 24px 5px 24px;
202
+ height: 48px;
203
+ padding: 16px 24px 8px 24px;
204
204
  // border-bottom: none;
205
205
 
206
206
  &-inner {