mooho-base-admin-plus 2.10.6 → 2.10.8

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 (5) hide show
  1. package/history.md +2 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +2775 -2743
  3. package/package/mooho-base-admin-plus.min.js +46 -46
  4. package/package.json +1 -1
  5. package/src/components/workflow/task-form.vue +30 -8
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "mooho-base-admin-plus",
3
3
  "description": "MOOHO basic framework for admin by Vue3",
4
- "version": "2.10.6",
4
+ "version": "2.10.8",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/src/components/workflow/task-form.vue CHANGED
@@ -1,6 +1,15 @@
1
1
  <template>
2
2
  <div>
3
- <Modal v-model="opened" scrollable :mask-closable="layout.maskClosable" :draggable="layout.draggable" :sticky="true" :reset-drag-position="true" :width="width">
3
+ <Modal
4
+ v-model="opened"
5
+ scrollable
6
+ :fullscreen="isFullscreen"
7
+ :mask-closable="layout.maskClosable"
8
+ :draggable="layout.draggable"
9
+ :sticky="true"
10
+ :reset-drag-position="true"
11
+ :width="width"
12
+ >
4
13
  <template #header>
5
14
  <div>
6
15
  <!--
@@ -12,6 +21,13 @@
12
21
  </slot>
13
22
  </div>
14
23
  </template>
24
+ <template #close>
25
+ <div @click.stop>
26
+ <Icon v-if="!isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click="isFullscreen = !isFullscreen" />
27
+ <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click="isFullscreen = !isFullscreen" />
28
+ <Icon type="ios-close" @click="opened = false" />
29
+ </div>
30
+ </template>
15
31
  <div class="ivu-ml-8 ivu-mr-8">
16
32
  <view-form v-if="!isCustom" ref="form" :readonly="readonly"></view-form>
17
33
  <component v-if="isCustom" ref="customComponent" :is="customComponent" :readonly="readonly" @on-ready="customComponentReady"></component>
@@ -104,7 +120,8 @@
104
120
  name: null,
105
121
  description: null,
106
122
  customComponent: null,
107
- form: null
123
+ form: null,
124
+ isFullscreen: false
108
125
  };
109
126
  },
110
127
  async created() {},
@@ -233,15 +250,20 @@
233
250
  // 执行结果
234
251
  async action(outcome) {
235
252
  let isOK;
236
- if (this.isCustom && typeof this.$refs.customComponent.actionValidation === 'function') {
237
- isOK = await this.$refs.customComponent.actionValidation(outcome);
238
253
 
239
- if (!isOK) {
240
- return;
254
+ if (outcome.ignoreValidation == true) {
255
+ isOK = true;
256
+ } else {
257
+ if (this.isCustom && typeof this.$refs.customComponent.actionValidation === 'function') {
258
+ isOK = await this.$refs.customComponent.actionValidation(outcome);
259
+
260
+ if (!isOK) {
261
+ return;
262
+ }
241
263
  }
242
- }
243
264
 
244
- isOK = await this.form.validate();
265
+ isOK = await this.form.validate();
266
+ }
245
267
 
246
268
  if (!isOK) {
247
269
  this.error('Front_Msg_Form_Validate_Fail');