zydx-plus 1.30.170 → 1.30.172

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 (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/biz_header/src/bizHeader.vue +9 -1
  3. package/src/components/biz_header/src/button_name.js +16 -16
  4. package/src/components/lesson_template/src/lessonTemplate.vue +207 -183
  5. package/src/components/word/src/word.css +1 -0
  6. package/src/components/word/src/word.vue +8 -3
  7. package/src/index.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zydx-plus",
3
- "version": "1.30.170",
3
+ "version": "1.30.172",
4
4
  "description": "Vue.js",
5
5
  "main": "src/index.js",
6
6
  "files": [
package/src/components/biz_header/src/bizHeader.vue CHANGED
@@ -14,7 +14,7 @@
14
14
  */
15
15
  <template>
16
16
  <div class="headLevel">
17
- <div v-for="(item, index) in nodeList" :key="index" class="borderBottom1cccccc padding0_10 box_sizing_border_box">
17
+ <div v-for="(item, index) in nodeList" :key="index" class="borderBottom1cccccc padding0_10 box_sizing_border_box" v-show="getShow(item)">
18
18
  <zydx-topic-dry>
19
19
  <template v-slot:title_slot><span class="fontSize16" :class="'level'+item.level">{{item.name}}</span></template>
20
20
  <template v-slot:button_slot v-if="isShowBtn">
@@ -152,6 +152,14 @@ export default {
152
152
  }
153
153
  },
154
154
  methods: {
155
+ getShow(item) {
156
+ if (this.headerType === 2 && (this.actionId == 'action_notes' || this.actionId == 'action_lesson013' || this.actionId == 'action_lesson055' || this.actionId == 'action_lesson056')) {
157
+ if (!item.children || item.children.length == 0) {
158
+ return false
159
+ }
160
+ }
161
+ return true;
162
+ },
155
163
  // 选择节点
156
164
  selectNode: function (node) {
157
165
  this.nodeList = []
package/src/components/biz_header/src/button_name.js CHANGED
@@ -66,29 +66,29 @@ let buttonNames = {
66
66
  headLevel: {
67
67
  default: "demand",
68
68
  demand: '调查要求',
69
- allClass: this.getPrefix(item) + '调查'
69
+ singletonClass: this.getPrefix(item) + '调查'
70
70
  },
71
71
  otherLevel: {
72
- default: "allClass",
73
- allClass: this.getPrefix(item) + '调查'
72
+ default: "singletonClass",
73
+ singletonClass: this.getPrefix(item) + '调查'
74
74
  },
75
75
  lowLevel: {
76
- default: "allClass",
77
- allClass: this.getPrefix(item) + '调查'
76
+ default: "singletonClass",
77
+ singletonClass: this.getPrefix(item) + '调查'
78
78
  },
79
79
  },
80
80
  2: {
81
81
  headLevel: {
82
- default: "allClass",
83
- allClass: this.getPrefix(item) + '调查'
82
+ default: "singletonClass",
83
+ singletonClass: this.getPrefix(item) + '调查'
84
84
  },
85
85
  otherLevel: {
86
- default: "allClass",
87
- allClass: this.getPrefix(item) + '调查'
86
+ default: "singletonClass",
87
+ singletonClass: this.getPrefix(item) + '调查'
88
88
  },
89
89
  lowLevel: {
90
- default: "allClass",
91
- allClass: this.getPrefix(item) + '调查'
90
+ default: "singletonClass",
91
+ singletonClass: this.getPrefix(item) + '调查'
92
92
  },
93
93
  }
94
94
  }
@@ -1172,15 +1172,15 @@ let buttonNames = {
1172
1172
  headLevel: {
1173
1173
  default: "demand",
1174
1174
  demand: '调查要求',
1175
- allClass: this.getPrefix(item) + '调查'
1175
+ singletonClass: this.getPrefix(item) + '调查'
1176
1176
  },
1177
1177
  otherLevel: {
1178
- default: "allClass",
1179
- allClass: this.getPrefix(item) + '调查'
1178
+ default: "singletonClass",
1179
+ singletonClass: this.getPrefix(item) + '调查'
1180
1180
  },
1181
1181
  lowLevel: {
1182
- default: "allClass",
1183
- allClass: this.getPrefix(item) + '调查'
1182
+ default: "singletonClass",
1183
+ singletonClass: this.getPrefix(item) + '调查'
1184
1184
  },
1185
1185
  }
1186
1186
  }
package/src/components/lesson_template/src/lessonTemplate.vue CHANGED
@@ -4,25 +4,23 @@
4
4
  */
5
5
  <template>
6
6
  <div class="lesson_template_main_div">
7
- <template v-if="!readonly">
8
- <div v-if="topText !== ''" class="title_box display_flex">
9
- <div style="width: 100%">{{topText}}</div>
10
- <div class="z-button" @click="clearSelectAction">清空已选</div>
11
- </div>
12
- <div class="main_center_div select_margin">
13
- <template v-if="selectActionSort.length != 0">
14
- <div v-for="(item, index) in selectActionSort" @click="cancel(item)" :key="index" class="item_div select_item_margin display_flex">
15
- <div class="width70">{{item[viewName]}}</div>
16
- <div class="display_flex flex_center">
17
- <div class="x_style">+</div>
18
- </div>
7
+ <div v-if="topText !== ''" class="title_box display_flex">
8
+ <div class="title_box_text">{{topText}}</div>
9
+ <div class="z-button" @click="clearSelectAction" v-if="!readonly">清空已选</div>
10
+ </div>
11
+ <div class="main_center_div" :class="!readonly?'select_margin':''">
12
+ <template v-if="selectActionSort.length != 0">
13
+ <div v-for="(item, index) in selectActionSort" @click="cancel(item)" :key="index" :class="getClasses">
14
+ <div class="width70">{{item[viewName]}}</div>
15
+ <div class="display_flex flex_center" v-if="!readonly">
16
+ <div class="x_style">+</div>
19
17
  </div>
20
- </template>
21
- <template v-else>
22
- <div class="tip_text">暂未添加{{tipText}}，现在添加吧...</div>
23
- </template>
24
- </div>
25
- </template>
18
+ </div>
19
+ </template>
20
+ <template v-else>
21
+ <div class="tip_text">暂未添加{{tipText}}，现在添加吧...</div>
22
+ </template>
23
+ </div>
26
24
  <div v-if="allText !== ''" class="title_box">{{allText}}</div>
27
25
  <div class="main_center_div">
28
26
  <div v-for="(item, index) in dataList" :key="index" class="item_div all_item width70" :class="isIncludeItem(item)? '' : 'select_item'" @click="save(item)" >{{item[viewName]}}</div>
@@ -32,184 +30,205 @@
32
30
  </template>
33
31
 
34
32
  <script>
35
- export default {
36
- name: 'zydx-lesson-template',
37
- model: {
38
- prop: "selectDataList",
39
- event: "update:modelValue"
40
- },
41
- props: {
42
- selectDataList: {
43
- type: Array,
44
- default: () => []
45
- },
46
- dataList: {
47
- type: Array,
48
- default: () => []
49
- },
50
- topText: {
51
- type: String,
52
- default: ''
53
- },
54
- allText: {
55
- type: String,
56
- default: ''
57
- },
58
- sortName: {
59
- type: String,
60
- default: ''
61
- },
62
- viewName: {
63
- type: String,
64
- default: ''
65
- },
66
- tipText: {
67
- type: String,
68
- default: ''
69
- },
70
- readonly: {
71
- type: Boolean,
72
- default: false
73
- },
74
- },
75
- computed: {
76
- selectActionSort () {
77
- let _that = this
78
- if (this.sortName != '' && this.selectAction.length != 0) {
79
- return _that.selectAction.sort(function(a, b){
80
- return parseInt(a[_that.sortName]) > parseInt(b[_that.sortName]) ? 1: -1
81
- })
33
+ export default {
34
+ name: 'zydx-lesson-template',
35
+ model: {
36
+ prop: "selectDataList",
37
+ event: "update:modelValue"
38
+ },
39
+ props: {
40
+ selectDataList: {
41
+ type: Array,
42
+ default: () => []
43
+ },
44
+ dataList: {
45
+ type: Array,
46
+ default: () => []
47
+ },
48
+ topText: {
49
+ type: String,
50
+ default: ''
51
+ },
52
+ allText: {
53
+ type: String,
54
+ default: ''
55
+ },
56
+ sortName: {
57
+ type: String,
58
+ default: ''
59
+ },
60
+ viewName: {
61
+ type: String,
62
+ default: ''
63
+ },
64
+ tipText: {
65
+ type: String,
66
+ default: ''
67
+ },
68
+ readonly: {
69
+ type: Boolean,
70
+ default: false
71
+ },
72
+ },
73
+ computed: {
74
+ getClasses() {
75
+ let arr = []
76
+ if (this.readonly) {
77
+ arr.push("item_div");
78
+ arr.push("all_item");
79
+ arr.push("width70");
80
+ arr.push("display_flex")
81
+
82
+ } else {
83
+ arr.push("item_div");
84
+ arr.push("select_item_margin");
85
+ arr.push("display_flex")
86
+ }
87
+ return arr;
88
+ },
89
+ selectActionSort () {
90
+ let _that = this
91
+ if (this.sortName != '' && this.selectAction.length != 0) {
92
+ return _that.selectAction.sort(function(a, b){
93
+ return parseInt(a[_that.sortName]) > parseInt(b[_that.sortName]) ? 1: -1
94
+ })
95
+ }
96
+ return this.selectAction;
97
+ }
98
+ },
99
+ data () {
100
+ return {
101
+ selectAction: this.selectDataList
102
+ }
103
+ },
104
+ watch: {
105
+ selectActionSort: {
106
+ deep: true,
107
+ handler(newValue) {
108
+ this.$emit('update:modelValue', this.selectAction)
109
+ }
110
+ }
111
+ },
112
+ methods: {
113
+ cancel (param) {
114
+ if (this.readonly) {
115
+ return true;
116
+ }
117
+ this.selectAction.splice(this.selectAction.indexOf(param),1)
118
+ },
119
+ save (param) {
120
+ if (!this.readonly && this.isIncludeItem(param)) {
121
+ this.selectAction.push(param)
122
+ }
123
+ },
124
+ clearSelectAction () {
125
+ this.selectAction = []
126
+ },
127
+ isIncludeItem (item) {
128
+ // if (this.readonly) {
129
+ // return true;
130
+ // }
131
+ return JSON.stringify(this.selectDataList).indexOf(JSON.stringify(item)) === -1;
132
+ }
82
133
  }
83
- return this.selectAction;
84
- }
85
- },
86
- data () {
87
- return {
88
- selectAction: this.selectDataList
89
134
  }
90
- },
91
- watch: {
92
- selectActionSort: {
93
- deep: true,
94
- handler(newValue) {
95
- this.$emit('update:modelValue', this.selectAction)
96
- }
97
- }
98
- },
99
- methods: {
100
- cancel (param) {
101
- this.selectAction.splice(this.selectAction.indexOf(param),1)
102
- },
103
- save (param) {
104
- if (!this.readonly && this.isIncludeItem(param) == -1) {
105
- this.selectAction.push(param)
106
- }
107
- },
108
- clearSelectAction () {
109
- this.selectAction = []
110
- },
111
- isIncludeItem (item) {
112
- if (this.readonly) {
113
- return true;
114
- }
115
- return JSON.stringify(this.selectDataList).indexOf(JSON.stringify(item)) === -1;
116
- }
117
- }
118
- }
119
135
  </script>
120
136
 
121
137
  <style scoped>
122
- .lesson_template_main_div {
123
- width: 100%;
124
- }
125
- .select_margin {
126
- padding: 10px 2px 10px 7px !important;
127
- }
128
-
129
- .main_center_div {
130
- width: 100%;
131
- display: flex;
132
- padding: 7px 4px;
133
- flex-direction: row;
134
- align-content: center;
135
- border: 1px solid #cccccc;
136
- flex-wrap: wrap;
137
- }
138
-
139
- .item_div {
140
- border: 1px solid rgba(204, 204, 204, 1);
141
- box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.2);
142
- cursor: pointer;
143
- border-radius: 2px;
144
- height: 32px;
145
- line-height: 32px;
146
- border: 1px solid #cccccc;
147
- text-align: center;
148
- }
149
- .display_flex {
150
- display: flex;
151
- }
152
-
153
- .select_item_margin {
154
- width: 86px;
155
- margin: 3px 5px 3px 0px;
138
+ .lesson_template_main_div {
139
+ width: 100%;
140
+ }
141
+ .select_margin {
142
+ padding: 10px 2px 10px 7px !important;
143
+ }
156
144
 
157
- }
158
- .all_item {
159
- width: 70px;
160
- margin: 3px;
161
- }
145
+ .main_center_div {
146
+ width: 923px;
147
+ box-sizing: border-box;
148
+ display: flex;
149
+ padding: 7px 4px;
150
+ flex-direction: row;
151
+ align-content: center;
152
+ border: 1px solid #cccccc;
153
+ flex-wrap: wrap;
154
+ }
162
155
 
163
- .width70 {
164
- width: 70px;
165
- font-size: 14px;
166
- font-weight: 400;
167
- }
156
+ .item_div {
157
+ box-sizing: border-box;
158
+ border: 1px solid rgba(204, 204, 204, 1);
159
+ box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.2);
160
+ cursor: pointer;
161
+ border-radius: 2px;
162
+ height: 32px;
163
+ line-height: 32px;
164
+ border: 1px solid #cccccc;
165
+ text-align: center;
166
+ }
167
+ .display_flex {
168
+ display: flex;
169
+ }
168
170
 
169
- .title_box {
170
- font-size: 16px;
171
- font-weight: 400;
172
- width: 100%;
173
- margin: 5px 0px;
174
- }
171
+ .select_item_margin {
172
+ width: 86px;
173
+ margin: 3px 5px 3px 0px;
174
+ }
175
+ .width86 {
176
+ width: 86px;
177
+ }
178
+ .all_item {
179
+ width: 70px;
180
+ margin: 3px;
181
+ }
175
182
 
183
+ .width70 {
184
+ width: 70px;
185
+ font-size: 14px;
186
+ font-weight: 400;
187
+ box-sizing: border-box;
188
+ }
176
189
 
190
+ .title_box {
191
+ font-size: 16px;
192
+ font-weight: 400;
193
+ width: 923px;
194
+ margin: 5px 0px;
177
195
 
196
+ }
178
197
 
179
- .select_item {
180
- background: rgba(255, 255, 255, 1);
181
- color: #cccccc;
182
- }
198
+ .select_item {
199
+ background: rgba(255, 255, 255, 1);
200
+ color: #cccccc;
201
+ }
183
202
 
184
- .tip_text {
185
- font-size: 16px;
186
- font-weight: 400;
187
- color: rgba(0, 0, 0, 0.6);
188
- text-align: center;
189
- width: 100%;
190
- }
191
- .z-button {
192
- margin: 1px;
193
- width: auto;
194
- min-width: 60px;
195
- max-width: 60px;
196
- text-overflow: ellipsis;
197
- white-space: nowrap;
198
- overflow: hidden;
199
- height: 20px;
200
- background-color: #FFFFFF;
201
- color: #000000;
202
- border: #000000 1px solid;
203
- line-height: 18px;
204
- border-radius: 3px;
205
- font-size: 12px !important;
206
- letter-spacing: 0px !important;
207
- text-align: center;
208
- cursor: pointer;
209
- padding: 0 5px;
210
- font-weight: normal;
211
- box-sizing: border-box;
212
- }
203
+ .tip_text {
204
+ font-size: 16px;
205
+ font-weight: 400;
206
+ color: rgba(0, 0, 0, 0.6);
207
+ text-align: center;
208
+ width: 100%;
209
+ }
210
+ .z-button {
211
+ margin: 1px;
212
+ width: auto;
213
+ min-width: 60px;
214
+ max-width: 60px;
215
+ text-overflow: ellipsis;
216
+ white-space: nowrap;
217
+ overflow: hidden;
218
+ height: 20px;
219
+ background-color: #FFFFFF;
220
+ color: #000000;
221
+ border: #000000 1px solid;
222
+ line-height: 18px;
223
+ border-radius: 3px;
224
+ font-size: 12px !important;
225
+ letter-spacing: 0px !important;
226
+ text-align: center;
227
+ cursor: pointer;
228
+ padding: 0 5px;
229
+ font-weight: normal;
230
+ box-sizing: border-box;
231
+ }
213
232
  .flex_center {
214
233
  display: flex;
215
234
  justify-content: center;
@@ -221,4 +240,9 @@ export default {
221
240
  line-height: 8px;
222
241
  width: 8px;
223
242
  }
243
+ .title_box_text {
244
+ width: 100%;
245
+ padding-left: 60px;
246
+ box-sizing: border-box;
247
+ }
224
248
  </style>
package/src/components/word/src/word.css CHANGED
@@ -88,6 +88,7 @@
88
88
  }
89
89
  .subject-title{
90
90
  flex: 1;
91
+ text-indent: 2em;
91
92
  }
92
93
  .subject-title label{
93
94
  display: flex;
package/src/components/word/src/word.vue CHANGED
@@ -1,6 +1,6 @@
1
1
  <template>
2
- <div class="paper">
3
- <div class="parer-cont">
2
+ <div :class="{paper: borderShow}">
3
+ <div class="parer-cont" ref="parer">
4
4
  <div class="paper-choice" :class="{'array-ch': !styleText(item.testKey)}" v-for="(item,index) in data">
5
5
  <div class="subject">
6
6
  <div class="subject-title">
@@ -52,7 +52,11 @@ export default {
52
52
  },
53
53
  multiple: {
54
54
  type: Boolean,
55
- default: false
55
+ default: true
56
+ },
57
+ borderShow: {
58
+ type: Boolean,
59
+ default: true
56
60
  }
57
61
  },
58
62
  watch: {
@@ -69,6 +73,7 @@ export default {
69
73
  deep: true
70
74
  }
71
75
  },
76
+ emits: ['change','modify','del'],
72
77
  methods: {
73
78
  checkboxChange(e,index) {
74
79
  this.$emit('change', {
package/src/index.js CHANGED
@@ -73,7 +73,7 @@ function install(app) {
73
73
  }
74
74
 
75
75
  export default {
76
- version: '1.30.170',
76
+ version: '1.30.172',
77
77
  install,
78
78
  Calendar,
79
79
  Message,