cloud-web-corejs 1.0.54-dev.745 → 1.0.54-dev.746

package/src/layout/components/AppMain.vue

@@ -1,125 +1,122 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-<!--      <keep-alive :include="cachedViews"><router-view :key="key" v-if="$route.name !== 'outLink'" /></keep-alive>-->
-
-      <BaseKeepAlive :include="cachedViews">
-        <router-view :key="key" v-if="$route.name !== 'outLink'" />
-      </BaseKeepAlive>
-
-    </transition>
-    <template v-for="item in outVisitedViews">
-      <outLink
-        :ref="'ref_'+$route.path"
-        :key="item.path"
-        v-show="$route.path === item.path"
-        v-if="$route.path !== item.path || reflushFlag"
-        visible-key="reflushFlag"
-        :parent-target="_self"
-        @reload="$reloadHandle"
-      ></outLink>
-    </template>
-    <!-- 挂载子应用 开始 -->
-    <section id="Appmicro" />
-    <!-- 挂载子应用 结束 -->
-    <unreadDialog></unreadDialog>
-    <watermark></watermark>
-  </section>
-</template>
-
-<script>
-import outLink from '@base/views/user/outLink/index.vue';
-import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
-import watermark from "./watermark";
-import { isRepeatable } from "@base/utils/repeatOpen";
-
-
-export default {
-  name: 'AppMain',
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews.filter(item => item != 'outLink');
-    },
-    key() {
-      // 可重复打开的路由按 fullPath 作为 key，使多开实例相互独立；
-      // 其余保持按 path，行为与原来一致。
-      return isRepeatable(this.$route) ? this.$route.fullPath : this.$route.path;
-    },
-    outVisitedViews() {
-      let visitedViews = this.$store.state.tagsView.visitedViews;
-      return visitedViews.filter(visitedView => visitedView.name == 'outLink');
-    }
-  },
-  components: {
-    outLink,
-    unreadDialog,
-    watermark
-  },
-  data() {
-    return {
-      rIndex: -1,
-      reflushFlag: true
-    };
-  },
-  methods: {
-    reflushIframe(path) {
-      this.outVisitedViews.findIndex(item => item.full);
-    }
-  },
-  created() {
-    this.$baseEventBus.$on("reflushRouteView",(view)=>{
-      if(this.$route.name=="outLink"){
-        let t = this.$refs["ref_"+this.$route.path][0];
-        t.$baseReload();
-      }else{
-        this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-          const { fullPath } = view
-          this.$nextTick(() => {
-            this.$router.replace({
-              path: '/redirect' + fullPath
-            })
-          })
-        })
-      }
-    })
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.app-main {
-  /* 45= navbar  45  */
-  //min-height: calc(100vh - 45px);
-  height:calc(100vh - 10px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
-  > div{
-    height:100%;
-  }
-}
-
-.fixed-header + .app-main {
-  padding-top: 32px;
-}
-
-.hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 45 + 34 */
-    min-height: calc(100vh - 79px);
-  }
-
-  .fixed-header + .app-main {
-    padding-top: 79px;
-  }
-}
-</style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 15px;
-  }
-}
-</style>
+<template>
+  <section class="app-main">
+    <transition name="fade-transform" mode="out-in">
+<!--      <keep-alive :include="cachedViews"><router-view :key="key" v-if="$route.name !== 'outLink'" /></keep-alive>-->
+
+      <BaseKeepAlive :include="cachedViews">
+        <router-view :key="key" v-if="$route.name !== 'outLink'" />
+      </BaseKeepAlive>
+
+    </transition>
+    <template v-for="item in outVisitedViews">
+      <outLink
+        :ref="'ref_'+$route.path"
+        :key="item.path"
+        v-show="$route.path === item.path"
+        v-if="$route.path !== item.path || reflushFlag"
+        visible-key="reflushFlag"
+        :parent-target="_self"
+        @reload="$reloadHandle"
+      ></outLink>
+    </template>
+    <!-- 挂载子应用 开始 -->
+    <section id="Appmicro" />
+    <!-- 挂载子应用 结束 -->
+    <unreadDialog></unreadDialog>
+    <watermark></watermark>
+  </section>
+</template>
+
+<script>
+import outLink from '@base/views/user/outLink/index.vue';
+import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
+import watermark from "./watermark";
+import { isRepeatable } from "@base/utils/repeatOpen";
+
+
+export default {
+  name: 'AppMain',
+  computed: {
+    cachedViews() {
+      return this.$store.state.tagsView.cachedViews.filter(item => item != 'outLink');
+    },
+    key() {
+      // 可重复打开的路由按 fullPath 作为 key，使多开实例相互独立；
+      // 其余保持按 path，行为与原来一致。
+      return isRepeatable(this.$route) ? this.$route.fullPath : this.$route.path;
+    },
+    outVisitedViews() {
+      let visitedViews = this.$store.state.tagsView.visitedViews;
+      return visitedViews.filter(visitedView => visitedView.name == 'outLink');
+    }
+  },
+  components: {
+    outLink,
+    unreadDialog,
+    watermark
+  },
+  data() {
+    return {
+      rIndex: -1,
+      reflushFlag: true
+    };
+  },
+  methods: {
+    reflushIframe(path) {
+      this.outVisitedViews.findIndex(item => item.full);
+    }
+  },
+  created() {
+    this.$baseEventBus.$on("reflushRouteView",(view)=>{
+      if(this.$route.name=="outLink"){
+        let t = this.$refs["ref_"+this.$route.path][0];
+        t.$baseReload();
+      }else{
+        this.$store.dispatch('tagsView/delCachedView', view).then(() => {
+          const { fullPath } = view
+          this.$nextTick(() => {
+            this.$router.replace({
+              path: '/redirect' + fullPath
+            })
+          })
+        })
+      }
+    })
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.app-main {
+  /* 45= navbar  45  */
+  //min-height: calc(100vh - 45px);
+  height:calc(100vh - 10px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.fixed-header + .app-main {
+  padding-top: 32px;
+}
+
+.hasTagsView {
+  .app-main {
+    /* 84 = navbar + tags-view = 45 + 34 */
+    min-height: calc(100vh - 79px);
+  }
+
+  .fixed-header + .app-main {
+    padding-top: 79px;
+  }
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 15px;
+  }
+}
+</style>

package/src/layout/components/extractedCode/viewDialog.vue

@@ -1,207 +1,207 @@
-<template>
-  <el-dialog
-    :title="title"
-    :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"
-        @openDesignDialog="openDesingerDialogByChild"
-      ></component>
-      <el-drawer
-        :title="$t1('表单设计({formName})', { formName })"
-        :visible.sync="showDesingerDialog"
-        :modal="false"
-        :destroy-on-close="true"
-        size="100%"
-        direction="rtl"
-        :before-close="closeFormDesignwinEvent"
-        :append-to-body="false"
-        class="designer-drawer"
-        :class="[isFullscreen ? 'is-fullscreen' : '']"
-        @close="handleFormDesignClose"
-      >
-        <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
-          <el-tab-pane :label="$t1('设计器')" name="first">
-            <designer
-              ref="designer"
-              :formCode.sync="formCode"
-              :readonly="true"
-              @reflushTemplateList="reflushTemplateList"
-            ></designer>
-          </el-tab-pane>
-        </el-tabs>
-        <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
-          <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
-            <i class="iconfont icon-quanping"></i>
-          </el-tooltip>
-        </el-button>
-        <el-button class="isFullIcon" v-else @click="handleFullscreen">
-          <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
-            <i class="iconfont icon-suoxiao"></i>
-          </el-tooltip>
-        </el-button>
-      </el-drawer>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import indexUtil from "@base/utils";
-import designer from "@base/views/user/form/vform/designer.vue";
-
-export default {
-  name: "wfContentDialog",
-  props: {
-    extractedRow: Object,
-  },
-  components: { designer },
-  data() {
-    return {
-      param: {},
-      wfContent: null,
-      showWfContent: false,
-      showWfDialog: true,
-
-      showDesingerDialog: false,
-      formCode: null,
-      formName: null,
-      isFullscreen: false,
-      formDesTabs: "first",
-      title: null,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.openWfDialog();
-    });
-  },
-  methods: {
-    wfClose() {
-      this.showWfDialog = false;
-      this.$emit("update:visible", false);
-      this.$emit("close");
-    },
-    openWfDialog() {
-      let obj = this.extractedRow?.obj;
-      if (!obj) return;
-      let objType = this.extractedRow.objType;
-      let id = obj.id;
-      let wfDataId = id;
-      let param = {
-        readonly: true,
-      };
-
-      let url;
-      if (objType == "FormTemplate") {
-        url = "/bd/setting/form_template/edit.vue";
-        wfDataId = obj.formCode;
-        this.title = this.$t1("查看表单模板");
-      } else if (objType == "FormScript") {
-        if (obj.scriptType == 1) {
-          url = "/bd/setting/form_script/edit1.vue";
-        } else {
-          url = "/bd/setting/form_script/edit.vue";
-        }
-        this.title = this.$t1("查看表单脚本");
-      } else if (objType == "TableTemplate") {
-        url = "/bd/setting/table_model/edit.vue";
-        this.title = this.$t1("查看数据表定义模板");
-      }
-      this.param = Object.assign(param, {
-        _dataId: wfDataId,
-        extractedObj: obj,
-      });
-      this.wfContent = require("@base/views" + url).default;
-
-      this.showWfContent = true;
-    },
-
-    handleFormDesignClose() {
-      this.formDesTabs = "first";
-      this.showFormScriptList = false;
-    },
-    openDesingerDialog(row, callback) {
-      this.formCode = row.formCode;
-      this.formName = row.formName;
-      this.currentFormTemplate = row;
-      this.isFullscreen = false;
-      this.showDesingerDialog = true;
-      this.designerSaveCallback = callback ?? null;
-    },
-    openDesingerDialogByChild({ row, callback }) {
-      this.openDesingerDialog(row, callback);
-    },
-    reflushTemplateList() {
-      // this.searchEvent();
-      this.designerSaveCallback && this.designerSaveCallback();
-    },
-    handleFullscreen() {
-      let isFullscreen = this.isFullscreen;
-      if (!isFullscreen) {
-        indexUtil.addClass(document.body, "hideMenu");
-      } else {
-        indexUtil.removeClass(document.body, "hideMenu");
-      }
-      this.isFullscreen = !isFullscreen;
-    },
-    closeFormDesignwinEvent(done) {
-      this.$baseConfirm(this.$t1('请确认"已保存"报表模板，是否继续关闭？')).then(() => {
-        indexUtil.removeClass(document.body, "hideMenu");
-        done && done();
-      });
-    },
-  },
-};
-</script>
-
-<style scoped>
-::v-deep .tab-boxOnly > .el-tabs__header {
-  position: absolute;
-  right: 130px;
-  top: 0;
-}
-/*
-::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 158px) !important;
-  }
-
-  .grid-height {
-    height: calc(100vh - 126px) !important;
-  }
-}
-
-::v-deep
-  .designer-drawer.is-fullscreen
-  .tab-boxOnly
-  > .el-tabs__content
-  .el-tab-pane
-  .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 116px) !important;
-  }
-
-  .grid-height {
-    height: calc(100vh - 84px) !important;
-  }
-} */
-</style>
+<template>
+  <el-dialog
+    :title="title"
+    :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"
+        @openDesignDialog="openDesingerDialogByChild"
+      ></component>
+      <el-drawer
+        :title="$t1('表单设计({formName})', { formName })"
+        :visible.sync="showDesingerDialog"
+        :modal="false"
+        :destroy-on-close="true"
+        size="100%"
+        direction="rtl"
+        :before-close="closeFormDesignwinEvent"
+        :append-to-body="false"
+        class="designer-drawer"
+        :class="[isFullscreen ? 'is-fullscreen' : '']"
+        @close="handleFormDesignClose"
+      >
+        <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
+          <el-tab-pane :label="$t1('设计器')" name="first">
+            <designer
+              ref="designer"
+              :formCode.sync="formCode"
+              :readonly="true"
+              @reflushTemplateList="reflushTemplateList"
+            ></designer>
+          </el-tab-pane>
+        </el-tabs>
+        <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
+          <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
+            <i class="iconfont icon-quanping"></i>
+          </el-tooltip>
+        </el-button>
+        <el-button class="isFullIcon" v-else @click="handleFullscreen">
+          <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
+            <i class="iconfont icon-suoxiao"></i>
+          </el-tooltip>
+        </el-button>
+      </el-drawer>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import indexUtil from "@base/utils";
+import designer from "@base/views/user/form/vform/designer.vue";
+
+export default {
+  name: "wfContentDialog",
+  props: {
+    extractedRow: Object,
+  },
+  components: { designer },
+  data() {
+    return {
+      param: {},
+      wfContent: null,
+      showWfContent: false,
+      showWfDialog: true,
+
+      showDesingerDialog: false,
+      formCode: null,
+      formName: null,
+      isFullscreen: false,
+      formDesTabs: "first",
+      title: null,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.openWfDialog();
+    });
+  },
+  methods: {
+    wfClose() {
+      this.showWfDialog = false;
+      this.$emit("update:visible", false);
+      this.$emit("close");
+    },
+    openWfDialog() {
+      let obj = this.extractedRow?.obj;
+      if (!obj) return;
+      let objType = this.extractedRow.objType;
+      let id = obj.id;
+      let wfDataId = id;
+      let param = {
+        readonly: true,
+      };
+
+      let url;
+      if (objType == "FormTemplate") {
+        url = "/bd/setting/form_template/edit.vue";
+        wfDataId = obj.formCode;
+        this.title = this.$t1("查看表单模板");
+      } else if (objType == "FormScript") {
+        if (obj.scriptType == 1) {
+          url = "/bd/setting/form_script/edit1.vue";
+        } else {
+          url = "/bd/setting/form_script/edit.vue";
+        }
+        this.title = this.$t1("查看表单脚本");
+      } else if (objType == "TableTemplate") {
+        url = "/bd/setting/table_model/edit.vue";
+        this.title = this.$t1("查看数据表定义模板");
+      }
+      this.param = Object.assign(param, {
+        _dataId: wfDataId,
+        extractedObj: obj,
+      });
+      this.wfContent = require("@base/views" + url).default;
+
+      this.showWfContent = true;
+    },
+
+    handleFormDesignClose() {
+      this.formDesTabs = "first";
+      this.showFormScriptList = false;
+    },
+    openDesingerDialog(row, callback) {
+      this.formCode = row.formCode;
+      this.formName = row.formName;
+      this.currentFormTemplate = row;
+      this.isFullscreen = false;
+      this.showDesingerDialog = true;
+      this.designerSaveCallback = callback ?? null;
+    },
+    openDesingerDialogByChild({ row, callback }) {
+      this.openDesingerDialog(row, callback);
+    },
+    reflushTemplateList() {
+      // this.searchEvent();
+      this.designerSaveCallback && this.designerSaveCallback();
+    },
+    handleFullscreen() {
+      let isFullscreen = this.isFullscreen;
+      if (!isFullscreen) {
+        indexUtil.addClass(document.body, "hideMenu");
+      } else {
+        indexUtil.removeClass(document.body, "hideMenu");
+      }
+      this.isFullscreen = !isFullscreen;
+    },
+    closeFormDesignwinEvent(done) {
+      this.$baseConfirm(this.$t1('请确认"已保存"报表模板，是否继续关闭？')).then(() => {
+        indexUtil.removeClass(document.body, "hideMenu");
+        done && done();
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+::v-deep .tab-boxOnly > .el-tabs__header {
+  position: absolute;
+  right: 130px;
+  top: 0;
+}
+/*
+::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
+  .detail-wrap .d-cont {
+    height: calc(100vh - 158px) !important;
+  }
+
+  .grid-height {
+    height: calc(100vh - 126px) !important;
+  }
+}
+
+::v-deep
+  .designer-drawer.is-fullscreen
+  .tab-boxOnly
+  > .el-tabs__content
+  .el-tab-pane
+  .el-tab-pane {
+  .detail-wrap .d-cont {
+    height: calc(100vh - 116px) !important;
+  }
+
+  .grid-height {
+    height: calc(100vh - 84px) !important;
+  }
+} */
+</style>