mooho-base-admin-plus 2.2.8 → 2.2.10

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 (11) hide show
  1. package/history.md +2 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +25 -19
  3. package/package/mooho-base-admin-plus.min.js +5 -5
  4. package/package.json +1 -1
  5. package/src/components/upload/upload-attachment.vue +9 -1
  6. package/src/components/upload/upload-image.vue +23 -1
  7. package/src/components/view/column-edit.vue +1 -1
  8. package/src/components/view/table-filter.vue +2 -1
  9. package/src/components/view/view-form-draggable.vue +3 -2
  10. package/src/components/view/view-form.vue +4 -2
  11. package/src/components/view/view-table.vue +4 -3
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.2.8",
4
+ "version": "2.2.10",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/src/components/upload/upload-attachment.vue CHANGED
@@ -9,7 +9,15 @@
9
9
  :on-preview="onUploadPreview"
10
10
  :on-remove="onUploadRemove"
11
11
  :disabled="readonly"
12
- :accept="accept"
12
+ :accept="
13
+ !!(accept || '').trim()
14
+ ? accept
15
+ .split(',')
16
+ .map(item => '.' + item.replaceAll('.', ''))
17
+ .join(',')
18
+ : null
19
+ "
20
+ :format="!!(accept || '').trim() ? accept.split(',').map(item => item.replaceAll('.', '')) : null"
13
21
  :multiple="true"
14
22
  :type="draggable ? 'drag' : 'select'"
15
23
  >
package/src/components/upload/upload-image.vue CHANGED
@@ -16,7 +16,23 @@
16
16
  <Icon custom="fa fa-download" @click="downloadImage(item)"></Icon>
17
17
  </div>
18
18
  </div>
19
- <Upload v-if="!readonly" accept="image/*" :action="uploadURL" :headers="uploadHeaders" :show-upload-list="false" :before-upload="beforeUpload" :on-success="onUploadSuccess">
19
+ <Upload
20
+ v-if="!readonly"
21
+ :accept="
22
+ !!(accept || '').trim()
23
+ ? accept
24
+ .split(',')
25
+ .map(item => '.' + item.replaceAll('.', ''))
26
+ .join(',')
27
+ : 'image/*'
28
+ "
29
+ :format="!!(accept || '').trim() ? accept.split(',').map(item => item.replaceAll('.', '')) : null"
30
+ :action="uploadURL"
31
+ :headers="uploadHeaders"
32
+ :show-upload-list="false"
33
+ :before-upload="beforeUpload"
34
+ :on-success="onUploadSuccess"
35
+ >
20
36
  <div
21
37
  class="form-image"
22
38
  v-if="fileList.length < maxCount || maxCount == null"
@@ -71,6 +87,12 @@
71
87
  // 图片高度
72
88
  height: {
73
89
  type: Number
90
+ },
91
+ /**
92
+ * 允许的文件类型
93
+ */
94
+ accept: {
95
+ type: String
74
96
  }
75
97
  },
76
98
  computed: {
package/src/components/view/column-edit.vue CHANGED
@@ -442,7 +442,7 @@
442
442
  <Input type="text" v-model="data.pattern" maxlength="100" />
443
443
  </FormItem>
444
444
  </Col>
445
- <Col v-bind="grid8" v-if="data.controlType == 'Attachment'">
445
+ <Col v-bind="grid8" v-if="data.controlType == 'Attachment' || data.controlType == 'Image'">
446
446
  <FormItem label="接受的文件类型" key="pattern" prop="pattern">
447
447
  <Input type="text" v-model="data.pattern" maxlength="100" />
448
448
  </FormItem>
package/src/components/view/table-filter.vue CHANGED
@@ -380,7 +380,7 @@
380
380
 
381
381
  this.columns
382
382
  .filter(column => {
383
- return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim();
383
+ return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
384
384
  })
385
385
  .forEach(column => {
386
386
  let param = JSON.parse(column.param);
@@ -556,6 +556,7 @@
556
556
  if (
557
557
  !column.isStaticItem &&
558
558
  !!(column.source || '').trim() &&
559
+ !column.dataType.startsWith('Enum:') &&
559
560
  (sender == null ||
560
561
  sender.triggers.some(item => {
561
562
  return item.id === column.id;
package/src/components/view/view-form-draggable.vue CHANGED
@@ -610,7 +610,7 @@
610
610
  // 数据源中包含变量需要刷新
611
611
  this.columns
612
612
  .filter(column => {
613
- return !!(column.source || '').trim() && !!(column.param || '').trim();
613
+ return !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
614
614
  })
615
615
  .forEach(column => {
616
616
  let param = JSON.parse(column.param);
@@ -756,6 +756,7 @@
756
756
  this.columns.forEach(function (column) {
757
757
  if (
758
758
  !!(column.source || '').trim() &&
759
+ !column.dataType.startsWith('Enum:') &&
759
760
  (sender == null ||
760
761
  sender.triggers.some(item => {
761
762
  return item.id === column.id;
@@ -784,7 +785,7 @@
784
785
  column.triggers.forEach(item => {
785
786
  item.needClear = true;
786
787
  });
787
- } else if (column.needRefresh && !!(column.source || '').trim()) {
788
+ } else if (column.needRefresh && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
788
789
  let param = this.getParam(this.data, column);
789
790
 
790
791
  if (
package/src/components/view/view-form.vue CHANGED
@@ -420,6 +420,7 @@
420
420
  :maxCount="column.maxLength"
421
421
  :height="column.controlHeight"
422
422
  :width="column.controlWidth"
423
+ :accept="column.pattern"
423
424
  />
424
425
  </template>
425
426
  <template v-else-if="column.controlType === 'Slider'">
@@ -1010,7 +1011,7 @@
1010
1011
  // 数据源中包含变量需要刷新
1011
1012
  this.columns
1012
1013
  .filter(column => {
1013
- return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim();
1014
+ return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
1014
1015
  })
1015
1016
  .forEach(column => {
1016
1017
  let param = JSON.parse(column.param);
@@ -1332,6 +1333,7 @@
1332
1333
  if (
1333
1334
  !column.isStaticItem &&
1334
1335
  !!(column.source || '').trim() &&
1336
+ !column.dataType.startsWith('Enum:') &&
1335
1337
  (sender == null ||
1336
1338
  sender.triggers.some(item => {
1337
1339
  return item.code == column.code;
@@ -1364,7 +1366,7 @@
1364
1366
  column.triggers.forEach(item => {
1365
1367
  item.needClear = true;
1366
1368
  });
1367
- } else if (column.needRefresh && !!(column.source || '').trim()) {
1369
+ } else if (column.needRefresh && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
1368
1370
  let param = this.getParam(this.data, column);
1369
1371
 
1370
1372
  if (
package/src/components/view/view-table.vue CHANGED
@@ -1668,7 +1668,7 @@
1668
1668
 
1669
1669
  //this.$forceUpdate();
1670
1670
  } else {
1671
- if (!!(column.source || '').trim()) {
1671
+ if (!!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
1672
1672
  this.data.forEach(row => {
1673
1673
  if (row._dataSource && row._dataSource[column.code]) {
1674
1674
  return;
@@ -1696,7 +1696,7 @@
1696
1696
  // 数据源中包含变量需要刷新
1697
1697
  this.columns
1698
1698
  .filter(column => {
1699
- return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim();
1699
+ return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
1700
1700
  })
1701
1701
  .forEach(column => {
1702
1702
  let param = JSON.parse(column.param);
@@ -1910,6 +1910,7 @@
1910
1910
  if (
1911
1911
  !column.isStaticItem &&
1912
1912
  !!(column.source || '').trim() &&
1913
+ !column.dataType.startsWith('Enum:') &&
1913
1914
  (sender == null ||
1914
1915
  sender.triggers.some(item => {
1915
1916
  return item.code == column.code;
@@ -1940,7 +1941,7 @@
1940
1941
  column.triggers.forEach(item => {
1941
1942
  data._needClear[item.code] = true;
1942
1943
  });
1943
- } else if (data._needRefresh[column.code] && !!(column.source || '').trim()) {
1944
+ } else if (data._needRefresh[column.code] && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
1944
1945
  let param = this.getParam(data, column, this.parentData);
1945
1946
 
1946
1947
  if (