cloud-web-corejs 1.0.54-dev.743 → 1.0.54-dev.745

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 (21) hide show
  1. package/package.json +1 -1
  2. package/src/components/fileLibrary/categoryMoveDialog.vue +1 -1
  3. package/src/components/fileLibrary/fileObjAuthDialog.vue +171 -172
  4. package/src/components/fileLibrary/index.vue +57 -58
  5. package/src/components/fileLibrary/propertiesDialog.vue +1 -1
  6. package/src/components/fileLibrary/recycleBinDialog.vue +50 -49
  7. package/src/components/xform/form-designer/form-widget/dialog/baseFormulaDialog copy.vue +971 -0
  8. package/src/components/xform/form-designer/form-widget/dialog/vabSearchDialog.vue +408 -0
  9. package/src/components/xform/form-designer/index.vue +2 -2
  10. package/src/components/xform/form-designer/indexMixin.js +2 -2
  11. package/src/components/xform/form-designer/setting-panel/index.vue +2 -3
  12. package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/columnRenderDialog.vue +16 -16
  13. package/src/components/xform/form-designer/widget-panel/index.vue +36 -17
  14. package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +21 -21
  15. package/src/components/xform/utils/formHttp.js +162 -0
  16. package/src/layout/components/AppMain.vue +5 -2
  17. package/src/layout/components/extractedCode/viewDialog.vue +2 -2
  18. package/src/views/bd/setting/formVersion/ftHistoryDialog.vue +1 -9
  19. package/src/views/bd/setting/form_template/formDesignerDialog.vue +21 -21
  20. package/src/views/bd/setting/form_template/wfObjConfigDialog.vue +43 -44
  21. package/src/views/user/wf/wfReport/index.vue +10 -4
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.54-dev.743",
4
+ "version": "1.0.54-dev.745",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
package/src/components/fileLibrary/categoryMoveDialog.vue CHANGED
@@ -44,7 +44,7 @@
44
44
  </div>
45
45
  </label>
46
46
 
47
- <div class="multipleChoice nextDom" style="margin-top:8px;">
47
+ <div class="multipleChoice nextDom">
48
48
  <el-breadcrumb separator-class="el-icon-arrow-right">
49
49
  <i class="position el-icon-map-location"></i>
50
50
  <el-breadcrumb-item v-for="(treeNode,index) in treeNodeArr" :key="index" @click.native="doNav(treeNode)">{{
package/src/components/fileLibrary/fileObjAuthDialog.vue CHANGED
@@ -13,181 +13,180 @@
13
13
  v-el-drag-dialog
14
14
  v-el-dialog-center
15
15
  >
16
- <div class="cont">
17
- <div id="containt">
18
- <el-tabs v-model="activeName" class="tab-box">
19
- <el-tab-pane :label="$t1('用户权限设置')" name="first">
20
- <div class="grid-height" style="height: 500px">
21
- <vxe-grid
22
- class="is-pointer"
23
- ref="table-m1"
24
- :data="tableData"
25
- v-bind="vxeOption"
26
- @resizable-change="$vxeTableUtil.onColumnWitchChange"
27
- @custom="$vxeTableUtil.customHandle"
28
- >
29
- <template #form>
30
- <div class="clearfix screen-btns">
31
- <div class="fl">
32
- <vxe-button
33
- status="primary"
34
- class="button-sty"
35
- icon="el-icon-plus"
36
- @click="openSaleOrgAddDialog"
37
- >
38
- {{ $t1("新增机构") }}
39
- </vxe-button>
40
- <vxe-button
41
- status="primary"
42
- class="button-sty"
43
- icon="el-icon-plus"
44
- @click="openPositionAddDialog"
45
- >
46
- {{ $t1("新增岗位") }}
47
- </vxe-button>
48
- <vxe-button
49
- status="primary"
50
- class="button-sty"
51
- icon="el-icon-plus"
52
- @click="openUserAddDialog"
53
- >
54
- {{ $t1("新增用户") }}
55
- </vxe-button>
56
- <vxe-button
57
- status="primary"
58
- class="button-sty"
59
- icon="el-icon-plus"
60
- @click="openRoleAddDialog"
61
- >
62
- {{ $t1("新增角色") }}
63
- </vxe-button>
64
- <!-- <vxe-button type="text" status="primary" plain class="button-sty" icon="el-icon-delete"
65
- @click="deleteRows()">{{ $t2('删除', 'components.fileLibrary.delete') }}
66
- </vxe-button>-->
67
- </div>
68
- <div class="fl screen-breadcrumb" style="margin-left: 30px">
69
- <span style="font-size: 12px"
70
- >{{
71
- $t2("文件路径", "components.fileLibrary.filePath")
72
- }}：</span
73
- >
74
- <el-breadcrumb separator-class="el-icon-arrow-right">
75
- <el-breadcrumb-item
76
- v-for="(treeNode, index) in treeNodeArr"
77
- :key="index"
78
- >{{ treeNode.label }}
79
- </el-breadcrumb-item>
80
- </el-breadcrumb>
81
- </div>
16
+ <div id="containt">
17
+ <el-tabs v-model="activeName" class="tab-box">
18
+ <el-tab-pane :label="$t1('用户权限设置')" name="first">
19
+ <div class="grid-height" style="height: 500px">
20
+ <vxe-grid
21
+ class="is-pointer"
22
+ ref="table-m1"
23
+ :data="tableData"
24
+ v-bind="vxeOption"
25
+ @resizable-change="$vxeTableUtil.onColumnWitchChange"
26
+ @custom="$vxeTableUtil.customHandle"
27
+ >
28
+ <template #form>
29
+ <div class="clearfix screen-btns">
30
+ <div class="fl">
31
+ <vxe-button
32
+ status="primary"
33
+ class="button-sty"
34
+ icon="el-icon-plus"
35
+ @click="openSaleOrgAddDialog"
36
+ >
37
+ {{ $t1("新增机构") }}
38
+ </vxe-button>
39
+ <vxe-button
40
+ status="primary"
41
+ class="button-sty"
42
+ icon="el-icon-plus"
43
+ @click="openPositionAddDialog"
44
+ >
45
+ {{ $t1("新增岗位") }}
46
+ </vxe-button>
47
+ <vxe-button
48
+ status="primary"
49
+ class="button-sty"
50
+ icon="el-icon-plus"
51
+ @click="openUserAddDialog"
52
+ >
53
+ {{ $t1("新增用户") }}
54
+ </vxe-button>
55
+ <vxe-button
56
+ status="primary"
57
+ class="button-sty"
58
+ icon="el-icon-plus"
59
+ @click="openRoleAddDialog"
60
+ >
61
+ {{ $t1("新增角色") }}
62
+ </vxe-button>
63
+ <!-- <vxe-button type="text" status="primary" plain class="button-sty" icon="el-icon-delete"
64
+ @click="deleteRows()">{{ $t2('删除', 'components.fileLibrary.delete') }}
65
+ </vxe-button>-->
82
66
  </div>
83
- </template>
84
- <template #saleOrg="{ row, rowIndex }">
85
- <el-input
86
- class="search-input"
87
- v-model="row.saleOrgName"
88
- clearable
89
- @clear="row.saleOrgId = null"
90
- v-if="!row._isParent"
91
- v-el-readonly
92
- >
93
- <i
94
- slot="suffix"
95
- class="el-input__icon el-icon-search"
96
- @click="openSaleOrgRowDialog(row, rowIndex)"
97
- ></i>
98
- </el-input>
99
- <template v-else>{{ row.saleOrgName }}</template>
100
- </template>
101
- <template #position="{ row, rowIndex }">
102
- <el-input
103
- class="search-input"
104
- v-model="row.positionName"
105
- clearable
106
- @clear="row.positionId = null"
107
- v-if="!row._isParent"
108
- v-el-readonly
109
- >
110
- <i
111
- slot="suffix"
112
- class="el-input__icon el-icon-search"
113
- @click="openPositionRowDialog(row, rowIndex)"
114
- ></i>
115
- </el-input>
116
- <template v-else>{{ row.positionName }}</template>
117
- </template>
118
- <template #role="{ row, rowIndex }">
119
- <el-input
120
- class="search-input"
121
- v-model="row.roleName"
122
- clearable
123
- @clear="row.roleId = null"
124
- v-if="!row._isParent"
125
- v-el-readonly
126
- >
127
- <i
128
- slot="suffix"
129
- class="el-input__icon el-icon-search"
130
- @click="openRoleRowDialog(row, rowIndex)"
131
- ></i>
132
- </el-input>
133
- <template v-else>{{ row.roleName }}</template>
134
- </template>
135
- <template #user="{ row, rowIndex }">
136
- <el-input
137
- class="search-input"
138
- v-model="row.nickName"
139
- clearable
140
- @clear="row.userId = null"
141
- v-if="!row._isParent"
142
- v-el-readonly
143
- >
144
- <i
145
- slot="suffix"
146
- class="el-input__icon el-icon-search"
147
- @click="openUserRowDialog(row, rowIndex)"
148
- ></i>
149
- </el-input>
150
- <template v-else>{{ row.nickName }}</template>
151
- </template>
152
- <template #operate="{ row }">
153
- <a
154
- href="javascript:void(0);"
155
- class="a-link"
156
- @click="openEditDialog(row.id)"
157
- >
158
- <el-tooltip
159
- :enterable="false"
160
- effect="dark"
161
- :content="$t2('查看', 'common.view')"
162
- placement="top"
163
- popper-class="tooltip-skin"
67
+ <div class="fl screen-breadcrumb" style="margin-left: 30px">
68
+ <span style="font-size: 12px"
69
+ >{{
70
+ $t2("文件路径", "components.fileLibrary.filePath")
71
+ }}：</span
164
72
  >
165
- <i class="el-icon-edit" />
166
- </el-tooltip>
167
- </a>
168
- </template>
169
- </vxe-grid>
170
- </div>
171
- </el-tab-pane>
172
- <el-tab-pane
173
- :label="$t1('文件操作，发系统通知')"
174
- name="second"
175
- v-if="fileStoreArea.toNotify"
176
- >
177
- <div class="grid-height" style="height: 500px">
178
- <fileObjNotifyEdit
179
- v-if="showFileObjNotifyEdit"
180
- visible-key="showFileObjNotifyEdit"
181
- :current_prefix="current_prefix"
182
- :_dataId="fileObjId"
183
- :parent-target="_self"
184
- @reload="$reloadHandle"
185
- ></fileObjNotifyEdit>
186
- </div>
187
- </el-tab-pane>
188
- </el-tabs>
189
- </div>
73
+ <el-breadcrumb separator-class="el-icon-arrow-right">
74
+ <el-breadcrumb-item
75
+ v-for="(treeNode, index) in treeNodeArr"
76
+ :key="index"
77
+ >{{ treeNode.label }}
78
+ </el-breadcrumb-item>
79
+ </el-breadcrumb>
80
+ </div>
81
+ </div>
82
+ </template>
83
+ <template #saleOrg="{ row, rowIndex }">
84
+ <el-input
85
+ class="search-input"
86
+ v-model="row.saleOrgName"
87
+ clearable
88
+ @clear="row.saleOrgId = null"
89
+ v-if="!row._isParent"
90
+ v-el-readonly
91
+ >
92
+ <i
93
+ slot="suffix"
94
+ class="el-input__icon el-icon-search"
95
+ @click="openSaleOrgRowDialog(row, rowIndex)"
96
+ ></i>
97
+ </el-input>
98
+ <template v-else>{{ row.saleOrgName }}</template>
99
+ </template>
100
+ <template #position="{ row, rowIndex }">
101
+ <el-input
102
+ class="search-input"
103
+ v-model="row.positionName"
104
+ clearable
105
+ @clear="row.positionId = null"
106
+ v-if="!row._isParent"
107
+ v-el-readonly
108
+ >
109
+ <i
110
+ slot="suffix"
111
+ class="el-input__icon el-icon-search"
112
+ @click="openPositionRowDialog(row, rowIndex)"
113
+ ></i>
114
+ </el-input>
115
+ <template v-else>{{ row.positionName }}</template>
116
+ </template>
117
+ <template #role="{ row, rowIndex }">
118
+ <el-input
119
+ class="search-input"
120
+ v-model="row.roleName"
121
+ clearable
122
+ @clear="row.roleId = null"
123
+ v-if="!row._isParent"
124
+ v-el-readonly
125
+ >
126
+ <i
127
+ slot="suffix"
128
+ class="el-input__icon el-icon-search"
129
+ @click="openRoleRowDialog(row, rowIndex)"
130
+ ></i>
131
+ </el-input>
132
+ <template v-else>{{ row.roleName }}</template>
133
+ </template>
134
+ <template #user="{ row, rowIndex }">
135
+ <el-input
136
+ class="search-input"
137
+ v-model="row.nickName"
138
+ clearable
139
+ @clear="row.userId = null"
140
+ v-if="!row._isParent"
141
+ v-el-readonly
142
+ >
143
+ <i
144
+ slot="suffix"
145
+ class="el-input__icon el-icon-search"
146
+ @click="openUserRowDialog(row, rowIndex)"
147
+ ></i>
148
+ </el-input>
149
+ <template v-else>{{ row.nickName }}</template>
150
+ </template>
151
+ <template #operate="{ row }">
152
+ <a
153
+ href="javascript:void(0);"
154
+ class="a-link"
155
+ @click="openEditDialog(row.id)"
156
+ >
157
+ <el-tooltip
158
+ :enterable="false"
159
+ effect="dark"
160
+ :content="$t2('查看', 'common.view')"
161
+ placement="top"
162
+ popper-class="tooltip-skin"
163
+ >
164
+ <i class="el-icon-edit" />
165
+ </el-tooltip>
166
+ </a>
167
+ </template>
168
+ </vxe-grid>
169
+ </div>
170
+ </el-tab-pane>
171
+ <el-tab-pane
172
+ :label="$t1('文件操作，发系统通知')"
173
+ name="second"
174
+ v-if="fileStoreArea.toNotify"
175
+ >
176
+ <div class="grid-height" style="height: 500px">
177
+ <fileObjNotifyEdit
178
+ v-if="showFileObjNotifyEdit"
179
+ visible-key="showFileObjNotifyEdit"
180
+ :current_prefix="current_prefix"
181
+ :_dataId="fileObjId"
182
+ :parent-target="_self"
183
+ @reload="$reloadHandle"
184
+ ></fileObjNotifyEdit>
185
+ </div>
186
+ </el-tab-pane>
187
+ </el-tabs>
190
188
  </div>
189
+
191
190
  <span slot="footer" class="dialog-footer">
192
191
  <el-button type="primary" plain class="button-sty" @click="dialogClose">
193
192
  <i class="el-icon-close el-icon"></i>
package/src/components/fileLibrary/index.vue CHANGED
@@ -1,6 +1,6 @@
1
1
  <template>
2
- <div v-show="title != '' && title != null" style="overflow: hidden">
3
- <div class="tree-box tree-annex fl">
2
+ <div v-show="title != '' && title != null" style="overflow: hidden;height:100%;display:flex">
3
+ <div class="tree-box tree-annex">
4
4
  <div class="tit">
5
5
  <b>{{ title }}</b>
6
6
  </div>
@@ -88,7 +88,7 @@
88
88
  <i class="el-icon-more"></i>
89
89
  </div>
90
90
  </label>
91
- <div class="main-right file-library fr" style="overflow: hidden">
91
+ <div class="main-right file-library" style="overflow: hidden">
92
92
  <div class="pop-annex-filter" v-if="popAnnexFilter">
93
93
  <div
94
94
  class="item"
@@ -581,9 +581,8 @@
581
581
  </div>
582
582
  </div>
583
583
  </div>
584
- <div class="annex-grid-height">
584
+ <div class="annex-grid-height" v-show="showType === 2">
585
585
  <vxe-grid
586
- v-show="showType === 2"
587
586
  ref="table-m1"
588
587
  v-bind="vxeOption"
589
588
  :data="page.records"
@@ -1024,9 +1023,9 @@ export default {
1024
1023
  };
1025
1024
  </script>
1026
1025
  <style lang="scss" scoped>
1027
- #labBtn {
1028
- height: calc(100vh - 32px);
1029
- }
1026
+ // #labBtn {
1027
+ // height: calc(100vh - 32px);
1028
+ // }
1030
1029
 
1031
1030
  #containt {
1032
1031
  overflow: hidden;
@@ -1044,67 +1043,67 @@ export default {
1044
1043
  display: inline-block;
1045
1044
  }
1046
1045
 
1047
- .vxe-grid .vxe-gird-block {
1048
- height: calc(100vh - 161px);
1049
- }
1046
+ // .vxe-grid .vxe-gird-block {
1047
+ // height: calc(100vh - 161px);
1048
+ // }
1050
1049
 
1051
- .grid-height.viewBox {
1052
- height: calc(100vh - 84px);
1050
+ // .grid-height.viewBox {
1051
+ // height: calc(100vh - 84px);
1053
1052
 
1054
- .containter1 {
1055
- .annex-piclist > .clearfix {
1056
- height: calc(100vh - 159px);
1057
- }
1058
- }
1053
+ // .containter1 {
1054
+ // .annex-piclist > .clearfix {
1055
+ // height: calc(100vh - 159px);
1056
+ // }
1057
+ // }
1059
1058
 
1060
- .annex-grid-height {
1061
- height: calc(100vh - 126px);
1062
- }
1063
- }
1059
+ // .annex-grid-height {
1060
+ // height: calc(100vh - 126px);
1061
+ // }
1062
+ // }
1064
1063
 
1065
- .annex-screen + .line + .annex-crumbs + .grid-height.viewBox {
1066
- height: calc(100vh - 133px);
1064
+ // .annex-screen + .line + .annex-crumbs + .grid-height.viewBox {
1065
+ // height: calc(100vh - 133px);
1067
1066
 
1068
- .containter1 {
1069
- .annex-piclist > .clearfix {
1070
- height: calc(100vh - 208px);
1071
- }
1072
- }
1067
+ // .containter1 {
1068
+ // .annex-piclist > .clearfix {
1069
+ // height: calc(100vh - 208px);
1070
+ // }
1071
+ // }
1073
1072
 
1074
- .annex-grid-height {
1075
- height: calc(100vh - 175px);
1076
- }
1077
- }
1073
+ // .annex-grid-height {
1074
+ // height: calc(100vh - 175px);
1075
+ // }
1076
+ // }
1078
1077
 
1079
- .annex-filter + .annex-crumbs + .grid-height.viewBox {
1080
- height: calc(100vh - 125px);
1078
+ // .annex-filter + .annex-crumbs + .grid-height.viewBox {
1079
+ // height: calc(100vh - 125px);
1081
1080
 
1082
- .containter1 {
1083
- .annex-piclist > .clearfix {
1084
- height: calc(100vh - 200px);
1085
- }
1086
- }
1081
+ // .containter1 {
1082
+ // .annex-piclist > .clearfix {
1083
+ // height: calc(100vh - 200px);
1084
+ // }
1085
+ // }
1087
1086
 
1088
- .annex-grid-height {
1089
- height: calc(100vh - 167px);
1090
- }
1091
- }
1087
+ // .annex-grid-height {
1088
+ // height: calc(100vh - 167px);
1089
+ // }
1090
+ // }
1092
1091
 
1093
- .annex-filter + .annex-screen + .line + .annex-crumbs + .grid-height.viewBox {
1094
- height: calc(100vh - 173px);
1092
+ // .annex-filter + .annex-screen + .line + .annex-crumbs + .grid-height.viewBox {
1093
+ // height: calc(100vh - 173px);
1095
1094
 
1096
- .containter1 {
1097
- .annex-piclist > .clearfix {
1098
- height: calc(100vh - 248px);
1099
- }
1100
- }
1095
+ // .containter1 {
1096
+ // .annex-piclist > .clearfix {
1097
+ // height: calc(100vh - 248px);
1098
+ // }
1099
+ // }
1101
1100
 
1102
- .annex-grid-height {
1103
- height: calc(100vh - 215px);
1104
- }
1105
- }
1101
+ // .annex-grid-height {
1102
+ // height: calc(100vh - 215px);
1103
+ // }
1104
+ // }
1106
1105
 
1107
- #labBtn {
1108
- height: calc(100vh - 34px);
1109
- }
1106
+ // #labBtn {
1107
+ // height: calc(100vh - 34px);
1108
+ // }
1110
1109
  </style>
package/src/components/fileLibrary/propertiesDialog.vue CHANGED
@@ -14,7 +14,7 @@
14
14
  v-el-dialog-center
15
15
  >
16
16
  <div id="containt">
17
- <div class="detail-wrap">
17
+ <div class="detail-wrap" style="height:80vh">
18
18
  <el-form ref="editForm" :model="attachmentDTO">
19
19
  <div class="d-header clearfix">
20
20
  <div class="fl">