cloud-web-corejs 1.0.54-dev.600 → 1.0.54-dev.601

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 (24) hide show
  1. package/package.json +1 -1
  2. package/src/components/xform/form-designer/setting-panel/form-setting.vue +4 -4
  3. package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue +3 -3
  4. package/src/views/bd/setting/formVersion/button.vue +1 -1
  5. package/src/views/bd/setting/formVersion/compareDialog.vue +286 -0
  6. package/src/views/bd/setting/formVersion/fieldCompare.vue +51 -0
  7. package/src/views/bd/setting/formVersion/ftHistoryDialog.vue +91 -60
  8. package/src/views/bd/setting/formVersion/preformDialog.vue +2 -2
  9. package/src/views/bd/setting/formVersion/reverButton.vue +12 -14
  10. package/src/views/bd/setting/form_script/edit.vue +79 -34
  11. package/src/views/bd/setting/form_script/edit1.vue +143 -61
  12. package/src/views/bd/setting/form_script/mixins/edit.js +76 -53
  13. package/src/views/bd/setting/form_script/mixins/edit1.js +75 -52
  14. package/src/views/bd/setting/form_template/edit.vue +93 -36
  15. package/src/views/bd/setting/form_template/formDesignerDialog.vue +166 -0
  16. package/src/views/bd/setting/form_template/list.vue +10 -42
  17. package/src/views/bd/setting/form_template/mixins/edit.js +19 -2
  18. package/src/views/bd/setting/form_template/mixins/list.js +2 -4
  19. package/src/views/bd/setting/form_template/mixins/wf_list.js +0 -4
  20. package/src/views/bd/setting/form_template/wf_list.vue +161 -127
  21. package/src/views/bd/setting/table_model/edit.vue +388 -203
  22. package/src/views/bd/setting/table_model/mixins/edit.js +87 -72
  23. package/src/views/user/form/vform/designer.vue +300 -284
  24. package/src/views/bd/setting/form_template/mixins/list2.js +0 -411
package/src/views/bd/setting/formVersion/reverButton.vue CHANGED
@@ -1,24 +1,24 @@
1
1
  <template>
2
- <el-button
3
- type="primary"
4
- plain
5
- class="button-sty"
6
- icon="el-icon-set-up"
7
- @click="openPreformDialog"
8
- >
9
- {{ $t1("回退当前版本") }}
2
+ <span class="button-sty" style="cursor: unset">
3
+ <el-button
4
+ type="primary"
5
+ plain
6
+ class="button-sty"
7
+ icon="el-icon-set-up"
8
+ @click="openPreformDialog"
9
+ >
10
+ {{ $t1("回退当前版本") }}
11
+ </el-button>
10
12
  <preformDialog
11
13
  v-if="showPreformDialog"
12
14
  :visiable.sync="showPreformDialog"
13
15
  @confirm="confirmPreformDialog"
14
16
  ></preformDialog>
15
- </el-button>
17
+ </span>
16
18
  </template>
17
19
  <script>
18
- import { USER_PREFIX } from "@/prefixConfig";
19
-
20
20
  export default {
21
- name: "ftHistoryButton",
21
+ name: "reverButton",
22
22
  props: {
23
23
  hData: Object,
24
24
  objType: {
@@ -31,8 +31,6 @@ export default {
31
31
  },
32
32
  },
33
33
  components: {
34
- ftHistoryDialog: () =>
35
- import("@base/views/bd/setting/formVersion/ftHistoryDialog.vue"),
36
34
  preformDialog: () => import("./preformDialog.vue"),
37
35
  },
38
36
  data() {
package/src/views/bd/setting/form_script/edit.vue CHANGED
@@ -57,12 +57,18 @@
57
57
  prop="scriptName"
58
58
  :rules="[{ required: true, trigger: 'blur' }]"
59
59
  >
60
- <el-input
61
- type="text"
62
- autocomplete="off"
63
- v-model="formScript.scriptName"
64
- clearable
65
- />
60
+ <fieldCompare
61
+ :isCompare="isCompare"
62
+ :oldVal="oldFormScript.scriptName"
63
+ :newVal="formScript.scriptName"
64
+ >
65
+ <el-input
66
+ type="text"
67
+ autocomplete="off"
68
+ v-model="formScript.scriptName"
69
+ clearable
70
+ />
71
+ </fieldCompare>
66
72
  </el-form-item>
67
73
  </td>
68
74
  <th>{{ $t1("脚本编码") }}</th>
@@ -71,12 +77,18 @@
71
77
  prop="scriptCode"
72
78
  :rules="[{ required: true, trigger: 'blur' }]"
73
79
  >
74
- <el-input
75
- type="text"
76
- autocomplete="off"
77
- v-model="formScript.scriptCode"
78
- clearable
79
- />
80
+ <fieldCompare
81
+ :isCompare="isCompare"
82
+ :oldVal="oldFormScript.scriptCode"
83
+ :newVal="formScript.scriptCode"
84
+ >
85
+ <el-input
86
+ type="text"
87
+ autocomplete="off"
88
+ v-model="formScript.scriptCode"
89
+ clearable
90
+ />
91
+ </fieldCompare>
80
92
  </el-form-item>
81
93
  </td>
82
94
  </tr>
@@ -87,31 +99,56 @@
87
99
  prop="enabled"
88
100
  :rules="[{ required: false, trigger: 'blur' }]"
89
101
  >
90
- <el-radio-group v-model="formScript.enabled">
91
- <el-radio :label="true">{{ $t1("启用") }}</el-radio>
92
- <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
93
- </el-radio-group>
102
+ <fieldCompare
103
+ :isCompare="isCompare"
104
+ :oldVal="oldFormScript.enabled"
105
+ :newVal="formScript.enabled"
106
+ >
107
+ <el-radio-group v-model="formScript.enabled">
108
+ <el-radio :label="true">{{ $t1("启用") }}</el-radio>
109
+ <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
110
+ </el-radio-group>
111
+ </fieldCompare>
94
112
  </el-form-item>
95
113
  </td>
96
114
  <th>{{ $t1("开启事务") }}</th>
97
115
  <td>
98
- <el-radio-group v-model="formScript.transactions">
99
- <el-radio :label="1">{{ $t1("是") }}</el-radio>
100
- <el-radio :label="0">{{ $t1("否") }}</el-radio>
101
- </el-radio-group>
116
+ <el-form-item>
117
+ <fieldCompare
118
+ :isCompare="isCompare"
119
+ :oldVal="oldFormScript.transactions"
120
+ :newVal="formScript.transactions"
121
+ >
122
+ <el-radio-group v-model="formScript.transactions">
123
+ <el-radio :label="1">{{ $t1("是") }}</el-radio>
124
+ <el-radio :label="0">{{ $t1("否") }}</el-radio>
125
+ </el-radio-group>
126
+ </fieldCompare>
127
+ </el-form-item>
102
128
  </td>
103
129
  </tr>
104
130
  <tr>
105
131
  <th>{{ $t1("脚本说明") }}</th>
106
132
  <td colspan="7">
107
- <el-input
108
- type="textarea"
109
- :rows="2"
110
- :placeholder="$t1('请输入内容')"
111
- size="small"
112
- v-model="formScript.scriptRemark"
113
- clearable
114
- ></el-input>
133
+ <el-form-item
134
+ prop="scriptRemark"
135
+ :rules="[{ required: false, trigger: 'blur' }]"
136
+ >
137
+ <fieldCompare
138
+ :isCompare="isCompare"
139
+ :oldVal="oldFormScript.scriptRemark"
140
+ :newVal="formScript.scriptRemark"
141
+ >
142
+ <el-input
143
+ type="textarea"
144
+ :rows="2"
145
+ :placeholder="$t1('请输入内容')"
146
+ size="small"
147
+ v-model="formScript.scriptRemark"
148
+ clearable
149
+ ></el-input>
150
+ </fieldCompare>
151
+ </el-form-item>
115
152
  </td>
116
153
  </tr>
117
154
  <tr>
@@ -126,12 +163,18 @@
126
163
  prop="script"
127
164
  :rules="[{ required: true, trigger: 'blur' }]"
128
165
  >
129
- <code-editor
130
- mode="java"
131
- :readonly="readonly"
132
- v-model="formScript.script"
133
- v-if="showCodeEditor"
134
- ></code-editor>
166
+ <fieldCompare
167
+ :isCompare="isCompare"
168
+ :oldVal="oldFormScript.script"
169
+ :newVal="formScript.script"
170
+ >
171
+ <code-editor
172
+ mode="java"
173
+ :readonly="!1"
174
+ v-model="formScript.script"
175
+ v-if="showCodeEditor"
176
+ ></code-editor>
177
+ </fieldCompare>
135
178
  </el-form-item>
136
179
  </td>
137
180
  </tr>
@@ -177,12 +220,14 @@
177
220
  import mixin from "./mixins/edit";
178
221
  import formVersionButton from "@base/views/bd/setting/formVersion/button.vue";
179
222
  import reverButton from "@base/views/bd/setting/formVersion/reverButton.vue";
223
+ import fieldCompare from "@base/views/bd/setting/formVersion/fieldCompare.vue";
180
224
  export default {
181
225
  name: "user_form_scriptEdit",
182
226
  mixins: [mixin],
183
227
  components: {
184
228
  formVersionButton,
185
229
  reverButton,
230
+ fieldCompare,
186
231
  },
187
232
  };
188
233
  </script>
package/src/views/bd/setting/form_script/edit1.vue CHANGED
@@ -72,12 +72,18 @@
72
72
  prop="scriptName"
73
73
  :rules="[{ required: true, trigger: 'blur' }]"
74
74
  >
75
- <el-input
76
- type="text"
77
- autocomplete="off"
78
- v-model="formScript.scriptName"
79
- clearable
80
- />
75
+ <fieldCompare
76
+ :isCompare="isCompare"
77
+ :oldVal="oldFormScript.scriptName"
78
+ :newVal="formScript.scriptName"
79
+ >
80
+ <el-input
81
+ type="text"
82
+ autocomplete="off"
83
+ v-model="formScript.scriptName"
84
+ clearable
85
+ />
86
+ </fieldCompare>
81
87
  </el-form-item>
82
88
  </td>
83
89
  <th>{{ $t1("脚本编码") }}</th>
@@ -86,12 +92,18 @@
86
92
  prop="scriptCode"
87
93
  :rules="[{ required: true, trigger: 'blur' }]"
88
94
  >
89
- <el-input
90
- type="text"
91
- autocomplete="off"
92
- v-model="formScript.scriptCode"
93
- clearable
94
- />
95
+ <fieldCompare
96
+ :isCompare="isCompare"
97
+ :oldVal="oldFormScript.scriptCode"
98
+ :newVal="formScript.scriptCode"
99
+ >
100
+ <el-input
101
+ type="text"
102
+ autocomplete="off"
103
+ v-model="formScript.scriptCode"
104
+ clearable
105
+ />
106
+ </fieldCompare>
95
107
  </el-form-item>
96
108
  </td>
97
109
  </tr>
@@ -109,26 +121,42 @@
109
121
  prop="menuKindName"
110
122
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
111
123
  >
112
- <el-input
113
- class="search-input"
114
- max="200"
115
- v-model="formScript.menuKindName"
116
- @clear="
117
- formScript.menuKindCode = null;
118
- $forceUpdate();
119
- "
120
- v-el-readonly
121
- clearable
122
- :disabled="otherFlag"
124
+ <fieldCompare
125
+ :isCompare="isCompare"
126
+ :oldVal="oldFormScript.menuKindName"
127
+ :newVal="formScript.menuKindName"
123
128
  >
124
- <i
125
- slot="suffix"
126
- class="el-input__icon el-icon-search"
127
- @click="showMenuKindDialog = true"
128
- ></i>
129
- </el-input>
129
+ <el-input
130
+ class="search-input"
131
+ max="200"
132
+ v-model="formScript.menuKindName"
133
+ @clear="
134
+ formScript.menuKindCode = null;
135
+ $forceUpdate();
136
+ "
137
+ v-el-readonly
138
+ clearable
139
+ :disabled="otherFlag"
140
+ >
141
+ <i
142
+ slot="suffix"
143
+ class="el-input__icon el-icon-search"
144
+ @click="showMenuKindDialog = true"
145
+ ></i>
146
+ </el-input>
147
+ </fieldCompare>
130
148
  </el-form-item>
131
- <span v-else>{{ formScript.menuKindName }}</span>
149
+ <template v-else>
150
+ <el-form-item>
151
+ <fieldCompare
152
+ :isCompare="isCompare"
153
+ :oldVal="oldFormScript.menuKindName"
154
+ :newVal="formScript.menuKindName"
155
+ >
156
+ {{ formScript.menuKindName }}
157
+ </fieldCompare>
158
+ </el-form-item>
159
+ </template>
132
160
  </td>
133
161
  </tr>
134
162
 
@@ -151,7 +179,15 @@
151
179
  </td>
152
180
  <th>{{ $t1("Url路径") }}</th>
153
181
  <td colspan="3">
154
- /{{ formScript.formCode }}/{{ formScript.scriptCode }}
182
+ <el-form-item>
183
+ <fieldCompare
184
+ :isCompare="isCompare"
185
+ :oldVal="oldFormScript.formCode + '/' + oldFormScript.scriptCode"
186
+ :newVal="formScript.formCode + '/' + formScript.scriptCode"
187
+ >
188
+ {{ formScript.formCode }}/{{ formScript.scriptCode }}
189
+ </fieldCompare>
190
+ </el-form-item>
155
191
  </td>
156
192
  </tr>
157
193
  <tr>
@@ -161,22 +197,44 @@
161
197
  prop="enabled"
162
198
  :rules="[{ required: false, trigger: 'blur' }]"
163
199
  >
164
- <el-radio-group v-model="formScript.enabled">
165
- <el-radio :label="true">{{ $t1("启用") }}</el-radio>
166
- <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
167
- </el-radio-group>
200
+ <fieldCompare
201
+ :isCompare="isCompare"
202
+ :oldVal="oldFormScript.enabled"
203
+ :newVal="formScript.enabled"
204
+ >
205
+ <el-radio-group v-model="formScript.enabled">
206
+ <el-radio :label="true">{{ $t1("启用") }}</el-radio>
207
+ <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
208
+ </el-radio-group>
209
+ </fieldCompare>
168
210
  </el-form-item>
169
211
  </td>
170
212
  <th>{{ $t1("开启事务") }}</th>
171
213
  <td>
172
- <el-radio-group v-model="formScript.transactions">
173
- <el-radio :label="1">{{ $t1("是") }}</el-radio>
174
- <el-radio :label="0">{{ $t1("否") }}</el-radio>
175
- </el-radio-group>
214
+ <el-form-item>
215
+ <fieldCompare
216
+ :isCompare="isCompare"
217
+ :oldVal="oldFormScript.transactions"
218
+ :newVal="formScript.transactions"
219
+ >
220
+ <el-radio-group v-model="formScript.transactions">
221
+ <el-radio :label="1">{{ $t1("是") }}</el-radio>
222
+ <el-radio :label="0">{{ $t1("否") }}</el-radio>
223
+ </el-radio-group>
224
+ </fieldCompare>
225
+ </el-form-item>
176
226
  </td>
177
227
  <th>{{ $t1("服务名") }}</th>
178
228
  <td colspan="3">
179
- {{ formScript.serviceName }}
229
+ <el-form-item>
230
+ <fieldCompare
231
+ :isCompare="isCompare"
232
+ :oldVal="oldFormScript.serviceName"
233
+ :newVal="formScript.serviceName"
234
+ >
235
+ {{ formScript.serviceName }}
236
+ </fieldCompare>
237
+ </el-form-item>
180
238
  </td>
181
239
  </tr>
182
240
  <tr>
@@ -186,12 +244,18 @@
186
244
  prop="uri"
187
245
  :rules="[{ required: false, trigger: 'blur' }]"
188
246
  >
189
- <el-input
190
- type="text"
191
- autocomplete="off"
192
- v-model="formScript.uri"
193
- clearable
194
- />
247
+ <fieldCompare
248
+ :isCompare="isCompare"
249
+ :oldVal="oldFormScript.uri"
250
+ :newVal="formScript.uri"
251
+ >
252
+ <el-input
253
+ type="text"
254
+ autocomplete="off"
255
+ v-model="formScript.uri"
256
+ clearable
257
+ />
258
+ </fieldCompare>
195
259
  </el-form-item>
196
260
  </td>
197
261
  </tr>
@@ -231,14 +295,25 @@
231
295
  <tr>
232
296
  <th>{{ $t1("脚本说明") }}</th>
233
297
  <td colspan="7">
234
- <el-input
235
- type="textarea"
236
- :rows="2"
237
- :placeholder="$t1('请输入内容')"
238
- size="small"
239
- v-model="formScript.scriptRemark"
240
- clearable
241
- ></el-input>
298
+ <el-form-item
299
+ prop="scriptRemark"
300
+ :rules="[{ required: false, trigger: 'blur' }]"
301
+ >
302
+ <fieldCompare
303
+ :isCompare="isCompare"
304
+ :oldVal="oldFormScript.scriptRemark"
305
+ :newVal="formScript.scriptRemark"
306
+ >
307
+ <el-input
308
+ type="textarea"
309
+ :rows="2"
310
+ :placeholder="$t1('请输入内容')"
311
+ size="small"
312
+ v-model="formScript.scriptRemark"
313
+ clearable
314
+ ></el-input>
315
+ </fieldCompare>
316
+ </el-form-item>
242
317
  </td>
243
318
  </tr>
244
319
  <tr>
@@ -253,12 +328,18 @@
253
328
  prop="script"
254
329
  :rules="[{ required: true, trigger: 'blur' }]"
255
330
  >
256
- <code-editor
257
- mode="java"
258
- :readonly="!1"
259
- v-model="formScript.script"
260
- v-if="showCodeEditor"
261
- ></code-editor>
331
+ <fieldCompare
332
+ :isCompare="isCompare"
333
+ :oldVal="oldFormScript.script"
334
+ :newVal="formScript.script"
335
+ >
336
+ <code-editor
337
+ mode="java"
338
+ :readonly="!1"
339
+ v-model="formScript.script"
340
+ v-if="showCodeEditor"
341
+ ></code-editor>
342
+ </fieldCompare>
262
343
  </el-form-item>
263
344
  </td>
264
345
  </tr>
@@ -316,13 +397,14 @@
316
397
  import mixin from "./mixins/edit1";
317
398
  import formVersionButton from "@base/views/bd/setting/formVersion/button.vue";
318
399
  import reverButton from "@base/views/bd/setting/formVersion/reverButton.vue";
319
-
400
+ import fieldCompare from "@base/views/bd/setting/formVersion/fieldCompare.vue";
320
401
  export default {
321
402
  name: "user_form_scriptEdit",
322
403
  mixins: [mixin],
323
404
  components: {
324
405
  formVersionButton,
325
406
  reverButton,
407
+ fieldCompare,
326
408
  },
327
409
  };
328
410
  </script>