@ibiz-template/vue3-components 0.7.41-alpha.33 → 0.7.41-alpha.34

package/es/control/app-menu/app-menu.mjs

@@ -1,4 +1,4 @@
-import { isVNode, createVNode, resolveComponent, defineComponent, mergeProps, ref, watch, onUnmounted, computed, onMounted, nextTick } from 'vue';
+import { isVNode, createVNode, resolveComponent, defineComponent, mergeProps, ref, watch, computed, onMounted, nextTick } from 'vue';
 import { RuntimeError, showTitle, findRecursiveChild } from '@ibiz-template/core';
 import { useControlController, useNamespace, route2routePath } from '@ibiz-template/vue3-util';
 import { createUUID } from 'qx-util';
@@ -288,8 +288,6 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
     const defaultActive = ref("");
     const defaultOpens = ref([]);
     const route = useRoute();
-    let counter = null;
-    const counterData = ref({});
     const key = ref(createUUID());
     const menuRef = ref();
     const hasScroll = ref(false);
@@ -338,9 +336,6 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
         }
       });
     }
-    const fn = (data) => {
-      counterData.value = data;
-    };
     c.evt.on("onCreated", async () => {
       saveConfigs.value = c.saveConfigs;
       const defaultActiveMenuItem = c.getDefaultOpenMenuItem();
@@ -361,19 +356,6 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
       }
       hideSeparator.value = formatSeparator("APPMENU", c.model.appMenuItems, c.state.menuItemsState, saveConfigs.value);
     });
-    c.evt.on("onMounted", async () => {
-      const counterRefId = c.model.appCounterRefId;
-      if (counterRefId) {
-        counter = c.getCounter(counterRefId);
-        if (counter) {
-          counter.onChange(fn);
-        }
-      }
-    });
-    onUnmounted(() => {
-      counter == null ? void 0 : counter.offChange(fn);
-      counter == null ? void 0 : counter.destroy();
-    });
     const menuMode = computed(() => {
       const model = c.view.model.mainMenuAlign;
       switch (model) {
@@ -443,7 +425,6 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
       menuRef,
       menuMode,
       hasScroll,
-      counterData,
       saveConfigs,
       defaultOpens,
       defaultActive,
@@ -484,9 +465,9 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
             return this.menus.map((item) => {
               var _a3;
               if (((_a3 = item.children) == null ? void 0 : _a3.length) > 0) {
-                return renderSubmenu(true, item, this.collapse, this.ns, this.c, this.counterData, this.saveConfigs, this.hideSeparator);
+                return renderSubmenu(true, item, this.collapse, this.ns, this.c, this.c.state.counterData, this.saveConfigs, this.hideSeparator);
               }
-              return renderMenuItem(true, item, this.collapse, this.ns, this.c, this.counterData, this.saveConfigs, this.hideSeparator);
+              return renderMenuItem(true, item, this.collapse, this.ns, this.c, this.c.state.counterData, this.saveConfigs, this.hideSeparator);
             });
           }
         }), this.enableCustomized && createVNode(MenuDesign, {

package/es/control/calendar/calendar.mjs

@@ -655,11 +655,12 @@ const CalendarControl = /* @__PURE__ */ defineComponent({
           const model = (_a = this.c.model.sysCalendarItems) == null ? void 0 : _a.find((calendarItems) => {
             return item.itemType === calendarItems.itemType;
           });
+          const temptime = item.beginTime ? dayjs(item.beginTime).format(this.c.timelineCaptionFormat) : item.beginTime;
           return createVNode(resolveComponent("el-timeline-item"), {
             "key": item.id,
             "placement": "top",
             "color": item.bkColor,
-            "timestamp": item.beginTime
+            "timestamp": temptime
           }, {
             default: () => [(model == null ? void 0 : model.layoutPanel) ? renderPanelItem(item, model.layoutPanel) : renderDefaultItem(item)]
           });

package/es/control/tree/tree.mjs

@@ -4,7 +4,6 @@ import { createUUID } from 'qx-util';
 import { cloneDeep, debounce } from 'lodash-es';
 import { TreeController, AppDataEntity, PanelItemEventName } from '@ibiz-template/runtime';
 import { RuntimeError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
 import { getNodeControlPanel, useAppTreeBase, getNewNodeControlPanel, findNodeData, useElTreeUtil, useLoadMoreUtil, findChildItems, formatNodeDropType } from './el-tree-util.mjs';
 import './tree.css';
 
@@ -106,15 +105,8 @@ const TreeControl = /* @__PURE__ */ defineComponent({
     const c = useControlController((...args) => new TreeController(...args));
     useAppTreeBase(c, props);
     const cascadeSelect = ref(false);
-    const counterData = ref({});
     const menuShowMode = ref("default");
-    const fn = (counter) => {
-      counterData.value = counter;
-    };
     c.evt.on("onCreated", () => {
-      if (c.counter) {
-        c.counter.onChange(fn, true);
-      }
       if (c.controlParams.cascadeselect) {
         cascadeSelect.value = true;
       }
@@ -685,16 +677,11 @@ const TreeControl = /* @__PURE__ */ defineComponent({
     });
     const renderCounter = (nodeModel) => {
       if (nodeModel.counterId) {
-        const value = counterData.value[nodeModel.counterId];
-        if (isNil(value)) {
-          return null;
-        }
-        if (nodeModel.counterMode === 1 && value === 0) {
-          return null;
-        }
+        const value = c.state.counterData[nodeModel.counterId];
         return createVNode(resolveComponent("iBizBadge"), {
+          "value": value,
           "class": ns.e("counter"),
-          "value": value
+          "counterMode": nodeModel.counterMode
         }, null);
       }
     };

package/es/locale/en/index.mjs

@@ -763,6 +763,16 @@ var index = {
         successImport: "Number of successful imports: ",
         ImportFailed: "Number of import failures: "
       },
+      asyncActionResult: {
+        noMessage: "No content",
+        taskName: "Task Name:",
+        taskState: "Task Status:",
+        finished: "Completed",
+        processing: "Processing",
+        beginTime: "Start Execution Time:",
+        endTime: "End Execution Time:",
+        exeResult: "Execution Result:"
+      },
       asyncDataExport: {
         exportDetailPrompt: "Export data details-{name}",
         excuteTime: "Execution time",

package/es/locale/zh-CN/index.mjs

@@ -759,6 +759,16 @@ var index = {
         successImport: "\u6210\u529F\u5BFC\u5165\u6570: ",
         ImportFailed: "\u5BFC\u5165\u5931\u8D25\u6570: "
       },
+      asyncActionResult: {
+        noMessage: "\u65E0\u5904\u7406\u5185\u5BB9",
+        taskName: "\u4EFB\u52A1\u540D\u79F0:",
+        taskState: "\u4EFB\u52A1\u72B6\u6001:",
+        finished: "\u5DF2\u5B8C\u6210",
+        processing: "\u6267\u884C\u4E2D",
+        beginTime: "\u5F00\u59CB\u6267\u884C\u65F6\u95F4:",
+        endTime: "\u7ED3\u675F\u6267\u884C\u65F6\u95F4:",
+        exeResult: "\u6267\u884C\u7ED3\u679C:"
+      },
       asyncDataExport: {
         exportDetailPrompt: "\u5BFC\u51FA\u6570\u636E\u8BE6\u60C5-{name}",
         excuteTime: "\u6267\u884C\u65F6\u95F4",

package/es/panel-component/user-message/async-action/async-action-result/async-action-result.css

@@ -0,0 +1 @@
+.ibiz-async-action-result{height:100%;display:flex;flex-flow:column nowrap;padding:var(--ibiz-spacing-tight)}.ibiz-async-action-result__title{font-size:var(--ibiz-font-size-header-5);font-weight:var(--ibiz-font-weight-bold)}.ibiz-async-action-result-header{display:flex;align-items:center;justify-content:space-between;height:48px;padding:var(--ibiz-spacing-tight);border-bottom:1px solid var(--ibiz-color-border)}.ibiz-async-action-result-content{padding:var(--ibiz-spacing-tight)}.ibiz-async-action-result-content .el-form-item__content,.ibiz-async-action-result-content .el-form-item__label{font-weight:var(--ibiz-font-weight-bold)}.ibiz-async-action-result-content__json-container{width:100%;max-height:400px;padding:12px;overflow-y:auto;font-family:Monaco,Menlo,"Ubuntu Mono",monospace;font-size:13px;line-height:1.5;word-break:break-word;white-space:pre-wrap;background-color:var(--ibiz-color-bg-0);border:1px solid var(--ibiz-color-border);border-radius:4px}.ibiz-async-action-result-content__json-container::-webkit-scrollbar{width:6px;height:6px}.ibiz-async-action-result-content__json-container::-webkit-scrollbar-track{background:#f1f1f1;border-radius:3px}.ibiz-async-action-result-content__json-container::-webkit-scrollbar-thumb{background:#c1c1c1;border-radius:3px}.ibiz-async-action-result-content__json-container::-webkit-scrollbar-thumb:hover{background:#a8a8a8}.ibiz-async-action-result-content__json-key{font-weight:700;color:#d73a49}.ibiz-async-action-result-content__json-string{color:#032f62}.ibiz-async-action-result-content__json-number{color:#005cc5}.ibiz-async-action-result-content__json-boolean{color:#d73a49}.ibiz-async-action-result-content__json-null{color:#d73a49}.ibiz-async-action-result-content__json-array{display:inline-block}.ibiz-async-action-result-content__json-object{display:inline-block}.ibiz-async-action-result-content__json-indent{display:block}

package/es/panel-component/user-message/async-action/async-action-result/async-action-result.mjs

@@ -1,8 +1,12 @@
-import { defineComponent, createVNode, computed } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent, reactive, createTextVNode } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
+import './async-action-result.css';
 import { isObject } from 'lodash-es';
 
 "use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
 const AsyncActionResult = /* @__PURE__ */ defineComponent({
   name: "IBizAsyncActionResult",
   props: {
@@ -16,22 +20,170 @@ const AsyncActionResult = /* @__PURE__ */ defineComponent({
     }
   },
   setup(props) {
-    const ns = useNamespace("async-action-preview");
-    const message = computed(() => {
-      if (isObject(props.asyncAction.actionresult)) {
-        return JSON.stringify(props.asyncAction.actionresult);
-      }
-      return "".concat(props.asyncAction.actionresult);
+    const ns = useNamespace("async-action-result");
+    const finishedStates = [30, 40];
+    const info = reactive({
+      title: props.asyncAction.asyncacitonname,
+      beginTime: props.asyncAction.begintime,
+      endTime: props.asyncAction.endtime,
+      actionState: finishedStates.includes(props.asyncAction.actionstate),
+      message: ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.noMessage"),
+      isJSON: false
     });
+    const onClose = () => {
+      props.modal.dismiss();
+    };
+    if (isObject(props.asyncAction.actionresult)) {
+      info.message = JSON.stringify(props.asyncAction.actionresult, null, 2);
+      info.isJSON = true;
+    } else if (props.asyncAction.actionresult) {
+      info.message = "".concat(props.asyncAction.actionresult);
+    }
+    const renderJSONObject = (obj, depth) => {
+      if (obj === null) {
+        return createVNode("span", {
+          "class": ns.be("content", "json-null")
+        }, [createTextVNode("null")]);
+      }
+      if (typeof obj === "boolean") {
+        return createVNode("span", {
+          "class": ns.be("content", "json-boolean")
+        }, [obj.toString()]);
+      }
+      if (typeof obj === "number") {
+        return createVNode("span", {
+          "class": ns.be("content", "json-number")
+        }, [obj.toString()]);
+      }
+      if (typeof obj === "string") {
+        return createVNode("span", {
+          "class": ns.be("content", "json-string")
+        }, [createTextVNode('"'), obj, createTextVNode('"')]);
+      }
+      if (Array.isArray(obj)) {
+        if (obj.length === 0) {
+          return createVNode("span", null, [createTextVNode("[]")]);
+        }
+        const items2 = obj.map((item, index) => createVNode("div", {
+          "key": index,
+          "class": ns.be("content", "json-indent"),
+          "style": {
+            paddingLeft: "".concat((depth + 1) * 20, "px")
+          }
+        }, [renderJSONObject(item, depth + 1), index < obj.length - 1 ? "," : ""]));
+        return createVNode("div", {
+          "class": ns.be("content", "json-array")
+        }, [createVNode("span", null, [createTextVNode("[")]), items2, createVNode("div", {
+          "style": {
+            paddingLeft: "".concat(depth * 20, "px")
+          }
+        }, null), createVNode("span", {
+          "style": {
+            paddingLeft: "".concat(depth * 20, "px")
+          }
+        }, [createTextVNode("]")])]);
+      }
+      const keys = Object.keys(obj);
+      if (keys.length === 0) {
+        return createVNode("span", null, ["{}"]);
+      }
+      const items = keys.map((key, index) => createVNode("div", {
+        "key": key,
+        "class": ns.be("content", "json-indent"),
+        "style": {
+          paddingLeft: "".concat((depth + 1) * 20, "px")
+        }
+      }, [createVNode("span", {
+        "class": ns.be("content", "json-key")
+      }, [createTextVNode('"'), key, createTextVNode('"')]), createTextVNode(":"), " ", renderJSONObject(obj[key], depth + 1), index < keys.length - 1 ? "," : ""]));
+      return createVNode("div", {
+        "class": ns.be("content", "json-object")
+      }, [createVNode("span", null, ["{"]), items, createVNode("div", {
+        "style": {
+          paddingLeft: "".concat(depth * 20, "px")
+        }
+      }, null), createVNode("span", {
+        "style": {
+          paddingLeft: "".concat(depth * 20, "px")
+        }
+      }, ["}"])]);
+    };
+    const renderJSON = (jsonStr) => {
+      try {
+        const obj = JSON.parse(jsonStr);
+        return renderJSONObject(obj, 0);
+      } catch (e) {
+        return createVNode("span", null, [jsonStr]);
+      }
+    };
     return {
       ns,
-      message
+      info,
+      onClose,
+      renderJSON
     };
   },
   render() {
+    let _slot;
     return createVNode("div", {
       "class": [this.ns.b()]
-    }, [this.message]);
+    }, [createVNode("div", {
+      "class": this.ns.b("header")
+    }, [createVNode("div", {
+      "class": this.ns.e("title")
+    }, [this.info.title]), createVNode("div", {
+      "class": this.ns.b("toolbar")
+    }, [createVNode(resolveComponent("el-button"), {
+      "onClick": this.onClose
+    }, _isSlot(_slot = ibiz.i18n.t("app.close")) ? _slot : {
+      default: () => [_slot]
+    })])]), createVNode("div", {
+      "class": this.ns.b("content")
+    }, [createVNode(resolveComponent("el-row"), null, {
+      default: () => [createVNode(resolveComponent("el-col"), {
+        "span": 12
+      }, {
+        default: () => [createVNode(resolveComponent("el-form-item"), {
+          "label": ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.taskName")
+        }, {
+          default: () => [this.info.title]
+        })]
+      }), createVNode(resolveComponent("el-col"), {
+        "span": 12
+      }, {
+        default: () => [createVNode(resolveComponent("el-form-item"), {
+          "label": ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.taskState")
+        }, {
+          default: () => [this.info.actionState ? ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.finished") : ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.processing")]
+        })]
+      }), createVNode(resolveComponent("el-col"), {
+        "span": 12
+      }, {
+        default: () => [createVNode(resolveComponent("el-form-item"), {
+          "label": ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.beginTime")
+        }, {
+          default: () => [this.info.beginTime]
+        })]
+      }), createVNode(resolveComponent("el-col"), {
+        "span": 12
+      }, {
+        default: () => [createVNode(resolveComponent("el-form-item"), {
+          "label": ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.endTime")
+        }, {
+          default: () => [this.info.endTime]
+        })]
+      }), createVNode(resolveComponent("el-col"), {
+        "span": 24
+      }, {
+        default: () => [createVNode(resolveComponent("el-form-item"), {
+          "label": ibiz.i18n.t("panelComponent.userMessage.asyncActionResult.exeResult")
+        }, {
+          default: () => [createVNode("div", {
+            "class": this.ns.be("content", "json-container")
+          }, [this.renderJSON(this.info.message)])]
+        })]
+      })]
+    })])]);
   }
 });
 

package/lib/control/app-menu/app-menu.cjs

@@ -290,8 +290,6 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
     const defaultActive = vue.ref("");
     const defaultOpens = vue.ref([]);
     const route = vueRouter.useRoute();
-    let counter = null;
-    const counterData = vue.ref({});
     const key = vue.ref(qxUtil.createUUID());
     const menuRef = vue.ref();
     const hasScroll = vue.ref(false);
@@ -340,9 +338,6 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
         }
       });
     }
-    const fn = (data) => {
-      counterData.value = data;
-    };
     c.evt.on("onCreated", async () => {
       saveConfigs.value = c.saveConfigs;
       const defaultActiveMenuItem = c.getDefaultOpenMenuItem();
@@ -363,19 +358,6 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
       }
       hideSeparator.value = runtime.formatSeparator("APPMENU", c.model.appMenuItems, c.state.menuItemsState, saveConfigs.value);
     });
-    c.evt.on("onMounted", async () => {
-      const counterRefId = c.model.appCounterRefId;
-      if (counterRefId) {
-        counter = c.getCounter(counterRefId);
-        if (counter) {
-          counter.onChange(fn);
-        }
-      }
-    });
-    vue.onUnmounted(() => {
-      counter == null ? void 0 : counter.offChange(fn);
-      counter == null ? void 0 : counter.destroy();
-    });
     const menuMode = vue.computed(() => {
       const model = c.view.model.mainMenuAlign;
       switch (model) {
@@ -445,7 +427,6 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
       menuRef,
       menuMode,
       hasScroll,
-      counterData,
       saveConfigs,
       defaultOpens,
       defaultActive,
@@ -486,9 +467,9 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
             return this.menus.map((item) => {
               var _a3;
               if (((_a3 = item.children) == null ? void 0 : _a3.length) > 0) {
-                return renderSubmenu(true, item, this.collapse, this.ns, this.c, this.counterData, this.saveConfigs, this.hideSeparator);
+                return renderSubmenu(true, item, this.collapse, this.ns, this.c, this.c.state.counterData, this.saveConfigs, this.hideSeparator);
               }
-              return renderMenuItem(true, item, this.collapse, this.ns, this.c, this.counterData, this.saveConfigs, this.hideSeparator);
+              return renderMenuItem(true, item, this.collapse, this.ns, this.c, this.c.state.counterData, this.saveConfigs, this.hideSeparator);
             });
           }
         }), this.enableCustomized && vue.createVNode(customMenuDesign.MenuDesign, {

package/lib/control/calendar/calendar.cjs

@@ -657,11 +657,12 @@ const CalendarControl = /* @__PURE__ */ vue.defineComponent({
           const model = (_a = this.c.model.sysCalendarItems) == null ? void 0 : _a.find((calendarItems) => {
             return item.itemType === calendarItems.itemType;
           });
+          const temptime = item.beginTime ? dayjs(item.beginTime).format(this.c.timelineCaptionFormat) : item.beginTime;
           return vue.createVNode(vue.resolveComponent("el-timeline-item"), {
             "key": item.id,
             "placement": "top",
             "color": item.bkColor,
-            "timestamp": item.beginTime
+            "timestamp": temptime
           }, {
             default: () => [(model == null ? void 0 : model.layoutPanel) ? renderPanelItem(item, model.layoutPanel) : renderDefaultItem(item)]
           });

package/lib/control/tree/tree.cjs

@@ -6,7 +6,6 @@ var qxUtil = require('qx-util');
 var lodashEs = require('lodash-es');
 var runtime = require('@ibiz-template/runtime');
 var core = require('@ibiz-template/core');
-var ramda = require('ramda');
 var elTreeUtil = require('./el-tree-util.cjs');
 require('./tree.css');
 
@@ -108,15 +107,8 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     const c = vue3Util.useControlController((...args) => new runtime.TreeController(...args));
     elTreeUtil.useAppTreeBase(c, props);
     const cascadeSelect = vue.ref(false);
-    const counterData = vue.ref({});
     const menuShowMode = vue.ref("default");
-    const fn = (counter) => {
-      counterData.value = counter;
-    };
     c.evt.on("onCreated", () => {
-      if (c.counter) {
-        c.counter.onChange(fn, true);
-      }
       if (c.controlParams.cascadeselect) {
         cascadeSelect.value = true;
       }
@@ -687,16 +679,11 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     });
     const renderCounter = (nodeModel) => {
       if (nodeModel.counterId) {
-        const value = counterData.value[nodeModel.counterId];
-        if (ramda.isNil(value)) {
-          return null;
-        }
-        if (nodeModel.counterMode === 1 && value === 0) {
-          return null;
-        }
+        const value = c.state.counterData[nodeModel.counterId];
         return vue.createVNode(vue.resolveComponent("iBizBadge"), {
+          "value": value,
           "class": ns.e("counter"),
-          "value": value
+          "counterMode": nodeModel.counterMode
         }, null);
       }
     };

package/lib/locale/en/index.cjs

@@ -767,6 +767,16 @@ var index = {
         successImport: "Number of successful imports: ",
         ImportFailed: "Number of import failures: "
       },
+      asyncActionResult: {
+        noMessage: "No content",
+        taskName: "Task Name:",
+        taskState: "Task Status:",
+        finished: "Completed",
+        processing: "Processing",
+        beginTime: "Start Execution Time:",
+        endTime: "End Execution Time:",
+        exeResult: "Execution Result:"
+      },
       asyncDataExport: {
         exportDetailPrompt: "Export data details-{name}",
         excuteTime: "Execution time",

package/lib/locale/zh-CN/index.cjs

@@ -763,6 +763,16 @@ var index = {
         successImport: "\u6210\u529F\u5BFC\u5165\u6570: ",
         ImportFailed: "\u5BFC\u5165\u5931\u8D25\u6570: "
       },
+      asyncActionResult: {
+        noMessage: "\u65E0\u5904\u7406\u5185\u5BB9",
+        taskName: "\u4EFB\u52A1\u540D\u79F0:",
+        taskState: "\u4EFB\u52A1\u72B6\u6001:",
+        finished: "\u5DF2\u5B8C\u6210",
+        processing: "\u6267\u884C\u4E2D",
+        beginTime: "\u5F00\u59CB\u6267\u884C\u65F6\u95F4:",
+        endTime: "\u7ED3\u675F\u6267\u884C\u65F6\u95F4:",
+        exeResult: "\u6267\u884C\u7ED3\u679C:"
+      },
       asyncDataExport: {
         exportDetailPrompt: "\u5BFC\u51FA\u6570\u636E\u8BE6\u60C5-{name}",
         excuteTime: "\u6267\u884C\u65F6\u95F4",