cloud-web-corejs 1.0.54-dev.95 → 1.0.54-dev.98

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 (16) hide show
  1. package/package.json +1 -1
  2. package/src/components/fileLibrary/filterDialog.vue +79 -134
  3. package/src/components/wf/wf.js +1737 -1
  4. package/src/components/wf/wfUtil.js +278 -1
  5. package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js +989 -1
  6. package/src/components/xform/form-designer/form-widget/field-widget/project-tag-widget.vue +26 -2
  7. package/src/components/xform/form-designer/indexMixin.js +864 -1
  8. package/src/components/xform/form-designer/setting-panel/form-setting.vue +3 -0
  9. package/src/components/xform/form-designer/setting-panel/indexMixin.js +322 -1
  10. package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin.js +2 -2
  11. package/src/components/xform/form-designer/setting-panel/property-editor/field-button/search-dialog-event-editor.vue +20 -1
  12. package/src/components/xform/form-designer/setting-panel/property-editor/project-tag-editor.vue +66 -0
  13. package/src/components/xform/form-designer/setting-panel/property-editor/wfFlag-editor.vue +161 -16
  14. package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +4 -3
  15. package/src/components/xform/form-render/indexMixin.js +15 -4
  16. package/src/components/xform/utils/emitter.js +4 -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.95",
4
+ "version": "1.0.54-dev.98",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
package/src/components/fileLibrary/filterDialog.vue CHANGED
@@ -14,10 +14,38 @@
14
14
  >
15
15
  <div class="cont">
16
16
  <div id="containt" style="height:550px">
17
- <div class="tree-box fl" style="width:15%;height:100%;padding: 10px;">
18
- <div class="tit"><b>文件属性</b></div>
19
- <div style="height: calc(100% - 35px);padding-top: 10px;">
20
- <el-form>
17
+ <div class="search-criteria fl" style="width:220px;height:100%;">
18
+ <div class="tit"><i class="iconfont icon-shaixuan"></i><b>搜索条件</b></div>
19
+
20
+ <el-form label-position="top">
21
+ <div style="height:468px;padding-top: 10px;overflow:auto">
22
+ <el-form-item label="文件名">
23
+ <el-input v-model="formData.fileName" size="small" clearable/>
24
+ </el-form-item>
25
+ <!-- <el-form-item label="所属对象描述">
26
+ <base-input-batch v-model="formData.note"/>
27
+ </el-form-item>-->
28
+ <el-form-item label="创建时间">
29
+ <el-date-picker
30
+ v-model="formData.startTime"
31
+ type="date"
32
+ placeholder=""
33
+ size="small"
34
+ clearable
35
+ value-format="yyyy-MM-dd"
36
+ :picker-options="$baseStartPickerOptions(formData.endTime)"
37
+ ></el-date-picker>
38
+ <span>-</span>
39
+ <el-date-picker
40
+ v-model="formData.endTime"
41
+ type="date"
42
+ placeholder=""
43
+ size="small"
44
+ clearable
45
+ value-format="yyyy-MM-dd"
46
+ :picker-options="$baseEndPickerOptions(formData.startTime)"
47
+ ></el-date-picker>
48
+ </el-form-item>
21
49
  <el-form-item label="文件类型">
22
50
  <el-select v-model="fileTypeSn" @change="getAttributeList">
23
51
  <el-option v-for="(item,index) in fileTypes" :key="index" :label="item.fileTypeName"
@@ -27,16 +55,22 @@
27
55
  <el-form-item v-for="(item,index) in fileAttributes" :key="index" :label="item.attributeName">
28
56
  <el-input v-model="item.formValue" clearable></el-input>
29
57
  </el-form-item>
30
- </el-form>
31
- </div>
58
+ </div>
59
+ <el-form-item class="btns">
60
+ <el-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="primary" plain>重置
61
+ </el-button>
62
+ <el-button type="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
63
+ </el-button>
64
+ </el-form-item>
65
+ </el-form>
32
66
  </div>
33
- <label id="labBtn" class="labBtn1">
34
- <div class="icon">
35
- <i class="el-icon-more"></i>
36
- <i class="el-icon-more"></i>
37
- </div>
67
+ <label id="labBtn" class="labBtn1" style="cursor:unset;height: 100%;">
68
+ <!-- <div class="icon">
69
+ <i class="el-icon-more"></i>
70
+ <i class="el-icon-more"></i>
71
+ </div>-->
38
72
  </label>
39
- <div class="main-right fr" style="width:85%;padding-left: 6px;">
73
+ <div class="main-right fr" style="width:calc(100% - 220px);padding-left: 6px;">
40
74
  <div style="height:100%">
41
75
  <vxe-grid
42
76
  ref="table-m1"
@@ -46,55 +80,36 @@
46
80
  >
47
81
  <template #form>
48
82
  <div class="clearfix screen-btns">
49
- <div class="fl">
50
-
83
+ <div class="fl screen-breadcrumb">
84
+ <el-breadcrumb separator-class="el-icon-arrow-right ">
85
+ <el-breadcrumb-item><i class="iconfont icon-dingwei-mianxing"></i><span class="f-blue"
86
+ @click="checkTreeNode()">搜索范围</span>
87
+ </el-breadcrumb-item>
88
+ <el-breadcrumb-item v-for="(treeNode,index) in treeNodeArr" :key="index">
89
+ <span class="f-blue" @click="checkTreeNode(treeNode)">{{ treeNode.label }}</span>
90
+ </el-breadcrumb-item>
91
+ </el-breadcrumb>
51
92
  </div>
52
93
  <div class="fr">
53
- <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text"
54
- status="primary"
55
- plain>重置
56
- </vxe-button>
57
- <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
58
- </vxe-button>
94
+ <!-- <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text"
95
+ status="primary"
96
+ plain>重置
97
+ </vxe-button>
98
+ <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
99
+ </vxe-button>-->
59
100
  </div>
60
101
  </div>
61
- <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData"
62
- @submit="searchEvent"
63
- @reset="resetEvent">
64
- <vxe-form-item title="文件名:" field="fileName">
65
- <template v-slot>
66
- <el-input v-model="formData.fileName" size="small" clearable/>
67
- </template>
68
- </vxe-form-item>
69
- <vxe-form-item title="所属对象描述:" field="note">
70
- <template v-slot>
71
- <base-input-batch v-model="formData.note"/>
72
- </template>
73
- </vxe-form-item>
74
- <vxe-form-item title="创建时间:">
75
- <template v-slot>
76
- <el-date-picker
77
- v-model="formData.startTime"
78
- type="date"
79
- placeholder=""
80
- size="small"
81
- clearable
82
- value-format="yyyy-MM-dd"
83
- :picker-options="$baseStartPickerOptions(formData.endTime)"
84
- ></el-date-picker>
85
- <span>-</span>
86
- <el-date-picker
87
- v-model="formData.endTime"
88
- type="date"
89
- placeholder=""
90
- size="small"
91
- clearable
92
- value-format="yyyy-MM-dd"
93
- :picker-options="$baseEndPickerOptions(formData.startTime)"
94
- ></el-date-picker>
95
- </template>
96
- </vxe-form-item>
97
- </vxe-form>
102
+ </template>
103
+ <template #fileName="{row}">
104
+ <div>
105
+ <el-tooltip :enterable="false" effect="dark" :content="$t2('预览', 'components.fileLibrary.preview')"
106
+ placement="top">
107
+ <a class="a-link img" @click="$baseFilePreview(row)">
108
+ <el-image :src="getShowUrl(row,'thumbnail')"></el-image>
109
+ </a>
110
+ </el-tooltip>
111
+ <a class="a-link underLine" @click="$baseFilePreview(row)">{{ row.fileName }}</a>
112
+ </div>
98
113
  </template>
99
114
  </vxe-grid>
100
115
  </div>
@@ -108,6 +123,7 @@
108
123
  import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
109
124
 
110
125
  import {treeScollx, treeScolly} from '@base/utils/global.js';
126
+ import {encode} from "js-base64";
111
127
 
112
128
  export default {
113
129
  name: 'productDialog',
@@ -116,10 +132,10 @@ export default {
116
132
  inject: ['current_prefix', 'storeAreaCode', 'getObjectForeignId', 'getIsPrivate'],
117
133
  created() {
118
134
  this.initSetting({treeScolly: false});
119
- setTimeout(() => {
135
+ /*setTimeout(() => {
120
136
  treeScollx({target: this, type: 'default', dragBtn: '.labBtn1'});
121
137
  treeScolly({target: this, type: 'selectDialog', dragBtn: '.labBtn2'});
122
- }, 200);
138
+ }, 200);*/
123
139
 
124
140
  },
125
141
  mounted() {
@@ -184,77 +200,7 @@ export default {
184
200
  width: 250,
185
201
  fixed: "left",
186
202
  slots: {
187
- default: ({row, $rowIndex}) => {
188
- let h = this.$createElement;
189
- if (!row.dirs) {
190
- let showUrl = that.getShowUrl(row, "thumbnail");
191
- return [
192
- h(
193
- "a",
194
- {
195
- staticClass: "a-link img",
196
- on: {
197
- click: (event) => {
198
- event.stopPropagation();
199
- that.$baseFilePreview(row);
200
- },
201
- },
202
- },
203
- [
204
- h(
205
- "el-tooltip",
206
- {
207
- props: {
208
- enterable: false,
209
- effect: "dark",
210
- content: this.$t2('预览', 'components.fileLibrary.preview'),
211
- placement: "top",
212
- "popper-class": "tooltip-skin",
213
- },
214
- },
215
- [
216
- h("el-image", {
217
- props: {
218
- src: showUrl,
219
- },
220
- }),
221
- ]
222
- ),
223
- ]
224
- ),
225
- h("span", row.fileName),
226
- ];
227
- } else {
228
- return [
229
- h(
230
- "a",
231
- {
232
- staticClass: "a-link img",
233
- on: {
234
- click: (event) => {
235
- event.stopPropagation();
236
- that.changeCategory(row);
237
- },
238
- },
239
- },
240
- [
241
- h(
242
- "div",
243
- {
244
- staticClass: "img",
245
- },
246
- [
247
- h("svg-icon", {
248
- props: {"icon-class": "ico-wenjianjia"},
249
- }),
250
- h("span", row.fileName),
251
- ]
252
- ),
253
- ]
254
- ),
255
- ];
256
- }
257
- },
203
+ default: 'fileName'
258
204
  },
259
205
  },
260
206
  {
@@ -325,7 +271,7 @@ export default {
325
271
  >
326
272
  <el-tooltip enterable={false} effect="dark" content={this.$t1('在文件夹中显示')} placement="top"
327
273
  popper-class="tooltip-skin">
328
- <i class="el-icon-edit"/>
274
+ <i class="el-icon-view"/>
329
275
  </el-tooltip>
330
276
  </a>
331
277
  </div>
@@ -378,9 +324,7 @@ export default {
378
324
  },
379
325
  clearFileAttributeFormValue() {
380
326
  this.fileTypeSn = null;
381
- this.fileAttributes.forEach(item => {
382
- item.formValue = null;
383
- })
327
+ this.fileAttributes = [];
384
328
  },
385
329
  getFileTypeList() {
386
330
  this.$http({
@@ -415,6 +359,7 @@ export default {
415
359
  });
416
360
  },
417
361
 
362
+
418
363
  }
419
364
  };
420
365
  </script>