mooho-base-admin-plus 2.2.8 → 2.2.9

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.
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.9",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
@@ -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;
@@ -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 (
@@ -1010,7 +1010,7 @@
1010
1010
  // 数据源中包含变量需要刷新
1011
1011
  this.columns
1012
1012
  .filter(column => {
1013
- return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim();
1013
+ return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
1014
1014
  })
1015
1015
  .forEach(column => {
1016
1016
  let param = JSON.parse(column.param);
@@ -1332,6 +1332,7 @@
1332
1332
  if (
1333
1333
  !column.isStaticItem &&
1334
1334
  !!(column.source || '').trim() &&
1335
+ !column.dataType.startsWith('Enum:') &&
1335
1336
  (sender == null ||
1336
1337
  sender.triggers.some(item => {
1337
1338
  return item.code == column.code;
@@ -1364,7 +1365,7 @@
1364
1365
  column.triggers.forEach(item => {
1365
1366
  item.needClear = true;
1366
1367
  });
1367
- } else if (column.needRefresh && !!(column.source || '').trim()) {
1368
+ } else if (column.needRefresh && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
1368
1369
  let param = this.getParam(this.data, column);
1369
1370
 
1370
1371
  if (
@@ -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 (