bri-components 1.2.31 → 1.2.33

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.2.31",
3
+ "version": "1.2.33",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
@@ -34,6 +34,7 @@
34
34
  "ali-oss": "^6.13.1",
35
35
  "bri-datas": "1.0.14",
36
36
  "jshint": "^2.12.0",
37
+ "jsonlint": "^1.6.3",
37
38
  "minio": "^7.0.26",
38
39
  "stream": "^0.0.2",
39
40
  "view-design": "^4.6.0",
@@ -604,7 +604,7 @@
604
604
  : ruleConfig.regs && ruleConfig.regs.length
605
605
  ? {
606
606
  bool: ruleConfig.regs.every(regItem => regItem.test(val)),
607
- message: col._regMessage || ruleConfig.regMessage || `${col._name}格式不正确`
607
+ message: col._regMessage || `${col._name}格式不正确`
608
608
  }
609
609
  : {
610
610
  bool: true
@@ -7,82 +7,83 @@
7
7
  @submit.native.prevent
8
8
  >
9
9
  <Row>
10
- <template v-for="(formItem) in formList">
11
- <i-col
12
- v-if="isShow(formItem, formData)"
13
- :key="formItem._key"
14
- :id="formItem._key"
15
- class="DshForm-item"
16
- :span="formItem._br ? 24 : (formItem._span || 24)"
17
- >
18
- <FormItem
19
- class="DshForm-item-FormItem"
20
- :prop="formItem._key"
21
- @click.native="clickControl(formItem)"
10
+ <template v-if="displayFormList.length">
11
+ <template v-for="formItem in displayFormList">
12
+ <i-col
13
+ :key="formItem._key"
14
+ :id="formItem._key"
15
+ class="DshForm-item"
16
+ :span="formItem._br ? 24 : (formItem._span || 24)"
22
17
  >
23
- <dsh-form-unit
24
- ref="dshFormItem"
25
- :canEdit="canEdit"
26
- :formData="formData"
27
- :formItem="formItem"
28
- :allFormList="allFormList"
29
- :changedFields="changedFields"
30
- :height="height"
31
- :rowStyle="rowStyle"
32
- :labelStyle="labelStyle"
33
- :formControlClass="formControlClass"
34
- @change="change(arguments)"
35
- @refChange="refChange(arguments)"
36
- @changeField="changeField"
18
+ <FormItem
19
+ class="DshForm-item-FormItem"
20
+ :prop="formItem._key"
21
+ @click.native="clickControl(formItem)"
37
22
  >
38
- <slot
23
+ <dsh-form-unit
24
+ ref="dshFormItem"
39
25
  :canEdit="canEdit"
40
- :formItem="formItem"
41
26
  :formData="formData"
42
- :allFormList="allFormList"
43
- ></slot>
44
-
45
- <slot
46
- name="label"
47
- slot="label"
48
- :canEdit="canEdit"
49
27
  :formItem="formItem"
50
- :formData="formData"
51
28
  :allFormList="allFormList"
52
- ></slot>
29
+ :changedFields="changedFields"
30
+ :height="height"
31
+ :rowStyle="rowStyle"
32
+ :labelStyle="labelStyle"
33
+ :formControlClass="formControlClass"
34
+ @change="change(arguments)"
35
+ @refChange="refChange(arguments)"
36
+ @changeField="changeField"
37
+ >
38
+ <slot
39
+ :canEdit="canEdit"
40
+ :formItem="formItem"
41
+ :formData="formData"
42
+ :allFormList="allFormList"
43
+ ></slot>
53
44
 
54
- <slot
55
- name="extra"
56
- slot="extra"
57
- :canEdit="canEdit"
58
- :formItem="formItem"
59
- :formData="formData"
60
- :allFormList="allFormList"
61
- ></slot>
45
+ <slot
46
+ name="label"
47
+ slot="label"
48
+ :canEdit="canEdit"
49
+ :formItem="formItem"
50
+ :formData="formData"
51
+ :allFormList="allFormList"
52
+ ></slot>
62
53
 
63
- <slot
64
- name="corner"
65
- slot="corner"
66
- :canEdit="canEdit"
67
- :formItem="formItem"
68
- :formData="formData"
69
- :allFormList="allFormList"
70
- ></slot>
71
- </dsh-form-unit>
72
- </FormItem>
73
- </i-col>
54
+ <slot
55
+ name="extra"
56
+ slot="extra"
57
+ :canEdit="canEdit"
58
+ :formItem="formItem"
59
+ :formData="formData"
60
+ :allFormList="allFormList"
61
+ ></slot>
62
+
63
+ <slot
64
+ name="corner"
65
+ slot="corner"
66
+ :canEdit="canEdit"
67
+ :formItem="formItem"
68
+ :formData="formData"
69
+ :allFormList="allFormList"
70
+ ></slot>
71
+ </dsh-form-unit>
72
+ </FormItem>
73
+ </i-col>
74
74
 
75
- <!-- 换行 -->
76
- <i-col
77
- v-if="formItem._wrap"
78
- :key="formItem._key + '_wrap'"
79
- style="min-height: 0px;"
80
- :span="24"
81
- ></i-col>
75
+ <!-- 换行 -->
76
+ <i-col
77
+ v-if="formItem._wrap"
78
+ :key="formItem._key + '_wrap'"
79
+ style="min-height: 0px;"
80
+ :span="24"
81
+ ></i-col>
82
+ </template>
82
83
  </template>
83
84
 
84
85
  <div
85
- v-if="!formList.filter(formItem => isShow(formItem, formData)).length"
86
+ v-else
86
87
  class="dsh-tip"
87
88
  >{{ "--- 无字段 ---" }}</div>
88
89
  </Row>
@@ -98,6 +99,11 @@
98
99
  DshFormUnit
99
100
  },
100
101
  props: {
102
+ // 启用该参数后,查看状态时,空值字段不显示
103
+ notShowEmpty: {
104
+ type: Boolean,
105
+ default: false
106
+ },
101
107
  canEdit: {
102
108
  type: Boolean,
103
109
  default: true
@@ -162,7 +168,13 @@
162
168
  ]
163
169
  };
164
170
  },
165
- computed: {},
171
+ computed: {
172
+ displayFormList () {
173
+ const formList = this.formList.filter(formItem => this.isShow(formItem, this.formData));
174
+ return formList;
175
+ // return this.$getNotEmptyFieldList(formList, this.formData, this.canEdit, this.notShowEmpty);
176
+ }
177
+ },
166
178
  created () {
167
179
  this.init();
168
180
  },
@@ -249,7 +261,7 @@
249
261
  // 格式校验 (不依赖必填)
250
262
  if (ruleConfig.regs.length) {
251
263
  rules.push({
252
- message: formItem._regMessage || ruleConfig.regMessage || `${formItem._name}格式不正确`,
264
+ message: formItem._regMessage || `${formItem._name}格式不正确`,
253
265
  trigger: "blur",
254
266
  transform: (val) => {
255
267
  if (this.$isEmptyData(val)) {
@@ -434,7 +434,7 @@
434
434
  : ruleConfig.regs && ruleConfig.regs.length
435
435
  ? {
436
436
  bool: ruleConfig.regs.every(regItem => regItem.test(val)),
437
- message: col._regMessage || ruleConfig.regMessage || `${col._name}格式不正确`
437
+ message: col._regMessage || `${col._name}格式不正确`
438
438
  }
439
439
  : {
440
440
  bool: true
@@ -107,6 +107,7 @@
107
107
  transfer: true,
108
108
  footer: true,
109
109
  maskClosable: false,
110
+ draggable: true,
110
111
  ...this.propsObj
111
112
  };
112
113
  }