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

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",

package/lib/panel-component/user-message/async-action/async-action-result/async-action-result.cjs

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

package/lib/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/lib/util/fullscreen/fullscreen-util.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.28_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.33_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 var fullscreenToolbar = require('../../common/fullscreen-toolbar/fullscreen-toolbar.cjs');
 
 "use strict";

package/lib/web-app/guard/auth-guard/auth-guard.cjs

@@ -274,15 +274,19 @@ class AuthGuard {
         return uiTheme.themeParams && uiTheme.themeParams["icon-theme"] !== "true";
       });
       if (colorThemes.length > 0) {
-        const colorTheme = colorThemes[0];
-        await ibiz.util.theme.loadTheme(colorTheme);
+        for (let index = 0; index < colorThemes.length; index++) {
+          const colorTheme = colorThemes[index];
+          await ibiz.util.theme.loadTheme(colorTheme);
+        }
       }
       const iconThemes = uiThemes.filter((uiTheme) => {
         return uiTheme.themeParams && uiTheme.themeParams["icon-theme"] === "true";
       });
       if (iconThemes.length > 0) {
-        const iconTheme = iconThemes[0];
-        await ibiz.util.theme.loadTheme(iconTheme, "ICON");
+        for (let index = 0; index < iconThemes.length; index++) {
+          const iconTheme = iconThemes[index];
+          await ibiz.util.theme.loadTheme(iconTheme, "ICON");
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.32",
+  "version": "0.7.41-alpha.34",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -32,14 +32,14 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.32",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.316",
-    "@ibiz-template-plugin/bi-report": "0.0.27",
+    "@ibiz-template-plugin/bi-report": "0.0.29",
     "@ibiz-template-plugin/data-view": "0.0.6",
-    "@ibiz-template/core": "0.7.41-alpha.28",
+    "@ibiz-template/core": "0.7.41-alpha.33",
     "@ibiz-template/devtool": "0.0.13",
-    "@ibiz-template/model-helper": "0.7.41-alpha.32",
-    "@ibiz-template/runtime": "0.7.41-alpha.32",
+    "@ibiz-template/model-helper": "0.7.41-alpha.34",
+    "@ibiz-template/runtime": "0.7.41-alpha.34",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.32",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.34",
     "@ibiz-template/web-theme": "3.9.0",
     "@ibiz/model-core": "^0.1.83",
     "@imengyu/vue3-context-menu": "^1.3.5",