@ibiz-template/vue3-components 0.7.16 → 0.7.17

package/lib/panel-component/auth-userinfo/auth-userinfo.css

@@ -1 +1 @@
-.ibiz-user-info{--ibiz-user-info-padding:0 var(--ibiz-spacing-loose);--ibiz-user-info-color:var(--ibiz-color-text-0);display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%}.ibiz-user-info .el-dropdown{width:100%;padding:var(--ibiz-user-info-padding);cursor:pointer}.ibiz-user-info.is-left .ibiz-user-info__down{position:relative;top:12px}.ibiz-user-info.is-top .ibiz-user-info__down{margin-left:35px}.ibiz-user-info.is-top .ibiz-user-info-avatar{max-width:24px;max-height:24px}.ibiz-user-info.is-collapse .el-dropdown{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-user-info.is-collapse .ibiz-user-info-avatar{max-width:32px;max-height:32px;margin:0}.ibiz-user-info-avatar{max-width:44px;max-height:44px;margin-right:10px}.ibiz-user-info-info{width:100%;display:flex;align-items:center;justify-content:space-between;color:var(--ibiz-user-info-color)}.ibiz-user-info-name__user-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;font-size:var(--ibiz-font-size-header-6);line-height:1.3}.ibiz-user-info-name__person-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;margin-top:10px;font-size:var(--ibiz-font-size-small);line-height:1.2}.ibiz-user-info-label{display:flex;align-items:center;justify-content:flex-start;font-size:var(--ibiz-user-info-font-size);color:var(--ibiz-user-info-color);outline:0}
+.ibiz-user-info{--ibiz-user-info-padding:0 var(--ibiz-spacing-loose);--ibiz-user-info-color:var(--ibiz-color-text-0);display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%}.ibiz-user-info .el-dropdown{width:100%;padding:var(--ibiz-user-info-padding);cursor:pointer}.ibiz-user-info.is-left .ibiz-user-info__down{position:relative;top:12px}.ibiz-user-info.is-left .ibiz-user-info__down.is-collapse{display:none}.ibiz-user-info.is-top .ibiz-user-info__down{margin-left:35px}.ibiz-user-info.is-top .ibiz-user-info-avatar{max-width:24px;max-height:24px}.ibiz-user-info.is-collapse .el-dropdown{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-user-info.is-collapse .ibiz-user-info-avatar{max-width:24px;max-height:24px;margin:0}.ibiz-user-info-avatar{max-width:44px;max-height:44px;margin-right:10px}.ibiz-user-info-info{width:100%;display:flex;align-items:center;justify-content:space-between;color:var(--ibiz-user-info-color)}.ibiz-user-info-info.is-collapse{justify-content:center}.ibiz-user-info-name__user-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;font-size:var(--ibiz-font-size-header-6);line-height:1.3}.ibiz-user-info-name__person-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;margin-top:10px;font-size:var(--ibiz-font-size-small);line-height:1.2}.ibiz-user-info-label{display:flex;align-items:center;justify-content:flex-start;font-size:var(--ibiz-user-info-font-size);color:var(--ibiz-user-info-color);outline:0}

package/lib/panel-component/panel-app-title/panel-app-title.cjs

@@ -68,7 +68,6 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
   render() {
     const {
       icon,
-      icon2,
       isSvg,
       caption,
       caption2,
@@ -79,28 +78,34 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
     const captionNode = vue.createVNode("span", {
       "class": this.ns.e("title")
     }, [caption]);
-    if (icon || icon2) {
-      if (isSvg) {
-        iconVNode = vue.createVNode("ion-icon", {
-          "class": this.ns.e("logo"),
-          "icon": this.isCollapse ? icon2 : icon
-        }, null);
-      } else {
-        iconVNode = vue.createVNode("span", {
-          "class": this.ns.e("logo")
-        }, [vue.createVNode("img", {
-          "src": this.isCollapse ? icon2 : icon
-        }, null)]);
-      }
-    } else if (this.menuAlign === "LEFT") {
+    if (this.menuAlign === "LEFT") {
       if (this.isCollapse) {
-        iconVNode = vue.createVNode("div", {
-          "class": this.ns.e("collapse-title")
-        }, [vue.createVNode("div", {
-          "class": this.ns.e("caption2")
-        }, [caption2]), vue.createVNode("div", {
-          "class": this.ns.e("subCaption2")
-        }, [subCaption2])]);
+        if (icon) {
+          let tempIcon = null;
+          if (isSvg) {
+            tempIcon = vue.createVNode("ion-icon", {
+              "class": this.ns.e("logo"),
+              "icon": icon
+            }, null);
+          } else {
+            tempIcon = vue.createVNode("span", {
+              "class": this.ns.e("logo")
+            }, [vue.createVNode("img", {
+              "src": icon
+            }, null)]);
+          }
+          iconVNode = vue.createVNode("div", {
+            "class": this.ns.e("collpase-icon")
+          }, [tempIcon]);
+        } else {
+          iconVNode = vue.createVNode("div", {
+            "class": this.ns.e("collapse-title")
+          }, [vue.createVNode("div", {
+            "class": this.ns.e("caption2")
+          }, [caption2]), vue.createVNode("div", {
+            "class": this.ns.e("subCaption2")
+          }, [subCaption2])]);
+        }
       } else {
         iconVNode = vue.createVNode("span", {
           "class": this.ns.e("logo")
@@ -132,6 +137,21 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
           "y": "73"
         }, [subCaption])])])])]);
       }
+    } else if (this.menuAlign === "TOP") {
+      if (icon) {
+        if (isSvg) {
+          iconVNode = vue.createVNode("ion-icon", {
+            "class": this.ns.e("logo"),
+            "icon": icon
+          }, null);
+        } else {
+          iconVNode = vue.createVNode("span", {
+            "class": this.ns.e("logo")
+          }, [vue.createVNode("img", {
+            "src": icon
+          }, null)]);
+        }
+      }
     }
     let content = null;
     if (this.menuAlign === "LEFT") {

package/lib/panel-component/panel-app-title/panel-app-title.controller.cjs

@@ -37,7 +37,9 @@ class PanelAppTitleController extends runtime.PanelItemController {
     if (indexViewModel.title) {
       document.title = indexViewModel.title;
     }
-    if (indexViewModel.appIconPath) {
+    if (this.model.sysImage && this.model.sysImage.rawContent) {
+      this.state.icon = this.model.sysImage.rawContent;
+    } else if (indexViewModel.appIconPath) {
       this.state.icon = indexViewModel.appIconPath;
     }
     if (indexViewModel.appIconPath2) {

package/lib/panel-component/panel-app-title/panel-app-title.css

@@ -1 +1 @@
-.ibiz-panel-app-title{--ibiz-panel-app-title-color:var(--ibiz-color-text-0);--ibiz-panel-app-title-font-size:var(--ibiz-font-size-header-3);--ibiz-panel-app-title-font-weight:var(--ibiz-font-weight-bold);--ibiz-panel-app-title-padding:0 var(--ibiz-spacing-loose);--ibiz-panel-app-title-collapse-padding:0 var(--ibiz-spacing-tight);display:flex;align-items:center;justify-content:center;height:100%;padding:var(--ibiz-panel-app-title-padding);cursor:pointer}.ibiz-panel-app-title__title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-panel-app-title-font-size);font-weight:700;color:var(--ibiz-panel-app-title-color)}.ibiz-panel-app-title__logo{display:flex;align-items:center;justify-content:center;height:100%;padding:0 var(--ibiz-spacing-tight);font-size:40px}.ibiz-panel-app-title__logo img{display:inline-block;width:20px;height:20px}.ibiz-panel-app-title__logo svg{fill:var(--ibiz-panel-app-title-color)}.ibiz-panel-app-title.is-only-img .ibiz-panel-app-title__logo{padding:0}.ibiz-panel-app-title.is-collapse{max-width:100%;padding:var(--ibiz-panel-app-title-collapse-padding)}.ibiz-panel-app-title.is-collapse .ibiz-panel-app-title__collapse-title{width:100%}.ibiz-panel-app-title.is-collapse .ibiz-panel-app-title__caption2{overflow:hidden;font-size:var(--ibiz-font-size-header-4);font-weight:var(--ibiz-panel-app-title-font-weight);text-align:center;white-space:nowrap}.ibiz-panel-app-title.is-collapse .ibiz-panel-app-title__subCaption2{overflow:hidden;font-size:var(--ibiz-font-size-header-5);text-align:center;white-space:nowrap}
+.ibiz-panel-app-title{--ibiz-panel-app-title-color:var(--ibiz-color-text-0);--ibiz-panel-app-title-font-size:var(--ibiz-font-size-header-3);--ibiz-panel-app-title-font-weight:var(--ibiz-font-weight-bold);--ibiz-panel-app-title-padding:0 var(--ibiz-spacing-loose);--ibiz-panel-app-title-collapse-padding:0 var(--ibiz-spacing-tight);display:flex;align-items:center;justify-content:center;height:100%;padding:var(--ibiz-panel-app-title-padding);cursor:pointer}.ibiz-panel-app-title__title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-panel-app-title-font-size);font-weight:700;color:var(--ibiz-panel-app-title-color)}.ibiz-panel-app-title__logo{display:flex;align-items:center;justify-content:center;height:100%;padding:0 var(--ibiz-spacing-tight);font-size:40px}.ibiz-panel-app-title__logo img{display:inline-block;width:auto;height:100%}.ibiz-panel-app-title__logo svg{fill:var(--ibiz-panel-app-title-color)}.ibiz-panel-app-title.is-only-img .ibiz-panel-app-title__logo{padding:0}.ibiz-panel-app-title.is-collapse{max-width:100%;padding:var(--ibiz-panel-app-title-collapse-padding)}.ibiz-panel-app-title.is-collapse .ibiz-panel-app-title__collapse-title{width:100%}.ibiz-panel-app-title.is-collapse .ibiz-panel-app-title__collpase-icon img{width:100%;height:100%}.ibiz-panel-app-title.is-collapse .ibiz-panel-app-title__caption2{overflow:hidden;font-size:var(--ibiz-font-size-header-4);font-weight:var(--ibiz-panel-app-title-font-weight);text-align:center;white-space:nowrap}.ibiz-panel-app-title.is-collapse .ibiz-panel-app-title__subCaption2{overflow:hidden;font-size:var(--ibiz-font-size-header-5);text-align:center;white-space:nowrap}

package/lib/panel-component/user-action/user-action.cjs

@@ -39,7 +39,7 @@ const UserAction = /* @__PURE__ */ vue.defineComponent({
         sysImage = imgConfig[predefinedType];
       }
     }
-    const onClick = async () => {
+    const onClick = async (event) => {
       const id = props.modelData.id;
       const menuC = c.panel.view.getController("appmenu");
       if (menuC) {
@@ -56,7 +56,9 @@ const UserAction = /* @__PURE__ */ vue.defineComponent({
           const tempContext = c.panel.context.clone();
           const tempParam = c.panel.params;
           tempContext.srfappid = targetMenu.appId || ibiz.env.appId;
-          await ibiz.commands.execute(runtime.AppFuncCommand.TAG, targetMenu.appFuncId, tempContext, tempParam, {});
+          await ibiz.commands.execute(runtime.AppFuncCommand.TAG, targetMenu.appFuncId, tempContext, tempParam, {
+            event
+          });
         }
       }
     };
@@ -70,7 +72,7 @@ const UserAction = /* @__PURE__ */ vue.defineComponent({
   render() {
     return vue.createVNode("div", {
       "class": this.ns.b(),
-      "onClick": this.onClick,
+      "onClick": (event) => this.onClick(event),
       "title": this.modelData.caption
     }, [vue.createVNode(vue.resolveComponent("i-biz-icon"), {
       "class": [this.ns.e("image")],

package/lib/util/app-util/app-util.cjs

@@ -49,9 +49,10 @@ class AppUtil {
         window.history.replaceState({}, "", href);
       }
       await this.router.push(
-        "/login?ru=".concat(encodeURIComponent(
-          window.location.hash.replace("#/", "/")
-        ))
+        // `/login?ru=${encodeURIComponent(
+        //   window.location.hash.replace('#/', '/'),
+        // )}`,
+        "/login"
       );
       ibiz.util.showAppLoading();
       window.location.reload();
@@ -69,11 +70,11 @@ class AppUtil {
    * @return {*}  {Promise<boolean>}
    */
   async changePwd(oldPwd, newPwd, opts) {
-    let bol = this.validatePwd(oldPwd, newPwd, opts);
-    if (bol) {
-      bol = await ibiz.auth.changePwd(oldPwd, newPwd);
+    if (this.validatePwd(oldPwd, newPwd, opts)) {
+      const result = await ibiz.auth.changePwd(oldPwd, newPwd);
+      return result;
     }
-    return bol;
+    return { ok: false, result: {} };
   }
   /**
    * 切换组织

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -30,12 +30,12 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.5",
     "@ibiz-template-plugin/gantt": "0.1.4",
-    "@ibiz-template/core": "0.7.16",
+    "@ibiz-template/core": "0.7.17",
     "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.7.16",
-    "@ibiz-template/runtime": "0.7.16",
+    "@ibiz-template/model-helper": "0.7.17",
+    "@ibiz-template/runtime": "0.7.17",
     "@ibiz-template/theme": "^0.7.0",
-    "@ibiz-template/vue3-util": "0.7.16",
+    "@ibiz-template/vue3-util": "0.7.17",
     "@ibiz-template/web-theme": "^1.1.17",
     "@ibiz/model-core": "^0.1.27",
     "@imengyu/vue3-context-menu": "^1.3.5",