cloud-web-corejs 1.0.54-dev.656 → 1.0.54-dev.658

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 (40) hide show
  1. package/package.json +1 -1
  2. package/src/components/code-editor/index.vue +31 -2
  3. package/src/components/xform/form-designer/form-widget/field-widget/date-range-widget.vue +1 -2
  4. package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue +1 -1
  5. package/src/components/xform/form-designer/form-widget/field-widget/mixins/utc-transform-mixin.js +31 -15
  6. package/src/components/xform/form-designer/form-widget/field-widget/text-widget.vue +6 -6
  7. package/src/components/xform/utils/util.js +8 -77
  8. package/src/views/bd/setting/formVersion/compareBasicSection.vue +70 -0
  9. package/src/views/bd/setting/formVersion/compareCodeSection.vue +505 -0
  10. package/src/views/bd/setting/formVersion/compareContent.vue +63 -0
  11. package/src/views/bd/setting/formVersion/compareDialog.vue +135 -219
  12. package/src/views/bd/setting/formVersion/compareMixin.js +93 -0
  13. package/src/views/bd/setting/formVersion/formScriptCompareView.vue +94 -0
  14. package/src/views/bd/setting/formVersion/formTemplateCompareView.vue +74 -0
  15. package/src/views/bd/setting/formVersion/tableDetailDiff.js +78 -0
  16. package/src/views/bd/setting/formVersion/tableModelCompareView.vue +426 -0
  17. package/src/views/bd/setting/formVersion/textDiff.js +102 -0
  18. package/src/views/bd/setting/form_script/edit1.vue +4 -4
  19. package/src/views/bd/setting/form_script/mixins/dialog.js +2 -2
  20. package/src/views/bd/setting/form_script/mixins/edit.js +1 -1
  21. package/src/views/bd/setting/form_script/mixins/edit1.js +1 -1
  22. package/src/views/bd/setting/form_script/mixins/form_list.js +3 -3
  23. package/src/views/bd/setting/form_script/mixins/list.js +3 -3
  24. package/src/views/bd/setting/form_script/mixins/list1.js +4 -4
  25. package/src/views/bd/setting/form_script/mixins/otherAuthDialog.js +1 -1
  26. package/src/views/bd/setting/form_template/batchWfObjConfigDialog.vue +1 -1
  27. package/src/views/bd/setting/form_template/formDesignerDialog.vue +1 -1
  28. package/src/views/bd/setting/form_template/mixins/batchWfObjConfigDialog.js +3 -3
  29. package/src/views/bd/setting/form_template/mixins/edit.js +1 -1
  30. package/src/views/bd/setting/form_template/mixins/itemList.js +1 -1
  31. package/src/views/bd/setting/form_template/mixins/list.js +4 -4
  32. package/src/views/bd/setting/form_template/mixins/list2.js +3 -3
  33. package/src/views/bd/setting/form_template/mixins/otherAuthDialog.js +1 -1
  34. package/src/views/bd/setting/form_template/mixins/wf_list.js +3 -3
  35. package/src/views/bd/setting/request_setting/list.vue +15 -25
  36. package/src/views/bd/setting/table_model/edit.vue +1 -1
  37. package/src/views/bd/setting/table_model/mixins/dialog.js +1 -1
  38. package/src/views/bd/setting/table_model/mixins/list.js +6 -6
  39. package/src/views/bd/setting/table_model/mixins/otherAuthDialog.js +1 -1
  40. package/src/views/user/form/view/list.vue +29 -12
@@ -41,7 +41,7 @@ modules = {
41
41
  this.$refs["table-m1"].commitProxy("reload");
42
42
  },
43
43
  openEditDialog(row) {
44
- /*this.dataId = !id || typeof id == 'object' ? 0 : id;
44
+ /*this.dataId = !id || typeof id === 'object' ? 0 : id;
45
45
  this.activeName = 'first';
46
46
  this.$openEditView('showEdit');*/
47
47
 
@@ -109,7 +109,7 @@ modules = {
109
109
  width: 150,
110
110
  slots: {
111
111
  default: ({ row }) => {
112
- if (row.transactions == 1) {
112
+ if (row.transactions === 1) {
113
113
  return getJsxStatus(null, this.$t1("是"));
114
114
  } else {
115
115
  return getJsxStatus("s-3", this.$t1("否"));
@@ -273,7 +273,7 @@ modules = {
273
273
  getBdEnv() {
274
274
  getBdFlag({
275
275
  success: (res) => {
276
- this.isDev = res.objx == 1;
276
+ this.isDev = res.objx === 1;
277
277
  },
278
278
  });
279
279
  },
@@ -87,7 +87,7 @@ modules = {
87
87
  return this.currentFormType?.name || null;
88
88
  },
89
89
  otherFlag() {
90
- return this.currentFormType?.menuKindCode == "other";
90
+ return this.currentFormType?.menuKindCode === "other";
91
91
  },
92
92
  },
93
93
  mounted() {
@@ -105,7 +105,7 @@ modules = {
105
105
  this.$refs["table-m1"].commitProxy("reload");
106
106
  },
107
107
  openEditDialog(row) {
108
- /*this.dataId = !id || typeof id == 'object' ? 0 : id;
108
+ /*this.dataId = !id || typeof id === 'object' ? 0 : id;
109
109
  this.activeName = 'first';
110
110
  this.$openEditView('showEdit');*/
111
111
 
@@ -225,7 +225,7 @@ modules = {
225
225
  width: 150,
226
226
  slots: {
227
227
  default: ({ row }) => {
228
- if (row.transactions == 1) {
228
+ if (row.transactions === 1) {
229
229
  return getJsxStatus(null, this.$t1("是"));
230
230
  } else {
231
231
  return getJsxStatus("s-3", this.$t1("否"));
@@ -471,7 +471,7 @@ modules = {
471
471
  getBdEnv() {
472
472
  getBdFlag({
473
473
  success: (res) => {
474
- this.isDev = res.objx == 1;
474
+ this.isDev = res.objx === 1;
475
475
  },
476
476
  });
477
477
  },
@@ -56,7 +56,7 @@ modules = {
56
56
  initBdEnv() {
57
57
  return getBdEnv({
58
58
  success: res => {
59
- this.isDev = res.objx == "dev"
59
+ this.isDev = res.objx === "dev"
60
60
  }
61
61
  });
62
62
  },
@@ -52,7 +52,7 @@
52
52
  </div>
53
53
  </el-dialog>
54
54
  <el-dialog
55
- :title="$t1(resultType==1?'结果(成功)':'结果(失败)')"
55
+ :title="$t1(resultType===1?'结果(成功)':'结果(失败)')"
56
56
  :append-to-body="true"
57
57
  :modal-append-to-body="true"
58
58
  :close-on-click-modal="falseValue"
@@ -103,7 +103,7 @@ export default {
103
103
  },
104
104
  watch: {
105
105
  formDesTabs(val) {
106
- if (this.showFormScriptList == false && val == "second") {
106
+ if (this.showFormScriptList === false && val === "second") {
107
107
  this.showFormScriptList = true;
108
108
  }
109
109
  },
@@ -86,7 +86,7 @@ tmixins = {
86
86
  title: oriCol.title,
87
87
  width: 150
88
88
  };
89
- if (index == 0) {
89
+ if (index === 0) {
90
90
  col.fixed = 'left';
91
91
  }
92
92
  return col;
@@ -108,7 +108,7 @@ tmixins = {
108
108
  this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
109
109
  this.resOption = opts;
110
110
  this.$nextTick(() => {
111
- let rows = this.resultType == 1 ? this.successRows : this.failRows;
111
+ let rows = this.resultType === 1 ? this.successRows : this.failRows;
112
112
  let tDatas = rows.map((item, index) => {
113
113
  return item;
114
114
  });
@@ -226,7 +226,7 @@ tmixins = {
226
226
  isLoading: true,
227
227
  failMsg: false,
228
228
  callback: res => {
229
- if (res.type == "success") {
229
+ if (res.type === "success") {
230
230
  item.resultMessage = that.$t1('成功')
231
231
  item.resultType = res.type;
232
232
  successNum++
@@ -220,7 +220,7 @@ modules = {
220
220
  getBdEnv() {
221
221
  getBdFlag({
222
222
  success: res => {
223
- this.isDev = res.objx == 1
223
+ this.isDev = res.objx === 1
224
224
  }
225
225
  });
226
226
  },
@@ -32,7 +32,7 @@ modules = {
32
32
  this.$refs['table-m1'].commitProxy('reload');
33
33
  },
34
34
  openEditDialog(id) {
35
- this.dataId = !id || typeof id == 'object' ? 0 : id;
35
+ this.dataId = !id || typeof id === 'object' ? 0 : id;
36
36
  this.activeName = 'first';
37
37
  this.$openEditView('showEdit');
38
38
  },
@@ -149,12 +149,12 @@ modules = {
149
149
  return this.currentFormType?.name || null;
150
150
  },
151
151
  otherFlag() {
152
- return this.currentFormType?.menuKindCode == "other"
152
+ return this.currentFormType?.menuKindCode === "other"
153
153
  }
154
154
  },
155
155
  watch: {
156
156
  formDesTabs(val) {
157
- if (this.showFormScriptList == false && val == "second") {
157
+ if (this.showFormScriptList === false && val === "second") {
158
158
  this.showFormScriptList = true;
159
159
  }
160
160
  },
@@ -176,7 +176,7 @@ modules = {
176
176
  },
177
177
  openEditDialog(row) {
178
178
  let formCode = row?.formCode || null;
179
- /*this.dataId = !id || typeof id == 'object' ? 0 : id;
179
+ /*this.dataId = !id || typeof id === 'object' ? 0 : id;
180
180
  this.activeName = 'first';
181
181
  this.showItemEdit = false;
182
182
  this.$openEditView('showEdit');*/
@@ -663,7 +663,7 @@ modules = {
663
663
  getBdEnv() {
664
664
  getBdFlag({
665
665
  success: (res) => {
666
- this.isDev = res.objx == 1;
666
+ this.isDev = res.objx === 1;
667
667
  },
668
668
  });
669
669
  },
@@ -133,7 +133,7 @@ modules = {
133
133
  },
134
134
  watch: {
135
135
  formDesTabs(val) {
136
- if (this.showFormScriptList == false && val == 'second') {
136
+ if (this.showFormScriptList === false && val === 'second') {
137
137
  this.showFormScriptList = true;
138
138
  }
139
139
  }
@@ -154,7 +154,7 @@ modules = {
154
154
  },
155
155
  openEditDialog(row) {
156
156
  let formCode = row?.formCode || null;
157
- /*this.dataId = !id || typeof id == 'object' ? 0 : id;
157
+ /*this.dataId = !id || typeof id === 'object' ? 0 : id;
158
158
  this.activeName = 'first';
159
159
  this.showItemEdit = false;
160
160
  this.$openEditView('showEdit');*/
@@ -395,7 +395,7 @@ modules = {
395
395
  getBdEnv() {
396
396
  getBdFlag({
397
397
  success: res => {
398
- this.isDev = res.objx == 1
398
+ this.isDev = res.objx === 1
399
399
  }
400
400
  });
401
401
  },
@@ -56,7 +56,7 @@ modules = {
56
56
  initBdEnv() {
57
57
  return getBdEnv({
58
58
  success: res => {
59
- this.isDev = res.objx == "dev"
59
+ this.isDev = res.objx === "dev"
60
60
  }
61
61
  });
62
62
  },
@@ -136,7 +136,7 @@ modules = {
136
136
  },
137
137
  watch: {
138
138
  formDesTabs(val) {
139
- if (this.showFormScriptList == false && val == 'second') {
139
+ if (this.showFormScriptList === false && val === 'second') {
140
140
  this.showFormScriptList = true;
141
141
  }
142
142
  }
@@ -157,7 +157,7 @@ modules = {
157
157
  },
158
158
  openEditDialog(row) {
159
159
  let formCode = row?.formCode || null;
160
- /*this.dataId = !id || typeof id == 'object' ? 0 : id;
160
+ /*this.dataId = !id || typeof id === 'object' ? 0 : id;
161
161
  this.activeName = 'first';
162
162
  this.showItemEdit = false;
163
163
  this.$openEditView('showEdit');*/
@@ -394,7 +394,7 @@ modules = {
394
394
  getBdEnv() {
395
395
  getBdFlag({
396
396
  success: res => {
397
- this.isDev = res.objx == 1
397
+ this.isDev = res.objx === 1
398
398
  }
399
399
  });
400
400
  },
@@ -61,17 +61,29 @@
61
61
  >
62
62
  <vxe-form-item title="请求编码:" field="reqCode">
63
63
  <template v-slot>
64
- <el-input v-model="formData.reqCode" size="small" clearable />
64
+ <el-input
65
+ v-model="formData.reqCode"
66
+ size="small"
67
+ clearable
68
+ />
65
69
  </template>
66
70
  </vxe-form-item>
67
71
  <vxe-form-item title="请求名称:" field="reqName">
68
72
  <template v-slot>
69
- <el-input v-model="formData.reqName" size="small" clearable />
73
+ <el-input
74
+ v-model="formData.reqName"
75
+ size="small"
76
+ clearable
77
+ />
70
78
  </template>
71
79
  </vxe-form-item>
72
80
  <vxe-form-item title="执行组织编码:" field="exeCompanyCode">
73
81
  <template v-slot>
74
- <el-input v-model="formData.exeCompanyCode" size="small" clearable />
82
+ <el-input
83
+ v-model="formData.exeCompanyCode"
84
+ size="small"
85
+ clearable
86
+ />
75
87
  </template>
76
88
  </vxe-form-item>
77
89
  <vxe-form-item title="是否启用:" field="enabled">
@@ -207,28 +219,6 @@ export default {
207
219
  field: "exeCompanyCode",
208
220
  width: 150,
209
221
  },
210
- {
211
- field: "enabled",
212
- title: this.$t1("是否启用"),
213
- width: 150,
214
- slots: {
215
- default: ({ row }) => {
216
- if (row.enabled) {
217
- return [
218
- <div class="txt-status">
219
- <span>启用</span>
220
- </div>,
221
- ];
222
- } else {
223
- return [
224
- <div class="txt-status disable">
225
- <span>禁用</span>
226
- </div>,
227
- ];
228
- }
229
- },
230
- },
231
- },
232
222
  {
233
223
  title: "参数1",
234
224
  field: "param1",
@@ -216,7 +216,7 @@
216
216
  szTaMb.sszstBm = null;
217
217
  $forceUpdate();
218
218
  "
219
- :disabled="szTaMb.taType == 0"
219
+ :disabled="szTaMb.taType === 0"
220
220
  v-el-readonly
221
221
  clearable
222
222
  >
@@ -45,7 +45,7 @@ modules = {
45
45
  {
46
46
  title: this.$t1('表类型'), field: 'taType', width: 150, slots: {
47
47
  default: ({row}) => {
48
- return row.taType == 0 ? this.$t1('主表') : this.$t1('明细表')
48
+ return row.taType === 0 ? this.$t1('主表') : this.$t1('明细表')
49
49
  }
50
50
  }
51
51
  },
@@ -98,7 +98,7 @@ modules = {
98
98
  return this.currentFormType?.name || null
99
99
  },
100
100
  otherFlag() {
101
- return this.currentFormType?.menuKindCode == "other"
101
+ return this.currentFormType?.menuKindCode === "other"
102
102
  },
103
103
  ...mapGetters([
104
104
  "userFlag",
@@ -114,7 +114,7 @@ modules = {
114
114
  this.$refs['table-m1'].commitProxy('reload');
115
115
  },
116
116
  openEditDialog(row) {
117
- /*this.dataId = !id || typeof id == 'object' ? 0 : id;
117
+ /*this.dataId = !id || typeof id === 'object' ? 0 : id;
118
118
  this.activeName = 'first';
119
119
  this.$openEditView('showEdit');*/
120
120
 
@@ -173,7 +173,7 @@ modules = {
173
173
  title: this.$t1('表类型'), field: 'taType', width: 150,
174
174
  slots: {
175
175
  default: ({row}) => {
176
- return row.taType == 0 ? this.$t1('主表') : this.$t1('明细表')
176
+ return row.taType === 0 ? this.$t1('主表') : this.$t1('明细表')
177
177
  }
178
178
  }
179
179
  },
@@ -181,7 +181,7 @@ modules = {
181
181
  title: this.$t1('是否树结构'), field: 'taRule', width: 150,
182
182
  slots: {
183
183
  default: ({row}) => {
184
- return row.taRule == 1 ? this.$t1('是') : this.$t1('否')
184
+ return row.taRule === 1 ? this.$t1('是') : this.$t1('否')
185
185
  }
186
186
  }
187
187
  },
@@ -189,7 +189,7 @@ modules = {
189
189
  title: this.$t1('数据范围'), field: 'dataRange', width: 150,
190
190
  slots: {
191
191
  default: ({row}) => {
192
- return row.dataRange == 1 ? this.$t1('集团') : this.$t1('当前组织')
192
+ return row.dataRange === 1 ? this.$t1('集团') : this.$t1('当前组织')
193
193
  }
194
194
  }
195
195
  },
@@ -432,7 +432,7 @@ modules = {
432
432
  getBdEnv() {
433
433
  getBdFlag({
434
434
  success: res => {
435
- this.isDev = res.objx == 1
435
+ this.isDev = res.objx === 1
436
436
  }
437
437
  });
438
438
  }
@@ -59,7 +59,7 @@ modules = {
59
59
  initBdEnv() {
60
60
  return getBdEnv({
61
61
  success: res => {
62
- this.isDev = res.objx == "dev"
62
+ this.isDev = res.objx === "dev"
63
63
  }
64
64
  });
65
65
  },
@@ -1,7 +1,12 @@
1
1
  <template>
2
2
  <div id="containt">
3
3
  <template v-if="layoutType == 'PC'">
4
- <x-tabs ref="xTabs" v-model="activeName" class="tab-box" :tabNameEnable="true">
4
+ <x-tabs
5
+ ref="xTabs"
6
+ v-model="activeName"
7
+ class="tab-box"
8
+ :tabNameEnable="true"
9
+ >
5
10
  <el-tab-pane :label="$t2('常规')" name="first">
6
11
  <vFormRender
7
12
  ref="edit"
@@ -17,7 +22,10 @@
17
22
  @openCopyEditTab="openCopyEditTab"
18
23
  ></vFormRender>
19
24
  </el-tab-pane>
20
- <el-tab-pane :label="$t2(formConfig.customListTabLabel || '列表')" name="second">
25
+ <el-tab-pane
26
+ :label="$t2(formConfig.customListTabLabel || '列表')"
27
+ name="second"
28
+ >
21
29
  <div class="grid-height">
22
30
  <vFormRender
23
31
  ref="list"
@@ -97,7 +105,7 @@
97
105
  >
98
106
  <div class="cont" style="height: calc(100vh - 73px)">
99
107
  <vFormRender
100
- :formCode="formCode2"
108
+ :formCode="formCode1"
101
109
  :dataId.sync="dataId"
102
110
  v-if="showEditDialog && showEdit"
103
111
  visible-key="showEdit"
@@ -159,7 +167,7 @@ export default {
159
167
  let num = Number(val.substring("otherTab".length));
160
168
  this.otherTabList[num].showContent = true;
161
169
  }
162
- this.handleTabChange(val)
170
+ this.handleTabChange(val);
163
171
  },
164
172
  },
165
173
  created() {
@@ -172,12 +180,13 @@ export default {
172
180
  };
173
181
  },
174
182
  methods: {
175
- handleTabChange(tabName){
176
- if(tabName == "second"){
183
+ handleTabChange(tabName) {
184
+ if (tabName == "second") {
177
185
  this.$refs.list.dataTableSearch();
178
- }else if(tabName.startsWith("otherTab")){
179
- let refName = tabName.replace("otherTab","list")
180
- if(this.$refs[refName]?.length)this.$refs[refName][0].dataTableSearch();
186
+ } else if (tabName.startsWith("otherTab")) {
187
+ let refName = tabName.replace("otherTab", "list");
188
+ if (this.$refs[refName]?.length)
189
+ this.$refs[refName][0].dataTableSearch();
181
190
  }
182
191
  },
183
192
  initParam() {
@@ -220,7 +229,9 @@ export default {
220
229
  openOtherTab(row, param, option) {
221
230
  let dataId = row && row.id ? row.id : null;
222
231
  let formCode = option.formCode;
223
- let otherTab = this.otherTabList.find((item) => item.formCode == formCode);
232
+ let otherTab = this.otherTabList.find(
233
+ (item) => item.formCode == formCode
234
+ );
224
235
  let otherTabIndex = this.otherTabList.findIndex(
225
236
  (item) => item.formCode == formCode
226
237
  );
@@ -236,6 +247,7 @@ export default {
236
247
  });
237
248
  },
238
249
  openEditDialog(row, param, option) {
250
+ debugger;
239
251
  if (option?.otherTab) {
240
252
  this.openOtherTab(row, param, option);
241
253
  return;
@@ -245,12 +257,16 @@ export default {
245
257
  return;
246
258
  }
247
259
  let formConfig = this.formJson.formConfig;
248
- let tabLabelField = option?.multiTabLabelField || formConfig.multiTabLabelField;
260
+ let tabLabelField =
261
+ option?.multiTabLabelField || formConfig.multiTabLabelField;
249
262
  let multiTabEnabled = false;
250
263
  if (tabLabelField) {
251
264
  if (option?.multiTabEnabled) {
252
265
  multiTabEnabled = true;
253
- } else if (formConfig.multiTabEnabled && option?.multiTabEnabled !== false) {
266
+ } else if (
267
+ formConfig.multiTabEnabled &&
268
+ option?.multiTabEnabled !== false
269
+ ) {
254
270
  multiTabEnabled = true;
255
271
  }
256
272
  }
@@ -285,6 +301,7 @@ export default {
285
301
  this.openEditDialog(row, param, { multiTabEnabled: false, ...option });
286
302
  },
287
303
  openEditH5Dialog(row) {
304
+ debugger;
288
305
  this.formCode1 = this.addFormCode;
289
306
  this.dataId = row && row.id ? row.id : null;
290
307
  this.activeName = "first";