cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

package/src/views/user/wf/wf_manage/wfContentDialog.vue

@@ -1,134 +1,185 @@
-<template>
-  <el-dialog
-    :title="$t1('查看单据流程')"
-    :append-to-body="true"
-    :modal-append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="showWfDialog"
-    :modal="false"
-    custom-class="el-dialog dialog-style designer-dialog indexUse"
-    width="100%"
-    height="100%"
-    top="0px"
-    bottom="0px"
-    :destroy-on-close="true"
-    @close="wfClose"
-  >
-    <div id="containt">
-      <component
-        v-if="showWfContent && wfContent"
-        :is="wfContent"
-        visible-key="showWfContent"
-        v-bind="param"
-        :parent-target="_self"
-        :defaultShowWfContent="true"
-        :_viewType="1"
-        @reload="$reloadHandle"
-        :_handleCallback="handleCallback"
-      ></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"
-        @handle-callback="handleCallback"
-        @close="showWfContent = false"
-      ></micro-view-host>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
+<template>
+  <el-dialog
+    :title="$t1('查看单据流程')"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="showWfDialog"
+    :modal="false"
+    custom-class="el-dialog dialog-style designer-dialog indexUse wf-content-dialog"
+    width="100%"
+    height="100%"
+    top="0px"
+    bottom="0px"
+    :destroy-on-close="true"
+    @close="wfClose"
+  >
+    <div id="containt">
+      <component
+        v-if="showWfContent && wfContent"
+        :is="wfContent"
+        visible-key="showWfContent"
+        v-bind="param"
+        :parent-target="_self"
+        :defaultShowWfContent="true"
+        :_viewType="1"
+        @reload="$reloadHandle"
+        :_handleCallback="handleCallback"
+      ></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"
+        @handle-callback="handleCallback"
+        @close="showWfContent = false"
+      ></micro-view-host>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
 import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
-export default {
-  name: "wfContentDialog",
-  props: {
-    option: {
-      type: Object,
-      default: {},
-    },
-  },
-  components: {},
-  data() {
-    return {
-      param: {},
-      wfContent: null,
-      remoteView: null,
+import { getChunkLoadErrorMessage } from "@base/utils/chunkLoadError";
+export default {
+  name: "wfContentDialog",
+  props: {
+    option: {
+      type: Object,
+      default: {},
+    },
+  },
+  components: {},
+  data() {
+    return {
+      param: {},
+      wfContent: null,
+      remoteView: null,
       showWfContent: false,
       showWfDialog: true,
-    };
-  },
-  created() {
-    this.openWfDialog();
-  },
-  methods: {
-    handleCallback(flag) {
-      if ([1, 2, 3, 4].includes(flag)) {
-        this.$http({
-          url: USER_PREFIX + "/wf_diy_attribute/getValue",
-          method: `post`,
-          data: { attributeKey: "param4" },
-          isLoading: true,
-          success: (res) => {
-            let val = res.objx || false;
-            this.option._handleCallback && this.option._handleCallback(flag);
-            if (val === true) {
-              this.wfClose();
-            }
-          },
-        });
-      } else {
-        this.option._handleCallback && this.option._handleCallback(flag);
-      }
-    },
-    wfClose() {
-      this.showWfDialog = false;
-      this.$emit("update:visible", false);
-      this.$emit("close");
-    },
-    // 异步：await 之后才置 showWfContent（见方法末尾），否则弹窗先开出空壳
+      contentLoading: false,
+    };
+  },
+  created() {
+    this.openWfDialog();
+  },
+  methods: {
+    handleCallback(flag) {
+      if ([1, 2, 3, 4].includes(flag)) {
+        this.$http({
+          url: USER_PREFIX + "/wf_diy_attribute/getValue",
+          method: `post`,
+          data: { attributeKey: "param4" },
+          isLoading: true,
+          success: (res) => {
+            let val = res.objx || false;
+            this.option._handleCallback && this.option._handleCallback(flag);
+            if (val === true) {
+              this.wfClose();
+            }
+          },
+        });
+      } else {
+        this.option._handleCallback && this.option._handleCallback(flag);
+      }
+    },
+    wfClose() {
+      this.showWfDialog = false;
+      this.$emit("update:visible", false);
+      this.$emit("close");
+    },
+    // 异步：await 之后才置 showWfContent（见方法末尾），否则弹窗先开出空壳
     async openWfDialog() {
-      let id = this.option.objId;
-      let wfDataId = !id || typeof id == "object" ? 0 : Number(id);
-      let param = this.option.param || {};
-      if (this.option.url == "form") {
-        let formCode = null;
-        if (this.option.formCode) {
-          formCode = this.option.formCode;
+      if (this.contentLoading) return;
+      this.contentLoading = true;
+      this.showWfContent = false;
+      this.wfContent = null;
+      this.remoteView = null;
+      const loading = this.$loading({
+        lock: true,
+        text: this.$t1("待办详情加载中..."),
+        background: "rgba(255, 255, 255, 0.65)"
+      });
+      try {
+        let id = this.option.objId;
+        let wfDataId = !id || typeof id == "object" ? 0 : Number(id);
+        let param = this.option.param || {};
+        if (this.option.url == "form") {
+          let formCode = null;
+          if (this.option.formCode) {
+            formCode = this.option.formCode;
+          } else {
+            formCode = this.option.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 {
-          formCode = this.option.objTypeCode.substr(9);
+          this.param = Object.assign(param, {
+            _dataId: wfDataId,
+          });
+          let url = this.option.url + ".vue";
+          const res = await loadViewComponentAsync(url);
+          if (res.error) throw res.error;
+          this.remoteView =
+            res.kind === "remote"
+              ? {
+                  owner: res.owner,
+                  targetPath: res.targetPath,
+                  bizParams: this.param,
+                  viewMeta: { visibleKey: "showWfContent", defaultShowWfContent: true, viewType: 1 },
+                }
+              : null;
+          this.wfContent = res.component;
+          if (!this.wfContent && !this.remoteView) {
+            throw new Error("待办详情组件不存在或未正确配置");
+          }
         }
-        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 = this.option.url + ".vue";
-        const res = await loadViewComponentAsync(url);
-        this.remoteView =
-          res.kind === "remote"
-            ? {
-                owner: res.owner,
-                targetPath: res.targetPath,
-                bizParams: this.param,
-                viewMeta: { visibleKey: "showWfContent", defaultShowWfContent: true, viewType: 1 },
-              }
-            : null;
-        this.wfContent = res.component;
+        this.showWfContent = true;
+      } catch (error) {
+        console.error("[wf-content-dialog] 待办详情加载失败：", error);
+        this.$message.error(getChunkLoadErrorMessage(error, "待办详情"));
+        this.wfClose();
+      } finally {
+        loading.close();
+        this.contentLoading = false;
       }
-      this.showWfContent = true;
-    },
-  },
-};
-</script>
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+/*
+ * 待办详情弹框只允许详情正文滚动。
+ *
+ * vform 的宿主比普通详情页多两层 div；如果高度链断掉，.designer-view 会退化成
+ * 实际滚动容器，详情标题栏和绝对定位的模块导航就会一起被卷走。
+ */
+.wf-content-dialog > .el-dialog__body > #containt {
+  > div,
+  > div > .designer-view,
+  > div > .designer-view > div,
+  > div > .designer-view > div > .render-form {
+    height: 100%;
+    min-height: 0;
+    box-sizing: border-box;
+  }
+
+  > div > .designer-view {
+    overflow: hidden;
+  }
 
-<style scoped></style>
+  > div > .designer-view > div > .render-form > .container-wrapper {
+    height: 100%;
+    min-height: 0;
+  }
+}
+</style>

package/src/views/user/wf/wf_obj_config/activiti_wf.vue

@@ -1,133 +1,134 @@
-<template>
-  <div>
-    <iframe :src="wfUrl" :style="'width:100%;height:' + ($root.$el.clientHeight - 30 - 12) + 'px'"></iframe>
-    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser"
-                :multi.sync="wfAssignMulti"/>
-    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmPosition"/>
-  </div>
-</template>
-
-<script>
-import userDialog from '../../../../views/user/user/dialog.vue';
-import positionDialog from '../../../../views/user/position/dialog.vue';
-
-export default {
-  name: "activiti_wf",
-  components: {
-    userDialog,
-    positionDialog
-  },
-  data() {
-    return {
-      dataId: 0,
-      showEdit: false,
-      showItemEdit: false,
-      vxeOption: {},
-      vxeOption1: {},
-      formData: {},
-      editId: '',
-      itemEditId: '',
-      pRow: '',
-      activeName: 'second',
-      currentRow: {},
-      itemServiceId: null,
-
-      showWfDialog: false,
-      wfUrl: '',
-      ph: '',
-      dialogActiveName: 'first',
-      showFunctionScriptList: false,
-      showUserDialog: false,
-      wfAssignData: [],
-      wfAssignCallback: null,
-      wfAssignMulti: true,
-
-      showPositionDialog: false,
-      wfAssignPositionData: [],
-      wfAssignPositionCallback: null,
-
-      showFormTemplateDialog: false,
-      wfAssignFormTemplateCallback: null,
-
-      modelId: null,
-      serviceId: 'sf-cloud-user'
-    };
-  },
-  mounted() {
-    this.initToken(() => {
-      this.initModel();
-      this.initWfWinParam();
-      this.$nextTick(() => {
-        this.wfEdit();
-      })
-    })
-  },
-  methods: {
-    initModel() {
-      this.modelId = this.$route.query.modelId;
-    },
-    initToken(callback) {
-      let token = 'c7f08670-5190-4d72-b5fc-a91021524d59';
-      this.$store
-        .dispatch('user/addToken', {
-          token
-        })
-        .then(() => {
-          setTimeout(() => {
-            callback();
-          }, 200);
-        });
-    },
-    wfEdit() {
-      //wfType 0:单据流程，1：场景流程
-      this.wfUrl = WEB_PREFIX + '/activiti-explorer/modeler.html?wfType=1&serviceId=' + this.serviceId + '&modelId=' + this.modelId;
-      this.dialogActiveName = 'first';
-      this.showWfDialog = true;
-    },
-    initWfWinParam() {
-      this.initCloseWfDesignWin();
-      this.initWinUserDialog();
-      this.initWinPositionDialog();
-      this.initSysParamForWf();
-    },
-    initCloseWfDesignWin() {
-      window.closeWfDesignWin = () => {
-        this.showWfDialog = false;
-      };
-    },
-    initWinUserDialog() {
-      window.openAssignUserDialog = opts => {
-        this.wfAssignMulti = opts.multi;
-        this.wfAssignData = opts.data || [];
-        this.wfAssignCallback = opts.callback;
-        this.showUserDialog = true;
-      };
-    },
-    confirmUser(rows) {
-      this.wfAssignCallback(rows);
-    },
-    initWinPositionDialog() {
-      window.openAssignPositionDialog = opts => {
-        this.wfAssignPositionData = opts.data || [];
-        this.wfAssignPositionCallback = opts.callback;
-        this.showPositionDialog = true;
-      };
-    },
-    initSysParamForWf() {
-      let webPrefix = WEB_PREFIX;
-      let baseApi = process.env.VUE_APP_BASE_API;
-      window.sysParamForWf = {
-        webPrefix,
-        baseApi
-      }
-    },
-    confirmPosition(rows) {
-      this.wfAssignPositionCallback(rows);
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div>
+    <iframe :src="wfUrl" :style="'width:100%;height:' + ($root.$el.clientHeight - 30 - 12) + 'px'"></iframe>
+    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser"
+                :multi.sync="wfAssignMulti"/>
+    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmPosition"/>
+  </div>
+</template>
+
+<script>
+import userDialog from '../../../../views/user/user/dialog.vue';
+import positionDialog from '../../../../views/user/position/dialog.vue';
+import { workflowDesignerUrl } from "@base/utils/featureResources";
+
+export default {
+  name: "activiti_wf",
+  components: {
+    userDialog,
+    positionDialog
+  },
+  data() {
+    return {
+      dataId: 0,
+      showEdit: false,
+      showItemEdit: false,
+      vxeOption: {},
+      vxeOption1: {},
+      formData: {},
+      editId: '',
+      itemEditId: '',
+      pRow: '',
+      activeName: 'second',
+      currentRow: {},
+      itemServiceId: null,
+
+      showWfDialog: false,
+      wfUrl: '',
+      ph: '',
+      dialogActiveName: 'first',
+      showFunctionScriptList: false,
+      showUserDialog: false,
+      wfAssignData: [],
+      wfAssignCallback: null,
+      wfAssignMulti: true,
+
+      showPositionDialog: false,
+      wfAssignPositionData: [],
+      wfAssignPositionCallback: null,
+
+      showFormTemplateDialog: false,
+      wfAssignFormTemplateCallback: null,
+
+      modelId: null,
+      serviceId: 'sf-cloud-user'
+    };
+  },
+  mounted() {
+    this.initToken(() => {
+      this.initModel();
+      this.initWfWinParam();
+      this.$nextTick(() => {
+        this.wfEdit();
+      })
+    })
+  },
+  methods: {
+    initModel() {
+      this.modelId = this.$route.query.modelId;
+    },
+    initToken(callback) {
+      let token = 'c7f08670-5190-4d72-b5fc-a91021524d59';
+      this.$store
+        .dispatch('user/addToken', {
+          token
+        })
+        .then(() => {
+          setTimeout(() => {
+            callback();
+          }, 200);
+        });
+    },
+    wfEdit() {
+      //wfType 0:单据流程，1：场景流程
+      this.wfUrl = workflowDesignerUrl({ wfType: 1, serviceId: this.serviceId, modelId: this.modelId, baseApi: process.env.VUE_APP_BASE_API });
+      this.dialogActiveName = 'first';
+      this.showWfDialog = true;
+    },
+    initWfWinParam() {
+      this.initCloseWfDesignWin();
+      this.initWinUserDialog();
+      this.initWinPositionDialog();
+      this.initSysParamForWf();
+    },
+    initCloseWfDesignWin() {
+      window.closeWfDesignWin = () => {
+        this.showWfDialog = false;
+      };
+    },
+    initWinUserDialog() {
+      window.openAssignUserDialog = opts => {
+        this.wfAssignMulti = opts.multi;
+        this.wfAssignData = opts.data || [];
+        this.wfAssignCallback = opts.callback;
+        this.showUserDialog = true;
+      };
+    },
+    confirmUser(rows) {
+      this.wfAssignCallback(rows);
+    },
+    initWinPositionDialog() {
+      window.openAssignPositionDialog = opts => {
+        this.wfAssignPositionData = opts.data || [];
+        this.wfAssignPositionCallback = opts.callback;
+        this.showPositionDialog = true;
+      };
+    },
+    initSysParamForWf() {
+      let webPrefix = WEB_PREFIX;
+      let baseApi = process.env.VUE_APP_BASE_API;
+      window.sysParamForWf = {
+        webPrefix,
+        baseApi
+      }
+    },
+    confirmPosition(rows) {
+      this.wfAssignPositionCallback(rows);
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/views/user/wf/wf_obj_config/importItemDialog.vue

@@ -20,7 +20,7 @@
           </div>
         </el-upload>
         <div class="upload-finish" v-if="fileRaw">
-          <img :src="$assetUrl(require('@/resources' + '/images/ico-txt.svg'))" class="ico"/>
+          <img :src="$assetUrl(require('@base/core-resources' + '/images/ico-txt.svg'))" class="ico"/>
           <p class="name">{{ fileRaw.name }}</p>
           <!-- <p>2022-1-17</p> -->
           <el-tooltip :enterable="false" class="item" effect="dark"