cloud-web-corejs 1.0.281 → 1.1.0-dev.11

package/src/views/user/home/default2.vue

@@ -594,7 +594,7 @@ export default {
           let userInfo = res.objx;
           this.headPhotoUrl = userInfo.headPhotoUrl
             ? userInfo.headPhotoUrl
-            : require("@/resources/images" + "/default-header.png");
+            : (require("@/resources/images/default-header.png").default || require("@/resources/images/default-header.png"));
 
           this.userInfo = userInfo;
         },

package/src/views/user/home/index.vue

@@ -1,101 +1,103 @@
-<template>
-  <div>
-    <component
-      v-if="homeContent && showHomeContent"
-      :is="homeContent"
-      visible-key="showHomeContent"
-      :parent-target="_self"
-      @reload="$reloadHandle"
-    ></component>
-  </div>
-</template>
-
-<script>
-import corejsConfig from "@/corejsConfig";
-import settingConfig from "@/settings";
-import { loadViewComponent } from "@base/utils/resolveViewComponent";
-
-export default {
-  name: 'home',
-  components: {},
-  data() {
-    return {
-      flag: 0,
-      homeContent: null,
-      showHomeContent: false,
-      userInfo: {}
-    };
-  },
-  created() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$http({
-        url: USER_PREFIX + '/user/currentUser',
-        method: 'post',
-        success: res => {
-          let userInfo = res.objx;
-          this.userInfo = userInfo;
-          let flag = userInfo.flag;
-          this.initHome();
-        }
-      });
-    },
-    getIsDistributor(userInfo) {
-      this.$http({
-        url: USER_PREFIX + '/userb/getUserRole',
-        method: `post`,
-        data: {id: userInfo.id},
-        success: res2 => {
-          let rows = res2.objx || [];
-          let codes = rows.map(row => row.roleCode);
-          if (codes.includes('distributor')) {
-            this.flag = 2;
-          } else {
-            this.initHome();
-          }
-        }
-      });
-    },
-    initHome() {
-      let url = null;
-      let userInfo = this.userInfo;
-      let flag = userInfo.flag;
-      if (flag == 6 || flag == 7 || flag == 8) {
-        let url = '/user/home/dev.vue'
-        this.homeContent = require('@base/views' + url).default;
-        this.showHomeContent = true;
-        return
-      }
-      this.$http({
-        url: USER_PREFIX + '/menu/currentList',
-        data: {},
-        method: 'post',
-        success: res => {
-          let menus = res.objx || [];
-          let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
-          let menuUrl = homeMenu?.url;
-
-          let userInfo = this.userInfo;
-          let flag = userInfo.flag;
-
-          if (menuUrl && flag !== 1) {
-            //超级管理员不使用角色首页
-            url = menuUrl + '.vue';
-          } else {
-            let defaultHomePage = this.userInfo.defaultHomePage;
-            url =  defaultHomePage || settingConfig.defaultHomePage || '@base/views/user/home/default.vue'
-          }
-          // 首页菜单不会归属别的子应用，无需 remote 兜底；归属解析见 @base/utils/resolveViewComponent
-          this.homeContent = loadViewComponent(url).component;
-
-          this.showHomeContent = true;
-          this.flag = 1;
-        }
-      });
-    }
-
-  }
-};
-</script>
+<template>
+  <div>
+    <component
+      v-if="homeContent && showHomeContent"
+      :is="homeContent"
+      visible-key="showHomeContent"
+      :parent-target="_self"
+      @reload="$reloadHandle"
+    ></component>
+  </div>
+</template>
+
+<script>
+import corejsConfig from "@/corejsConfig";
+import settingConfig from "@/settings";
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
+
+export default {
+  name: 'home',
+  components: {},
+  data() {
+    return {
+      flag: 0,
+      homeContent: null,
+      showHomeContent: false,
+      userInfo: {}
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      this.$http({
+        url: USER_PREFIX + '/user/currentUser',
+        method: 'post',
+        success: res => {
+          let userInfo = res.objx;
+          this.userInfo = userInfo;
+          let flag = userInfo.flag;
+          this.initHome();
+        }
+      });
+    },
+    getIsDistributor(userInfo) {
+      this.$http({
+        url: USER_PREFIX + '/userb/getUserRole',
+        method: `post`,
+        data: {id: userInfo.id},
+        success: res2 => {
+          let rows = res2.objx || [];
+          let codes = rows.map(row => row.roleCode);
+          if (codes.includes('distributor')) {
+            this.flag = 2;
+          } else {
+            this.initHome();
+          }
+        }
+      });
+    },
+    async initHome() {
+      let url = null;
+      let userInfo = this.userInfo;
+      let flag = userInfo.flag;
+      if (flag == 6 || flag == 7 || flag == 8) {
+        // 路径是常量，用字面量 import：生成普通 ImportDependency，不参与 views context
+        this.homeContent = (
+          await import("@base/views/user/home/dev.vue")
+        ).default;
+        this.showHomeContent = true;
+        return
+      }
+      this.$http({
+        url: USER_PREFIX + '/menu/currentList',
+        data: {},
+        method: 'post',
+        success: async res => {
+          let menus = res.objx || [];
+          let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
+          let menuUrl = homeMenu?.url;
+
+          let userInfo = this.userInfo;
+          let flag = userInfo.flag;
+
+          if (menuUrl && flag !== 1) {
+            //超级管理员不使用角色首页
+            url = menuUrl + '.vue';
+          } else {
+            let defaultHomePage = this.userInfo.defaultHomePage;
+            url =  defaultHomePage || settingConfig.defaultHomePage || '@base/views/user/home/default.vue'
+          }
+          // 首页菜单不会归属别的子应用，无需 remote 兜底；归属解析见 @base/utils/resolveViewComponent
+          this.homeContent = (await loadViewComponentAsync(url)).component;
+
+          this.showHomeContent = true;
+          this.flag = 1;
+        }
+      });
+    }
+
+  }
+};
+</script>

package/src/views/user/notify_message/dialog.vue

@@ -1,137 +1,139 @@
-<template>
-  <el-dialog
-    :title="$t1('查看单据流程')"
-    :append-to-body="true"
-    :modal-append-to-body="true"
-    :close-on-click-modal="false"
-    v-if="showWfDialog2"
-    :visible.sync="showWfDialog2"
-    :modal="false"
-    custom-class="el-dialog dialog-style designer-dialog indexUse"
-    width="100%"
-    height="100%"
-    top="0px"
-    bottom="0px"
-    :destroy-on-close="true"
-    v-el-drag-dialog
-  >
-    <div id="containt">
-      <component
-        v-if="showWfContent && wfContent"
-        :is="wfContent"
-        visible-key="showWfContent"
-        v-bind="param"
-        :_isNotifyMessage="true"
-        :parent-target="_self"
-        @reload="$reloadHandle"
-      ></component>
-      <micro-view-host
-        v-else-if="showWfContent && remoteView"
-        :owner="remoteView.owner"
-        :target-path="remoteView.targetPath"
-        :biz-params="remoteView.bizParams"
-        :view-meta="remoteView.viewMeta"
-        @reload="$reloadHandle"
-        @close="showWfContent = false"
-      ></micro-view-host>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { loadViewComponent } from "@base/utils/resolveViewComponent";
-export default {
-  props: {},
-  data() {
-    return {
-      showWfDialog2: false,
-      wfUrl2: "",
-      showWfContent: true,
-      wfContent: null,
-      remoteView: null,
-      wfDataId: "",
-      param: {},
-    };
-  },
-  methods: {
-    getUrlParam(url) {
-      var reg = /([^?&=]+)=([^?&=]+)/g,
-        obj = {},
-        str = url;
-      url.replace(reg, function () {
-        obj[arguments[1]] = arguments[2];
-      });
-      return obj;
-    },
-    notifyMessageRead(row, callback) {
-      if (row.readed == 0) {
-        this.$http({
-          url: USER_PREFIX + `/notify_message/read`,
-          method: `post`,
-          data: [row.id],
-          isLoading: true,
-          loadingTarget: document.body,
-          success: (res) => {
-            callback && callback();
-          },
-        });
-      } else {
-        callback && callback();
-      }
-    },
-    open(row, callback) {
-      this.notifyMessageRead(row, () => {
-        let turl = row.jumpContent;
-        let wfUrl = turl.split("?")[0];
-        let param = this.getUrlParam(turl);
-        let wfDataId = param.dataId;
-        if (!wfDataId) {
-          wfDataId = 0;
-        } else if (!isNaN(wfDataId)) {
-          wfDataId = Number(wfDataId);
-        }
-
-        if (wfUrl == "form") {
-          let formCode = null;
-          if (param.formCode) {
-            formCode = param.formCode;
-          } else {
-            formCode = param.objTypeCode.substr(9);
-          }
-          this.param = Object.assign(param, {
-            formCode: formCode,
-            dataId: wfDataId,
-          });
-          let url = "/user/form/vform/render.vue";
-          this.wfContent = require("@base/views" + url).default;
-        } else {
-          this.param = Object.assign(param, {
-            _dataId: wfDataId,
-          });
-          let url = wfUrl + ".vue";
-          let id = wfDataId;
-          this.wfDataId = !id || typeof id == "object" ? 0 : id;
-          // this.showWfDialog = true;
-          this.showWfContent = true;
-          let res = loadViewComponent(url);
-          this.remoteView =
-            res.kind === "remote"
-              ? {
-                  owner: res.owner,
-                  targetPath: res.targetPath,
-                  bizParams: this.param,
-                  viewMeta: { visibleKey: "showWfContent", _isNotifyMessage: true },
-                }
-              : null;
-          this.wfContent = res.component;
-        }
-        this.showWfDialog2 = true;
-
-        callback && callback();
-      });
-    },
-  },
-};
-</script>
-
-<style scoped></style>
+<template>
+  <el-dialog
+    :title="$t1('查看单据流程')"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="false"
+    v-if="showWfDialog2"
+    :visible.sync="showWfDialog2"
+    :modal="false"
+    custom-class="el-dialog dialog-style designer-dialog indexUse"
+    width="100%"
+    height="100%"
+    top="0px"
+    bottom="0px"
+    :destroy-on-close="true"
+    v-el-drag-dialog
+  >
+    <div id="containt">
+      <component
+        v-if="showWfContent && wfContent"
+        :is="wfContent"
+        visible-key="showWfContent"
+        v-bind="param"
+        :_isNotifyMessage="true"
+        :parent-target="_self"
+        @reload="$reloadHandle"
+      ></component>
+      <micro-view-host
+        v-else-if="showWfContent && remoteView"
+        :owner="remoteView.owner"
+        :target-path="remoteView.targetPath"
+        :biz-params="remoteView.bizParams"
+        :view-meta="remoteView.viewMeta"
+        @reload="$reloadHandle"
+        @close="showWfContent = false"
+      ></micro-view-host>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
+export default {
+  props: {},
+  data() {
+    return {
+      showWfDialog2: false,
+      wfUrl2: "",
+      showWfContent: true,
+      wfContent: null,
+      remoteView: null,
+      wfDataId: "",
+      param: {},
+    };
+  },
+  methods: {
+    getUrlParam(url) {
+      var reg = /([^?&=]+)=([^?&=]+)/g,
+        obj = {},
+        str = url;
+      url.replace(reg, function () {
+        obj[arguments[1]] = arguments[2];
+      });
+      return obj;
+    },
+    notifyMessageRead(row, callback) {
+      if (row.readed == 0) {
+        this.$http({
+          url: USER_PREFIX + `/notify_message/read`,
+          method: `post`,
+          data: [row.id],
+          isLoading: true,
+          loadingTarget: document.body,
+          success: (res) => {
+            callback && callback();
+          },
+        });
+      } else {
+        callback && callback();
+      }
+    },
+    open(row, callback) {
+      this.notifyMessageRead(row, async () => {
+        let turl = row.jumpContent;
+        let wfUrl = turl.split("?")[0];
+        let param = this.getUrlParam(turl);
+        let wfDataId = param.dataId;
+        if (!wfDataId) {
+          wfDataId = 0;
+        } else if (!isNaN(wfDataId)) {
+          wfDataId = Number(wfDataId);
+        }
+
+        if (wfUrl == "form") {
+          let formCode = null;
+          if (param.formCode) {
+            formCode = param.formCode;
+          } else {
+            formCode = param.objTypeCode.substr(9);
+          }
+          this.param = Object.assign(param, {
+            formCode: formCode,
+            dataId: wfDataId,
+          });
+          // 路径是常量，用字面量 import：生成普通 ImportDependency，不参与 views context
+          this.wfContent = (
+            await import("@base/views/user/form/vform/render.vue")
+          ).default;
+        } else {
+          this.param = Object.assign(param, {
+            _dataId: wfDataId,
+          });
+          let url = wfUrl + ".vue";
+          let id = wfDataId;
+          this.wfDataId = !id || typeof id == "object" ? 0 : id;
+          // this.showWfDialog = true;
+          this.showWfContent = true;
+          const res = await loadViewComponentAsync(url);
+          this.remoteView =
+            res.kind === "remote"
+              ? {
+                  owner: res.owner,
+                  targetPath: res.targetPath,
+                  bizParams: this.param,
+                  viewMeta: { visibleKey: "showWfContent", _isNotifyMessage: true },
+                }
+              : null;
+          this.wfContent = res.component;
+        }
+        this.showWfDialog2 = true;
+
+        callback && callback();
+      });
+    },
+  },
+};
+</script>
+
+<style scoped></style>