mooho-base-admin-plus 2.4.49 → 2.4.51

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/history.md CHANGED
@@ -81,3 +81,5 @@ mooho-base-admin-plus@2.4.46 - 分页增加直接跳转
81
81
  mooho-base-admin-plus@2.4.47 - 多选可筛选选择框清空内容不重新刷新
82
82
  mooho-base-admin-plus@2.4.48 - 修复弹出选择框多加载一次的bug
83
83
  mooho-base-admin-plus@2.4.49 - 筛选条件增加了日期范围控件支持
84
+ mooho-base-admin-plus@2.4.50 - 静态选项增加bool类型支持,优化表格中的静态选项支持
85
+ mooho-base-admin-plus@2.4.50 - 静态选项bool类型取消false的默认值
@@ -23967,7 +23967,11 @@ const _sfc_main$1k = {
23967
23967
  },
23968
23968
  importFileSuccess(res2) {
23969
23969
  this.end();
23970
- this.$emit("on-success", res2);
23970
+ if (res2.code == 0) {
23971
+ this.$emit("on-success", res2);
23972
+ } else {
23973
+ this.error(res2.message);
23974
+ }
23971
23975
  },
23972
23976
  importFileError(error2) {
23973
23977
  this.end();
@@ -24056,7 +24060,13 @@ const _sfc_main$1j = {
24056
24060
  this.fileList = list;
24057
24061
  this.defaultList = list;
24058
24062
  },
24059
- beforeUpload() {
24063
+ beforeUpload(file) {
24064
+ if (this.maxSize != null) {
24065
+ if (file.size > this.maxSize * 1024 * 1024) {
24066
+ this.error("Front_Msg_Max_Quantity|" + this.maxSize);
24067
+ return false;
24068
+ }
24069
+ }
24060
24070
  if (this.maxCount != null) {
24061
24071
  let list = this.fileList;
24062
24072
  if (list.length >= this.maxCount) {
@@ -34844,27 +34854,27 @@ const _sfc_main$1b = {
34844
34854
  trigger: "blur,change"
34845
34855
  });
34846
34856
  }
34847
- if (column.maxValue != null) {
34857
+ if (column.maxValue != null && (column.controlType == "NumberInput" || column.controlType == "Slider")) {
34848
34858
  rules.push({
34849
34859
  type: this.getDataType(column),
34850
34860
  max: column.maxValue,
34851
- message: this.$t("Front_Msg_Validation_Max_Value|" + column.maxValue),
34861
+ message: this.tParam("Front_Msg_Validation_Max_Value|" + column.maxValue),
34852
34862
  trigger: "blur,change"
34853
34863
  });
34854
34864
  }
34855
- if (column.minValue != null) {
34865
+ if (column.minValue != null && (column.controlType == "NumberInput" || column.controlType == "Slider")) {
34856
34866
  rules.push({
34857
34867
  type: this.getDataType(column),
34858
34868
  min: column.minValue,
34859
- message: this.$t("Front_Msg_Validation_Min_Value|" + column.minValue),
34869
+ message: this.tParam("Front_Msg_Validation_Min_Value|" + column.minValue),
34860
34870
  trigger: "blur,change"
34861
34871
  });
34862
34872
  }
34863
- if (column.maxLength != null) {
34873
+ if (column.maxLength != null && (column.controlType == "TextInput" || column.controlType == "TextArea")) {
34864
34874
  rules.push({
34865
34875
  type: this.getDataType(column),
34866
34876
  length: column.maxLength,
34867
- message: this.$t("Front_Msg_Validation_Max_Length|" + column.maxLength),
34877
+ message: this.tParam("Front_Msg_Validation_Max_Length|" + column.maxLength),
34868
34878
  trigger: "blur,change"
34869
34879
  });
34870
34880
  }
@@ -34939,6 +34949,11 @@ const _sfc_main$1b = {
34939
34949
  id: parseFloat(key),
34940
34950
  name: value
34941
34951
  });
34952
+ } else if (column.dataType == "Boolean") {
34953
+ column.dataSource.push({
34954
+ id: key.toUpperCase() == "TRUE",
34955
+ name: value
34956
+ });
34942
34957
  } else {
34943
34958
  column.dataSource.push({
34944
34959
  id: key,
@@ -34956,6 +34971,11 @@ const _sfc_main$1b = {
34956
34971
  id: parseFloat(item),
34957
34972
  name: item
34958
34973
  });
34974
+ } else if (column.dataType == "Boolean") {
34975
+ column.dataSource.push({
34976
+ id: item.toUpperCase() == "TRUE",
34977
+ name: item
34978
+ });
34959
34979
  } else {
34960
34980
  column.dataSource.push({
34961
34981
  id: item,
@@ -38711,6 +38731,11 @@ const _sfc_main$12 = {
38711
38731
  id: parseFloat(key),
38712
38732
  name: value
38713
38733
  });
38734
+ } else if (column.dataType == "Boolean") {
38735
+ column.dataSource.push({
38736
+ id: key.toUpperCase() == "TRUE",
38737
+ name: value
38738
+ });
38714
38739
  } else {
38715
38740
  column.dataSource.push({
38716
38741
  id: key,
@@ -38728,6 +38753,11 @@ const _sfc_main$12 = {
38728
38753
  id: parseFloat(item),
38729
38754
  name: item
38730
38755
  });
38756
+ } else if (column.dataType == "Boolean") {
38757
+ column.dataSource.push({
38758
+ id: item.toUpperCase() == "TRUE",
38759
+ name: item
38760
+ });
38731
38761
  } else {
38732
38762
  column.dataSource.push({
38733
38763
  id: item,
@@ -40686,7 +40716,7 @@ const _sfc_main$$ = {
40686
40716
  }
40687
40717
  }
40688
40718
  } else {
40689
- if (item.dataType === "Boolean") {
40719
+ if ((item.controlType == "Check" || item.controlType == "Switch") && item.dataType === "Boolean") {
40690
40720
  this.setData(data2, item.code, false);
40691
40721
  } else {
40692
40722
  this.setData(data2, item.code, null);
@@ -40809,7 +40839,7 @@ const _sfc_main$$ = {
40809
40839
  rules.push({
40810
40840
  type: this.getDataType(column),
40811
40841
  max: column.maxValue,
40812
- message: this.$t("Front_Msg_Validation_Max_Value|" + column.maxValue),
40842
+ message: this.tParam("Front_Msg_Validation_Max_Value|" + column.maxValue),
40813
40843
  trigger: "blur,change"
40814
40844
  });
40815
40845
  }
@@ -40817,7 +40847,7 @@ const _sfc_main$$ = {
40817
40847
  rules.push({
40818
40848
  type: this.getDataType(column),
40819
40849
  min: column.minValue,
40820
- message: this.$t("Front_Msg_Validation_Min_Value|" + column.minValue),
40850
+ message: this.tParam("Front_Msg_Validation_Min_Value|" + column.minValue),
40821
40851
  trigger: "blur,change"
40822
40852
  });
40823
40853
  }
@@ -40825,7 +40855,7 @@ const _sfc_main$$ = {
40825
40855
  rules.push({
40826
40856
  type: this.getDataType(column),
40827
40857
  length: column.maxLength,
40828
- message: this.$t("Front_Msg_Validation_Max_Length|" + column.maxLength),
40858
+ message: this.tParam("Front_Msg_Validation_Max_Length|" + column.maxLength),
40829
40859
  trigger: "blur,change"
40830
40860
  });
40831
40861
  }
@@ -40859,6 +40889,11 @@ const _sfc_main$$ = {
40859
40889
  id: parseFloat(key),
40860
40890
  name: value
40861
40891
  });
40892
+ } else if (column.dataType == "Boolean") {
40893
+ column.dataSource.push({
40894
+ id: key.toUpperCase() == "TRUE",
40895
+ name: value
40896
+ });
40862
40897
  } else {
40863
40898
  column.dataSource.push({
40864
40899
  id: key,
@@ -40876,6 +40911,11 @@ const _sfc_main$$ = {
40876
40911
  id: parseFloat(item),
40877
40912
  name: item
40878
40913
  });
40914
+ } else if (column.dataType == "Boolean") {
40915
+ column.dataSource.push({
40916
+ id: item.toUpperCase() == "TRUE",
40917
+ name: item
40918
+ });
40879
40919
  } else {
40880
40920
  column.dataSource.push({
40881
40921
  id: item,
@@ -42626,15 +42666,49 @@ const _sfc_main$_ = {
42626
42666
  if (item.split(":").length > 1) {
42627
42667
  let key = item.split(":")[0];
42628
42668
  let value = item.split(":")[1];
42629
- row._dataSource[column.code].push({
42630
- id: key,
42631
- name: value
42632
- });
42669
+ if (column.dataType == "Integer" || column.dataType == "BigInteger") {
42670
+ row._dataSource[column.code].push({
42671
+ id: parseInt(key),
42672
+ name: value
42673
+ });
42674
+ } else if (column.dataType == "Decimal" || column.dataType == "Float" || column.dataType == "Double") {
42675
+ row._dataSource[column.code].push({
42676
+ id: parseFloat(key),
42677
+ name: value
42678
+ });
42679
+ } else if (column.dataType == "Boolean") {
42680
+ row._dataSource[column.code].push({
42681
+ id: key.toUpperCase() == "TRUE",
42682
+ name: value
42683
+ });
42684
+ } else {
42685
+ row._dataSource[column.code].push({
42686
+ id: key,
42687
+ name: value
42688
+ });
42689
+ }
42633
42690
  } else {
42634
- row._dataSource[column.code].push({
42635
- id: item,
42636
- name: item
42637
- });
42691
+ if (column.dataType == "Integer" || column.dataType == "BigInteger") {
42692
+ row._dataSource[column.code].push({
42693
+ id: parseInt(item),
42694
+ name: item
42695
+ });
42696
+ } else if (column.dataType == "Decimal" || column.dataType == "Float" || column.dataType == "Double") {
42697
+ row._dataSource[column.code].push({
42698
+ id: parseFloat(item),
42699
+ name: item
42700
+ });
42701
+ } else if (column.dataType == "Boolean") {
42702
+ row._dataSource[column.code].push({
42703
+ id: item.toUpperCase() == "TRUE",
42704
+ name: item
42705
+ });
42706
+ } else {
42707
+ row._dataSource[column.code].push({
42708
+ id: item,
42709
+ name: item
42710
+ });
42711
+ }
42638
42712
  }
42639
42713
  }
42640
42714
  });