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.
package/history.md CHANGED
@@ -239,3 +239,5 @@ mooho-base-admin-plus@2.10.65 - 增加任务批量转移功能
239
239
  mooho-base-admin-plus@2.10.66 - 修复Excel表格修改视图后报错的Bug
240
240
  mooho-base-admin-plus@2.10.67 - 修复Excel表格文本框编辑的bug
241
241
  mooho-base-admin-plus@2.10.68 - 增加指定节点退回功能
242
+ mooho-base-admin-plus@2.10.69 - Excel表格弹出选择框每次弹出时重置筛选条件
243
+ mooho-base-admin-plus@2.10.70 - 修复Excel表格只读文本可编辑的bug
@@ -40429,6 +40429,14 @@ const modalForm = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["render", _sfc_rend
40429
40429
  // 选中项变化事件
40430
40430
  onSelectChange() {
40431
40431
  this.$emit("on-select-change");
40432
+ },
40433
+ /**
40434
+ * 重置筛选
40435
+ *
40436
+ * @public
40437
+ */
40438
+ resetFilter() {
40439
+ this.$refs.table.resetFilter();
40432
40440
  }
40433
40441
  }
40434
40442
  }, _hoisted_1$k = { class: "title" }, _hoisted_2$f = { class: "description" }, _hoisted_3$d = { class: "ivu-ml-8 ivu-mr-8" };
@@ -103882,7 +103890,7 @@ const _sfc_main$o = {
103882
103890
  if (this.coords = r, a.detail === 2 && r.row >= 0 && !this.readonly && !this.$refs.table.hotInstance.getCellMeta(r.row, r.col).readOnly) {
103883
103891
  let s = this.hotSetting.columns[r.col];
103884
103892
  s.controlType === "DialogSelect" && !s.readonly && this.$refs.dialogTable.init(s.source, () => {
103885
- this.$refs.dialogTable.open(this.getParam(this.staticData[r.row], s, this.parentData));
103893
+ this.$refs.dialogTable.open(this.getParam(this.staticData[r.row], s, this.parentData)), this.$refs.dialogTable.resetFilter();
103886
103894
  });
103887
103895
  }
103888
103896
  });
@@ -104230,7 +104238,9 @@ const _sfc_main$o = {
104230
104238
  this.$refs.table.hotInstance.updateSettings({
104231
104239
  cells: (a, r, o) => {
104232
104240
  let s = this.columns.find((u) => u.code == o), l = s.isShow, c = s.isReadonly;
104233
- if ((s.readonlyJson || "").trim()) {
104241
+ if (s.controlType == "Label")
104242
+ c = !0;
104243
+ else if ((s.readonlyJson || "").trim()) {
104234
104244
  let u = JSON.parse(s.readonlyJson);
104235
104245
  (u.type == "Condition" || u.type == "Expression") && (c = this.judgeCondition(u, this.staticData[a]));
104236
104246
  }