mooho-base-admin-plus 2.4.13 → 2.4.15

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 (7) hide show
  1. package/history.md +2 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +12 -11
  3. package/package/mooho-base-admin-plus.min.js +8 -8
  4. package/package.json +1 -1
  5. package/src/api/customModel.js +4 -4
  6. package/src/mixins/page.js +3 -3
  7. package/src/pages/template/processPage.vue +8 -9
package/history.md CHANGED
@@ -45,3 +45,5 @@
45
45
  2.4.11 - 增加 string 类型时间戳显示支持
46
46
  2.4.12 - 增加 string 类型时间戳显示支持 bug 修复
47
47
  2.4.13 - 增加 string 类型时间戳显示支持 bug 修复
48
+ 2.4.14 - 修复草稿状态下点击历史显示所有的问题
49
+ 2.4.15 - 修复自定义模型表格导出和打印的 bug
package/package/mooho-base-admin-plus.min.esm.js CHANGED
@@ -23014,7 +23014,7 @@ var mixinPage = {
23014
23014
  try {
23015
23015
  result2 = format$3(new Date(value * 1e3), format2);
23016
23016
  } catch (e3) {
23017
- console.log(e3);
23017
+ console.log(e3, value);
23018
23018
  }
23019
23019
  return result2;
23020
23020
  } else {
@@ -23052,7 +23052,7 @@ var mixinPage = {
23052
23052
  let array = JSON.parse(value);
23053
23053
  result2 = array.join(", ");
23054
23054
  } catch (e3) {
23055
- console.log(e3);
23055
+ console.log(e3, value);
23056
23056
  }
23057
23057
  return result2;
23058
23058
  } else if (!!(format2 || "").trim()) {
@@ -23060,7 +23060,7 @@ var mixinPage = {
23060
23060
  try {
23061
23061
  result2 = format$3(new Date(parseInt(value) * 1e3), format2);
23062
23062
  } catch (e3) {
23063
- console.log(e3);
23063
+ console.log(e3, value);
23064
23064
  }
23065
23065
  return result2;
23066
23066
  } else {
@@ -24273,14 +24273,14 @@ var customModelApi = {
24273
24273
  if (tableView2.isGroupBy) {
24274
24274
  data2.groupColumn = JSON.parse(tableView2.groupColumn);
24275
24275
  data2.groupMethod = JSON.parse(tableView2.groupMethod);
24276
- await service({
24276
+ result2 = await service({
24277
24277
  url: `api/${res$h}/group`,
24278
24278
  method: "post",
24279
24279
  responseType: "blob",
24280
24280
  data: data2
24281
24281
  });
24282
24282
  } else {
24283
- await service({
24283
+ result2 = await service({
24284
24284
  url: `api/${res$h}/query`,
24285
24285
  method: "post",
24286
24286
  responseType: "blob",
@@ -24304,14 +24304,14 @@ var customModelApi = {
24304
24304
  if (tableView2.isGroupBy) {
24305
24305
  data2.groupColumn = JSON.parse(tableView2.groupColumn);
24306
24306
  data2.groupMethod = JSON.parse(tableView2.groupMethod);
24307
- await service({
24307
+ result2 = await service({
24308
24308
  url: `api/${res$h}/group`,
24309
24309
  method: "post",
24310
24310
  responseType: "blob",
24311
24311
  data: data2
24312
24312
  });
24313
24313
  } else {
24314
- await service({
24314
+ result2 = await service({
24315
24315
  url: `api/${res$h}/query`,
24316
24316
  method: "post",
24317
24317
  responseType: "blob",
@@ -34296,7 +34296,7 @@ function _sfc_render$L(_ctx, _cache, $props, $setup, $data, $options) {
34296
34296
  ]),
34297
34297
  _: 1
34298
34298
  }, 8, ["onClick"]),
34299
- _ctx.$refs.form && _ctx.$refs.form.data && _ctx.$refs.form.data.application && _ctx.$refs.form.data.applicationID && (_ctx.$refs.form.data.application.status == "Draft" || _ctx.$refs.form.data.application.status == "Rejected") ? (openBlock(), createBlock(_component_Button, {
34299
+ _ctx.$refs.form && _ctx.$refs.form.data && _ctx.$refs.form.data.application && (_ctx.$refs.form.data.application.status == "Draft" || _ctx.$refs.form.data.application.status == "Rejected") ? (openBlock(), createBlock(_component_Button, {
34300
34300
  key: 0,
34301
34301
  type: "warning",
34302
34302
  "custom-icon": "fa fa-trash-alt",
@@ -34307,7 +34307,7 @@ function _sfc_render$L(_ctx, _cache, $props, $setup, $data, $options) {
34307
34307
  ]),
34308
34308
  _: 1
34309
34309
  }, 8, ["onClick"])) : createCommentVNode("v-if", true),
34310
- _ctx.$refs.form && _ctx.$refs.form.data && _ctx.$refs.form.data.applicationID ? (openBlock(), createBlock(_component_Button, {
34310
+ _ctx.$refs.form && _ctx.$refs.form.data && _ctx.$refs.form.data.application && _ctx.$refs.form.data.application.processInstID ? (openBlock(), createBlock(_component_Button, {
34311
34311
  key: 1,
34312
34312
  type: "info",
34313
34313
  "custom-icon": "fa fa-history",
@@ -34340,7 +34340,8 @@ function _sfc_render$L(_ctx, _cache, $props, $setup, $data, $options) {
34340
34340
  ]),
34341
34341
  _: 1
34342
34342
  })) : createCommentVNode("v-if", true),
34343
- createVNode$1(_component_Button, {
34343
+ _ctx.$refs.showForm && _ctx.$refs.showForm.data && _ctx.$refs.showForm.data.application && _ctx.$refs.showForm.data.application.processInstID ? (openBlock(), createBlock(_component_Button, {
34344
+ key: 1,
34344
34345
  type: "info",
34345
34346
  "custom-icon": "fa fa-history",
34346
34347
  onClick: _cache[3] || (_cache[3] = ($event) => _ctx.$refs.approvalHistoryTable.open({ processInstID: _ctx.$refs.showForm.data.application.processInstID }))
@@ -34349,7 +34350,7 @@ function _sfc_render$L(_ctx, _cache, $props, $setup, $data, $options) {
34349
34350
  createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_History")), 1)
34350
34351
  ]),
34351
34352
  _: 1
34352
- })
34353
+ })) : createCommentVNode("v-if", true)
34353
34354
  ]),
34354
34355
  _: 1
34355
34356
  }, 8, ["readonly"])) : createCommentVNode("v-if", true),