mooho-base-admin-plus 2.10.68 → 2.10.70

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 (6) hide show
  1. package/history.md +2 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +12 -2
  3. package/package/mooho-base-admin-plus.min.js +2 -2
  4. package/package.json +1 -1
  5. package/src/components/view/modal-table.vue +8 -0
  6. package/src/components/view/view-table-excel.vue +4 -1
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.68",
4
+ "version": "2.10.70",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/src/components/view/modal-table.vue CHANGED
@@ -651,6 +651,14 @@
651
651
  * 数据变化事件
652
652
  */
653
653
  this.$emit('on-select-change');
654
+ },
655
+ /**
656
+ * 重置筛选
657
+ *
658
+ * @public
659
+ */
660
+ resetFilter() {
661
+ this.$refs.table.resetFilter();
654
662
  }
655
663
  }
656
664
  };
package/src/components/view/view-table-excel.vue CHANGED
@@ -111,6 +111,7 @@
111
111
  if (column.controlType === 'DialogSelect' && !column.readonly) {
112
112
  this.$refs.dialogTable.init(column.source, () => {
113
113
  this.$refs.dialogTable.open(this.getParam(this.staticData[coords.row], column, this.parentData));
114
+ this.$refs.dialogTable.resetFilter();
114
115
  });
115
116
  }
116
117
  }
@@ -872,7 +873,9 @@
872
873
  let isReadonly = column.isReadonly;
873
874
 
874
875
  // 判断是否只读
875
- if (!!(column.readonlyJson || '').trim()) {
876
+ if (column.controlType == 'Label') {
877
+ isReadonly = true;
878
+ } else if (!!(column.readonlyJson || '').trim()) {
876
879
  let setting = JSON.parse(column.readonlyJson);
877
880
 
878
881
  if (setting.type == 'Condition' || setting.type == 'Expression') {