cloud-web-corejs 1.0.54-dev.374 → 1.0.54-dev.376

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 -1
  2. package/src/components/baseAttachment/mixins.js +1 -270
  3. package/src/components/fileLibrary/filterDialog.vue +130 -83
  4. package/src/components/fileLibrary/mixins/fileObjAuthDialogMixin.js +2 -2
  5. package/src/components/fileLibrary/mixins/indexMixins.js +2 -2
  6. package/src/components/fileLibrary/mixins/propertiesDialogMixins.js +1 -1
  7. package/src/components/fileLibrary/mixins/recycleBinDialogMixins.js +2 -2
  8. package/src/components/fileLibrary/propertiesDialog.vue +99 -78
  9. package/src/components/scriptDescription/button.vue +25 -15
  10. package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue +1 -1
  11. package/src/components/xform/form-designer/form-widget/field-widget/cascader-widget.vue +19 -1
  12. package/src/components/xform/form-designer/form-widget/field-widget/checkbox-widget.vue +4 -1
  13. package/src/components/xform/form-designer/form-widget/field-widget/color-widget.vue +4 -1
  14. package/src/components/xform/form-designer/form-widget/field-widget/date-range-widget.vue +13 -2
  15. package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue +9 -2
  16. package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js +1598 -1
  17. package/src/components/xform/form-designer/form-widget/field-widget/input-widget.vue +7 -2
  18. package/src/components/xform/form-designer/form-widget/field-widget/number-widget.vue +7 -0
  19. package/src/components/xform/form-designer/form-widget/field-widget/print-button-widget.vue +35 -27
  20. package/src/components/xform/form-designer/form-widget/field-widget/print-detail-button-widget.vue +10 -10
  21. package/src/components/xform/form-designer/form-widget/field-widget/radio-widget.vue +4 -1
  22. package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue +11 -8
  23. package/src/components/xform/form-designer/form-widget/field-widget/vabUpload2-widget.vue +9 -1
  24. package/src/components/xform/form-designer/setting-panel/form-setting.vue +44 -78
  25. package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload2/field-vabUpload2-editor.vue +2 -1
  26. package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +2 -2
  27. package/src/components/xform/lang/zh-CN.js +2 -2
  28. package/src/layout/components/Sidebar/default.vue +1 -1
@@ -2,7 +2,7 @@
2
2
  <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
3
3
  :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
4
4
  :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
5
- <el-input v-if="!field.options.showText" ref="fieldEditor" v-model="fieldModel"
5
+ <el-input ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
6
6
  :disabled="field.options.disabled" :readonly="field.options.readonly"
7
7
  :size="field.options.size" class="hide-spin-button"
8
8
  :type="inputType"
@@ -19,7 +19,9 @@
19
19
  <el-button slot="append" v-if="field.options.appendButton" :disabled="field.options.disabled || field.options.appendButtonDisabled"
20
20
  :class="field.options.buttonIcon" @click.native="emitAppendButtonClick"></el-button>
21
21
  </el-input>
22
- <span v-else>{{ fieldModel}}</span>
22
+ <template v-if="isReadMode">
23
+ <span class="readonly-mode-field pre-wrap" :title="contentForReadMode">{{contentForReadMode}}</span>
24
+ </template>
23
25
  </form-item-wrapper>
24
26
  </template>
25
27
 
@@ -77,6 +79,9 @@
77
79
 
78
80
  return this.field.options.type
79
81
  },
82
+ contentForReadMode() {
83
+ return this.fieldModel ? this.fieldModel : ''
84
+ },
80
85
 
81
86
  },
82
87
  beforeCreate() {
@@ -14,6 +14,7 @@
14
14
  <el-input-number
15
15
  ref="fieldEditor"
16
16
  v-model="numberValue"
17
+ v-show="!isReadMode"
17
18
  class="full-width-input"
18
19
  :disabled="field.options.disabled"
19
20
  :size="field.options.size"
@@ -29,6 +30,9 @@
29
30
  :class="[field.options.showbutton ? '' : 'noButton']"
30
31
  >
31
32
  </el-input-number>
33
+ <template v-if="isReadMode">
34
+ <span class="readonly-mode-field">{{contentForReadMode}}</span>
35
+ </template>
32
36
  </form-item-wrapper>
33
37
  </template>
34
38
 
@@ -94,6 +98,9 @@ export default {
94
98
  currentData[this.fieldKeyName] = newValue;
95
99
  },
96
100
  },
101
+ contentForReadMode() {
102
+ return (this.fieldModel === null || this.fieldModel === undefined) ? '' : this.fieldModel
103
+ }
97
104
  },
98
105
  beforeCreate() {
99
106
  /* 这里不能访问方法和属性!! */
@@ -1,29 +1,37 @@
1
1
  <template>
2
2
  <static-content-wrapper
3
- :designer="designer" :field="field" :design-state="designState"
3
+ :designer="designer"
4
+ :field="field"
5
+ :design-state="designState"
4
6
  :display-style="field.options.displayStyle"
5
- :parent-widget="parentWidget" :parent-list="parentList"
6
- :index-of-parent-list="indexOfParentList">
7
+ :parent-widget="parentWidget"
8
+ :parent-list="parentList"
9
+ :index-of-parent-list="indexOfParentList"
10
+ >
7
11
  <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
8
12
  <el-button type="primary" class="button-sty" size="mini">
9
- <span>{{ $t1('导出/打印') }}</span><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
13
+ <span>{{ $t1("导出/打印") }}</span
14
+ ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
10
15
  </el-button>
11
16
  </el-dropdown>
12
- <base-input-export :option="exportOption" :parent-target="getFormRef()" :disabled="field.options.disabled" v-else/>
17
+ <base-input-export
18
+ :option="exportOption"
19
+ :parent-target="getFormRef()"
20
+ :disabled="field.options.disabled"
21
+ v-else
22
+ />
13
23
  </static-content-wrapper>
14
-
15
24
  </template>
16
25
  <script>
17
- import emitter from '../../../../../components/xform/utils/emitter'
26
+ import emitter from "../../../../../components/xform/utils/emitter";
18
27
  import i18n from "../../../../../components/xform/utils/i18n";
19
28
  import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
20
- import StaticContentWrapper
21
- from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
29
+ import StaticContentWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
22
30
 
23
31
  export default {
24
32
  name: "print-button-widget",
25
- components: {StaticContentWrapper},
26
- componentName: 'FieldWidget', //必须固定为FieldWidget,用于接收父级组件的broadcast事件
33
+ components: { StaticContentWrapper },
34
+ componentName: "FieldWidget", //必须固定为FieldWidget,用于接收父级组件的broadcast事件
27
35
  mixins: [emitter, fieldMixin, i18n],
28
36
  props: {
29
37
  field: Object,
@@ -33,13 +41,13 @@ export default {
33
41
  designer: Object,
34
42
  designState: {
35
43
  type: Boolean,
36
- default: false
37
- }
44
+ default: false,
45
+ },
38
46
  },
39
47
  data() {
40
48
  return {
41
- exportOption: {}
42
- }
49
+ exportOption: {},
50
+ };
43
51
  },
44
52
  beforeCreate() {
45
53
  /* 这里不能访问方法和属性!! */
@@ -48,18 +56,18 @@ export default {
48
56
  this.init();
49
57
  /* 注意:子组件mounted在父组件created之后、父组件mounted之前触发,故子组件mounted需要用到的prop
50
58
  需要在父组件created中初始化!! */
51
- this.registerToRefList()
52
- this.initEventHandler()
59
+ this.registerToRefList();
60
+ this.initEventHandler();
53
61
 
54
- this.handleOnCreated()
62
+ this.handleOnCreated();
55
63
  },
56
64
 
57
65
  mounted() {
58
- this.handleOnMounted()
66
+ this.handleOnMounted();
59
67
  },
60
68
 
61
69
  beforeDestroy() {
62
- this.unregisterFromRefList()
70
+ this.unregisterFromRefList();
63
71
  },
64
72
 
65
73
  methods: {
@@ -67,7 +75,9 @@ export default {
67
75
  if (this.designState) return;
68
76
  let prefix = "/" + this.getFormRef().reportTemplate.serviceName;
69
77
  // let printOption = this.handleCustomEvent(this.field.options.printOption);
70
- let codes = this.field.options.printItems.filter(item => !!item.code).map(item => item.code);
78
+ let codes = this.field.options.printItems
79
+ .filter((item) => !!item.code)
80
+ .map((item) => item.code);
71
81
  let option = {
72
82
  prefix: prefix,
73
83
  tableTarget: () => {
@@ -77,15 +87,13 @@ export default {
77
87
  // codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT", "USERJDPRINT", "USERPDDPRINT", "USERVIPPRINT"],
78
88
  // ...printOption
79
89
  };
80
- console.log("a:", option)
90
+ console.log("a:", option);
81
91
  this.exportOption = option;
82
- }
83
- }
84
-
85
- }
92
+ },
93
+ },
94
+ };
86
95
  </script>
87
96
 
88
97
  <style lang="scss" scoped>
89
98
  @import "~@/styles/global.scss"; //* static-content-wrapper已引入,还需要重复引入吗? *//
90
-
91
99
  </style>
@@ -8,11 +8,7 @@
8
8
  :parent-list="parentList"
9
9
  :index-of-parent-list="indexOfParentList"
10
10
  >
11
- <el-dropdown
12
- trigger="hover"
13
- v-if="designState"
14
- :disabled="field.options.disabled"
15
- >
11
+ <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
16
12
  <el-button type="primary" class="button-sty" size="mini">
17
13
  <span>{{ $t1("导出/打印") }}</span
18
14
  ><span class="line"></span>
@@ -86,16 +82,20 @@ export default {
86
82
  let option = {
87
83
  prefix: prefix,
88
84
  codes,
89
- customCondition:(exportTemplate)=>{
85
+ customCondition: (exportTemplate) => {
90
86
  let param = {
91
- formData: this.formModel
87
+ formData: this.formModel,
92
88
  };
93
89
  if (this.field.options.printCustomCondition) {
94
- let param1 = this.handleCustomEvent(this.field.options.printCustomCondition,['exportTemplate'],[exportTemplate]);
95
- if(param1)param = param1;
90
+ let param1 = this.handleCustomEvent(
91
+ this.field.options.printCustomCondition,
92
+ ["exportTemplate"],
93
+ [exportTemplate]
94
+ );
95
+ if (param1) param = param1;
96
96
  }
97
97
  return param;
98
- }
98
+ },
99
99
  };
100
100
  this.exportOption = option;
101
101
  },
@@ -2,7 +2,7 @@
2
2
  <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
3
3
  :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
4
4
  :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
5
- <el-radio-group ref="fieldEditor" v-model="fieldModel"
5
+ <el-radio-group ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
6
6
  :disabled="field.options.disabled" :size="field.options.size"
7
7
  @change="handleChangeEvent">
8
8
  <template v-if="!!field.options.buttonStyle">
@@ -16,6 +16,9 @@
16
16
  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
17
17
  </template>
18
18
  </el-radio-group>
19
+ <template v-if="isReadMode">
20
+ <span class="readonly-mode-field">{{optionLabel}}</span>
21
+ </template>
19
22
  </form-item-wrapper>
20
23
  </template>
21
24
 
@@ -3,7 +3,7 @@
3
3
  :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
4
4
  :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
5
5
  :sub-form-row-id="subFormRowId" v-if="">
6
- <el-select v-if="!field.options.showText" ref="fieldEditor" v-model="fieldModel" class="full-width-input"
6
+ <el-select ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode" class="full-width-input"
7
7
  :disabled="field.options.disabled"
8
8
  :size="field.options.size"
9
9
  :clearable="field.options.clearable"
@@ -23,7 +23,9 @@
23
23
  :value="item[valueField]" :disabled="item.disabled">
24
24
  </el-option>
25
25
  </el-select>
26
- <span v-else>{{ fieldModelLabel }}</span>
26
+ <template v-if="isReadMode">
27
+ <span class="readonly-mode-field">{{optionLabel}}</span>
28
+ </template>
27
29
  </form-item-wrapper>
28
30
  </template>
29
31
 
@@ -84,12 +86,13 @@ export default {
84
86
  return (!!this.field.options.filterable && !!this.field.options.allowCreate)
85
87
  },
86
88
  fieldModelLabel() {
87
- let fieldModel = this.fieldModel;
88
- let optionItems = this.field.options.optionItems;
89
- let valueField = this.valueField;
90
- let labelField = this.labelField;
91
- let optionItem = optionItems.find(item => item[valueField] === fieldModel)
92
- return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
89
+ // let fieldModel = this.fieldModel;
90
+ // let optionItems = this.field.options.optionItems;
91
+ // let valueField = this.valueField;
92
+ // let labelField = this.labelField;
93
+ // let optionItem = optionItems.find(item => item[valueField] === fieldModel)
94
+ // return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
95
+ return this.optionLabel;
93
96
  },
94
97
  optionItems() {
95
98
  return this.getOptionItems();
@@ -329,8 +329,16 @@ export default {
329
329
  backendwriteback: "10",
330
330
  };
331
331
 
332
+ let param = {
333
+ row: attachment,
334
+ rowIndex: index
335
+ }
332
336
  let deleteParam =
333
- this.handleCustomEvent(this.field.options.vabupload2_deleteParam) || {};
337
+ this.handleCustomEvent(
338
+ this.field.options.vabupload2_deleteParam,
339
+ ["param"],
340
+ [param]
341
+ ) || {};
334
342
  Object.assign(reqData, deleteParam);
335
343
 
336
344
  this.getFormRef().$http({
@@ -9,10 +9,7 @@
9
9
  @submit.native.prevent
10
10
  >
11
11
  <el-collapse v-model="formActiveCollapseNames" class="setting-collapse">
12
- <el-collapse-item
13
- name="1"
14
- :title="i18nt('designer.setting.basicSetting')"
15
- >
12
+ <el-collapse-item name="1" :title="i18nt('designer.setting.basicSetting')">
16
13
  <el-form-item :label="i18nt('数据库表')">
17
14
  <el-input type="text" v-model="formConfig.entity"></el-input>
18
15
  </el-form-item>
@@ -30,18 +27,29 @@
30
27
  ></el-switch>
31
28
  </el-form-item>
32
29
  <el-form-item>
33
- <span slot="label">流程主题
34
- <el-tooltip effect="light">
30
+ <span slot="label"
31
+ >流程主题
32
+ <scriptDescriptionButton
33
+ title="流程主题说明"
34
+ path="static/readme/WfSubject.txt"
35
+ ></scriptDescriptionButton>
36
+ <!-- <el-tooltip effect="light">
35
37
  <i class="el-icon-info"></i>
36
38
  <div slot="content" style="white-space: pre-wrap;">
37
39
  {{tip1}}
38
40
  </div>
39
41
 
40
- </el-tooltip>
41
- </span>
42
+ </el-tooltip> -->
43
+ </span>
42
44
  </el-form-item>
43
45
  <div>
44
- <el-input style="word-break: break-word" type="textarea" :rows="3" v-model="formConfig.wfTheme" clearable></el-input>
46
+ <el-input
47
+ style="word-break: break-word"
48
+ type="textarea"
49
+ :rows="3"
50
+ v-model="formConfig.wfTheme"
51
+ clearable
52
+ ></el-input>
45
53
  </div>
46
54
  <el-form-item :label="i18nt('流程启动时自动保存表单数据')">
47
55
  <el-switch v-model="formConfig.wfStartBindSave"></el-switch>
@@ -57,8 +65,7 @@
57
65
  @click="openWfConfigDataDialog2"
58
66
  >
59
67
  <span>{{
60
- formConfig.wfAgreeConfigData &&
61
- formConfig.wfAgreeConfigData.length
68
+ formConfig.wfAgreeConfigData && formConfig.wfAgreeConfigData.length
62
69
  ? "已维护"
63
70
  : ""
64
71
  }}</span>
@@ -75,9 +82,7 @@
75
82
  @click="openWfConfigDataDialog"
76
83
  >
77
84
  <span>{{
78
- formConfig.wfConfigData && formConfig.wfConfigData.length
79
- ? "已维护"
80
- : ""
85
+ formConfig.wfConfigData && formConfig.wfConfigData.length ? "已维护" : ""
81
86
  }}</span>
82
87
  <i class="el-icon-edit"></i>
83
88
  </a>
@@ -152,13 +157,7 @@
152
157
  </a>
153
158
  </el-form-item>
154
159
  <el-form-item :label="i18nt('designer.setting.formCss')">
155
- <el-button
156
- type="info"
157
- icon="el-icon-edit"
158
- plain
159
- round
160
- @click="editFormCss"
161
- >
160
+ <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">
162
161
  {{ i18nt("designer.setting.addCss") }}
163
162
  </el-button>
164
163
  </el-form-item>
@@ -168,10 +167,7 @@
168
167
  <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
169
168
  </el-form-item>
170
169
  <el-form-item :label="i18nt('标签名称字段')">
171
- <el-input
172
- type="text"
173
- v-model="formConfig.multiTabLabelField"
174
- ></el-input>
170
+ <el-input type="text" v-model="formConfig.multiTabLabelField"></el-input>
175
171
  </el-form-item>
176
172
  </el-collapse-item>
177
173
 
@@ -358,11 +354,7 @@
358
354
  :modal-append-to-body="true"
359
355
  >
360
356
  <div class="cont">
361
- <code-editor
362
- :mode="'css'"
363
- :readonly="false"
364
- v-model="formCssCode"
365
- ></code-editor>
357
+ <code-editor :mode="'css'" :readonly="false" v-model="formCssCode"></code-editor>
366
358
  </div>
367
359
  <div slot="footer" class="dialog-footer">
368
360
  <el-button
@@ -528,11 +520,7 @@
528
520
  stripe=""
529
521
  style="margin-bottom: 0px"
530
522
  >
531
- <el-table-column
532
- type="index"
533
- width="35"
534
- fixed="left"
535
- ></el-table-column>
523
+ <el-table-column type="index" width="35" fixed="left"></el-table-column>
536
524
  <!-- <el-table-column :label="i18nt('服务')" width="150">
537
525
  <template slot-scope="{ row }">
538
526
  <el-select v-model="row.serveType" @change="changeServeType(row)">
@@ -590,10 +578,7 @@
590
578
  <base-input-number v-model="row.modelOrders" clearable></base-input-number>
591
579
  </template>
592
580
  </el-table-column>
593
- <el-table-column
594
- :label="i18nt('节点步骤(多个值用“,”隔开)')"
595
- width="250"
596
- >
581
+ <el-table-column :label="i18nt('节点步骤(多个值用“,”隔开)')" width="250">
597
582
  <template slot-scope="{ row }">
598
583
  <el-input v-model="row.taskSteps" clearable></el-input>
599
584
  </template>
@@ -637,11 +622,7 @@
637
622
  </el-table>
638
623
  </div>
639
624
  <div class="dialog-footer" slot="footer">
640
- <el-button
641
- @click="dialogVisible = false"
642
- class="button-sty"
643
- icon="el-icon-close"
644
- >
625
+ <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
645
626
  {{ i18nt("designer.hint.cancel") }}
646
627
  </el-button>
647
628
  <el-button
@@ -682,11 +663,7 @@
682
663
  stripe=""
683
664
  style="margin-bottom: 0px"
684
665
  >
685
- <el-table-column
686
- type="index"
687
- width="35"
688
- fixed="left"
689
- ></el-table-column>
666
+ <el-table-column type="index" width="35" fixed="left"></el-table-column>
690
667
  <!-- <el-table-column :label="i18nt('服务')" width="150">
691
668
  <template slot-scope="{ row }">
692
669
  <el-select v-model="row.serveType" @change="changeServeType(row)">
@@ -744,10 +721,7 @@
744
721
  <base-input-number v-model="row.modelOrders" clearable></base-input-number>
745
722
  </template>
746
723
  </el-table-column>
747
- <el-table-column
748
- :label="i18nt('节点步骤(多个值用“,”隔开)')"
749
- width="250"
750
- >
724
+ <el-table-column :label="i18nt('节点步骤(多个值用“,”隔开)')" width="250">
751
725
  <template slot-scope="{ row }">
752
726
  <el-input v-model="row.taskSteps" clearable></el-input>
753
727
  </template>
@@ -915,7 +889,7 @@ export default {
915
889
  showBdCompanyEnvDialog1: false,
916
890
  showBdCompanyEnvDialog2: false,
917
891
 
918
- tip1:`流程主题表达式设置说明。
892
+ tip1: `流程主题表达式设置说明。
919
893
 
920
894
  1、可使用参数:
921
895
  wf:流程对象
@@ -949,7 +923,7 @@ func.convertDate(date, format):时间转换,如当前时间转为当前天
949
923
 
950
924
  3、配置示例
951
925
  比如表名为:pm_product_project,配置如下:
952
- $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_project.product_name\}$\{wf.name\}$\{pm_product_project.sn\}$\{func.orgName(pm_product_project.f_sale_org_id)\}$\{nowDayStr\}`
926
+ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_project.product_name\}$\{wf.name\}$\{pm_product_project.sn\}$\{func.orgName(pm_product_project.f_sale_org_id)\}$\{nowDayStr\}`,
953
927
  };
954
928
  },
955
929
  created() {
@@ -1067,9 +1041,7 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
1067
1041
  });
1068
1042
 
1069
1043
  if (syntaxErrorFlag) {
1070
- this.$message.error(
1071
- this.i18nt("designer.setting.syntaxCheckWarning")
1072
- );
1044
+ this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
1073
1045
  return;
1074
1046
  }
1075
1047
  }
@@ -1096,9 +1068,7 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
1096
1068
  });
1097
1069
 
1098
1070
  if (syntaxErrorFlag) {
1099
- this.$message.error(
1100
- this.i18nt("designer.setting.syntaxCheckWarning")
1101
- );
1071
+ this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
1102
1072
  return;
1103
1073
  }
1104
1074
  }
@@ -1106,18 +1076,18 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
1106
1076
  this.formConfig[this.curEventName] = this.formEventHandlerCode;
1107
1077
  this.showFormEventDialogFlag = false;
1108
1078
  },
1109
- openFormTemplate(flag){
1079
+ openFormTemplate(flag) {
1110
1080
  this.formTemplateFlag = flag;
1111
1081
  this.showFormTemplateDialog = true;
1112
1082
  },
1113
1083
  confirmFormTemplate(rows) {
1114
1084
  if (rows.length) {
1115
1085
  let row = rows[0];
1116
- if(this.formTemplateFlag==1){
1086
+ if (this.formTemplateFlag == 1) {
1117
1087
  //新增
1118
1088
  this.$set(this.formConfig, "addFormCode", row.formCode);
1119
1089
  this.$set(this.formConfig, "addFormName", row.formName);
1120
- }else{
1090
+ } else {
1121
1091
  //查看
1122
1092
  this.$set(this.formConfig, "editFormCode", row.formCode);
1123
1093
  this.$set(this.formConfig, "editFormName", row.formName);
@@ -1140,9 +1110,7 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
1140
1110
  });
1141
1111
 
1142
1112
  if (syntaxErrorFlag) {
1143
- this.$message.error(
1144
- this.i18nt("designer.setting.syntaxCheckWarning")
1145
- );
1113
+ this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
1146
1114
  return;
1147
1115
  }
1148
1116
  }
@@ -1165,9 +1133,7 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
1165
1133
  });
1166
1134
 
1167
1135
  if (syntaxErrorFlag) {
1168
- this.$message.error(
1169
- this.i18nt("designer.setting.syntaxCheckWarning")
1170
- );
1136
+ this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
1171
1137
  return;
1172
1138
  }
1173
1139
  }
@@ -1226,20 +1192,20 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
1226
1192
  type: "error",
1227
1193
  message: "服务名称不能为空",
1228
1194
  });
1229
- return
1195
+ return;
1230
1196
  }
1231
1197
  if (!item.companyCodes) {
1232
1198
  this.$message({
1233
1199
  type: "error",
1234
1200
  message: "组织编码不能为空",
1235
1201
  });
1236
- return
1202
+ return;
1237
1203
  }
1238
- let modelOrders = item.modelOrders??"";
1204
+ let modelOrders = item.modelOrders ?? "";
1239
1205
 
1240
1206
  let serveName = item.serveName;
1241
1207
  let companyCodes = item.companyCodes;
1242
- let key = serveName + "_" + companyCodes+ "_"+modelOrders;
1208
+ let key = serveName + "_" + companyCodes + "_" + modelOrders;
1243
1209
  if (!map[key]) {
1244
1210
  map[key] = true;
1245
1211
  } else {
@@ -1283,20 +1249,20 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
1283
1249
  type: "error",
1284
1250
  message: "服务名称不能为空",
1285
1251
  });
1286
- return
1252
+ return;
1287
1253
  }
1288
1254
  if (!item.companyCodes) {
1289
1255
  this.$message({
1290
1256
  type: "error",
1291
1257
  message: "组织编码不能为空",
1292
1258
  });
1293
- return
1259
+ return;
1294
1260
  }
1295
- let modelOrders = item.modelOrders??"";
1261
+ let modelOrders = item.modelOrders ?? "";
1296
1262
 
1297
1263
  let serveName = item.serveName;
1298
1264
  let companyCodes = item.companyCodes;
1299
- let key = serveName + "_" + companyCodes+ "_"+modelOrders;
1265
+ let key = serveName + "_" + companyCodes + "_" + modelOrders;
1300
1266
  if (!map[key]) {
1301
1267
  map[key] = true;
1302
1268
  } else {
@@ -21,7 +21,7 @@
21
21
  <a
22
22
  href="javascript:void(0);"
23
23
  class="a-link link-oneLind"
24
- @click="editEventHandler('vabupload2_deleteParam', params)"
24
+ @click="editEventHandler('vabupload2_deleteParam', deleteParam)"
25
25
  >
26
26
  <span>{{ optionModel.vabupload2_deleteParam }}</span>
27
27
  <i class="el-icon-edit"></i>
@@ -54,6 +54,7 @@ export default {
54
54
  data() {
55
55
  return {
56
56
  params: ["dataId", "formCode"],
57
+ deleteParam: ["dataId", "formCode", "param"],
57
58
  };
58
59
  },
59
60
  };
@@ -3160,7 +3160,7 @@ export const advancedFields = [
3160
3160
  type: "print-detail-button",
3161
3161
  icon: "button",
3162
3162
  commonFlag: !0,
3163
- columnFlag: true,
3163
+ columnFlag: false,
3164
3164
  formItemFlag: !1,
3165
3165
  options: {
3166
3166
  name: "",
@@ -3188,7 +3188,7 @@ export const advancedFields = [
3188
3188
 
3189
3189
  printDetailButtonFlag:1,
3190
3190
  printItems: [],
3191
- printCustomCondition: "",
3191
+ printCustomCondition: "return {\n id:[dataId]\n}",
3192
3192
 
3193
3193
  showRuleFlag: 1,
3194
3194
  showRuleEnabled: 1,
@@ -71,8 +71,8 @@ export default {
71
71
  "import_button": "导入按钮",
72
72
  "import-button": "导入按钮",
73
73
  "import2-button": "明细导入按钮",
74
- "print-button": "导出/打印按钮",
75
- "print-detail-button": "明细导出/打印按钮",
74
+ "print-button": "导出/打印(列表)",
75
+ "print-detail-button": "导出/打印(详情)",
76
76
  "copy_button": "复制按钮",
77
77
  "rich-editor": "富文本",
78
78
  cascader: "级联选择",
@@ -147,7 +147,7 @@
147
147
  <i class="el-icon-caret-right" v-if="router1.children.length > 0" />
148
148
  </el-menu-item>
149
149
  </el-submenu>
150
- <el-submenu @click.native="openCreateCompanyDialog" v-if="isFormDev">
150
+ <el-submenu @click.native="openCreateCompanyDialog" index="xx" v-if="isFormDev">
151
151
  <template slot="title">
152
152
  <i :class="getMenuClass({}, 1)"></i>
153
153
  <span>新建企业</span>