cloud-web-corejs 1.0.54-dev.63 → 1.0.54-dev.630

package/src/views/bd/setting/formVersion/compareDialog.vue

@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <el-dialog
+      :title="$t1(title)"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showDialog"
+      :modal="falseValue"
+      custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+      width="1200px"
+      @close="dialogClose"
+      v-el-drag-dialog
+      v-el-dialog-center
+      :fullscreen="true"
+    >
+      <div
+        class="cont"
+        id="containt"
+        style="height: calc(100vh - 58px); overflow: hidden"
+      >
+        <el-row :gutter="20" style="height: 100%">
+          <el-col :span="12">
+            <el-container>
+              <el-header>版本号：{{ preRow.version }}</el-header>
+              <el-main>
+                <component
+                  :is="compareContent"
+                  v-if="showCompareContent1"
+                  visible-key="showCompareContent1"
+                  :hData="compareHData1"
+                  :parent-target="_self"
+                  @reload="$reloadHandle"
+                  @openDesignDialog="openDesingerDialogByChild"
+                  @reverCallback="reverCallback"
+                ></component>
+              </el-main>
+            </el-container>
+          </el-col>
+          <el-col :span="12">
+            <el-container>
+              <el-header>版本号：{{ curRow.version }}</el-header>
+              <el-main>
+                <component
+                  :is="compareContent"
+                  v-if="showCompareContent2"
+                  visible-key="showCompareContent2"
+                  :hData="compareHData2"
+                  :parent-target="_self"
+                  @reload="$reloadHandle"
+                  @openDesignDialog="openDesingerDialogByChild"
+                  :isCompare="true"
+                  :compareHData="compareHData1"
+                  @reverCallback="reverCallback"
+                ></component>
+              </el-main>
+            </el-container>
+          </el-col>
+        </el-row>
+      </div>
+      <formDesignerDialog
+        ref="formDesignerDialog"
+        v-if="showDesingerDialog"
+        :visiable.sync="showDesingerDialog"
+        :formName="formName"
+        :formCode="formCode"
+        @reflushTemplateList="reflushTemplateList"
+        :readonly="designerReadonly"
+        :showFormScript="false"
+        :historyFlag="true"
+        :jsonFlag="true"
+        :formTemplate="currentFormTemplate"
+      ></formDesignerDialog>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "compareDialog",
+  props: ["visiable", "objType", "objCode", "relationCode", "preRow", "curRow"],
+  components: {
+    formDesignerDialog: () =>
+      import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
+    FormTemplateEdit: () => import("@base/views/bd/setting/form_template/edit.vue"),
+    FormScriptEdit: () => import("@base/views/bd/setting/form_script/edit.vue"),
+    FormScriptEdit1: () => import("@base/views/bd/setting/form_script/edit1.vue"),
+    SzTaMbEdit: () => import("@base/views/bd/setting/table_model/edit.vue"),
+  },
+  created() {
+    // this.initSetting();
+    this.initTitle();
+    this.compare();
+  },
+  mounted() {},
+  data() {
+    return {
+      showEdit: false,
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {},
+      showSaleOrgDialog: false,
+      activeName: "second",
+
+      editContent: null,
+      hData: null,
+
+      formCode: null,
+      formName: null,
+      currentFormTemplate: null,
+      isFullscreen: false,
+      designerReadonly: false,
+      showDesingerDialog: false,
+
+      showFormScriptList: false,
+      formDesTabs: "first",
+      title: "历史列表",
+
+      showCompareDialog: false,
+      compareContent: null,
+      showCompareContent1: false,
+      showCompareContent2: false,
+      compareHData1: null,
+      compareHData2: null,
+    };
+  },
+  watch: {
+    formDesTabs(val) {
+      if (this.showFormScriptList == false && val == "second") {
+        this.showFormScriptList = true;
+      }
+    },
+  },
+  methods: {
+    compare() {
+      let map = {
+        FormTemplate: "FormTemplateEdit",
+        FormScript: "FormScriptEdit",
+        SzTaMb: "SzTaMbEdit",
+      };
+      let scriptTypeMap = {
+        0: "FormScriptEdit",
+        1: "FormScriptEdit1",
+      };
+
+      this.compareHData1 = JSON.parse(this.preRow.content);
+      this.compareHData2 = JSON.parse(this.curRow.content);
+      if (this.objType === "FormScript") {
+        this.compareContent = scriptTypeMap[this.compareHData1.scriptType];
+      } else {
+        this.compareContent = map[this.objType];
+      }
+      this.showCompareContent1 = true;
+      this.showCompareContent2 = true;
+    },
+    initTitle() {
+      let titleMap = {
+        FormTemplate: "表单模板历史版本对比",
+        FormScript: "逻辑脚本历史版本对比",
+        SzTaMb: "数据表历史版本对比",
+      };
+      this.title = titleMap[this.objType];
+    },
+    openEditView(row) {
+      this.$http({
+        url: USER_PREFIX + "/formVersion/get",
+        method: "post",
+        data: {
+          id: row.id,
+        },
+        success: (res) => {
+          let objx = res.objx;
+          let hData = JSON.parse(objx.content);
+          this.hData = hData;
+          let map = {
+            FormTemplate: FormTemplateEdit,
+            FormScript: FormScriptEdit,
+            SzTaMb: SzTaMbEdit,
+          };
+          let scriptTypeMap = {
+            0: FormScriptEdit,
+            1: FormScriptEdit1,
+          };
+          if (row.objType === "FormScript") {
+            this.editContent = scriptTypeMap[hData.scriptType];
+          } else {
+            this.editContent = map[row.objType];
+          }
+          this.activeName = "first";
+          this.$openEditView("showEdit");
+        },
+      });
+    },
+    rever(row) {},
+    openDesingerDialog(row, callback, readonly = false) {
+      this.formCode = row.formCode;
+      this.formName = row.formName + " - " + row.version;
+      this.currentFormTemplate = row;
+      this.isFullscreen = false;
+
+      this.designerReadonly = readonly;
+      this.showDesingerDialog = true;
+      this.designerSaveCallback = callback ?? null;
+    },
+    openDesingerDialogByChild({ row, readonly, callback }) {
+      this.openDesingerDialog(row, callback, readonly);
+    },
+    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;
+    },
+    handleFormDesignClose() {
+      this.formDesTabs = "first";
+      this.showFormScriptList = false;
+    },
+    reverCallback() {
+      this.$emit("reverCallback");
+      this.dialogClose();
+    },
+    dialogClose() {
+      this.showCompareDialog = false;
+      this.$emit("close");
+      this.$emit("update:visiable", false);
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.grid-height {
+  height: calc(100vh - 162px) !important;
+}
+::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;
+  }
+}
+.el-header {
+  background-color: #b3c0d1;
+  color: #333;
+  text-align: center;
+  line-height: 30px;
+  font-size: 15px;
+  height: 30px !important;
+}
+.el-main {
+  padding-bottom: 0px;
+}
+::v-deep .detail-wrap .d-cont {
+  height: calc(100vh - 158px) !important;
+}
+</style>

package/src/views/bd/setting/formVersion/fieldCompare.vue

@@ -0,0 +1,54 @@
+<template>
+  <span :class="{ tipsOldVal: isCompare && hasChange() }">
+    <el-popover
+      placement="top-start"
+      width="200"
+      trigger="hover"
+      v-if="isCompare && hasChange()"
+      :disabled="!hasHData"
+    >
+      <div class="f12 d-txt">{{ $t1("变更前") }}：{{ oldVal }}</div>
+      <div slot="reference" class="icon">
+        <i class="el-icon-warning" :class="{ hasNoHData: !hasHData }"></i>
+      </div>
+    </el-popover>
+    <slot></slot>
+  </span>
+</template>
+
+<script>
+export default {
+  name: "fieldCompare",
+  props: {
+    oldVal: [String, Number, Boolean],
+    newVal: [String, Number, Boolean],
+    hasHData: {
+      type: Boolean,
+      default: true,
+    },
+    isCompare: Boolean,
+  },
+  methods: {
+    isNull(val) {
+      return val == null || val == "" || val == undefined;
+    },
+    hasChange() {
+      if (this.isNull(this.oldVal) && this.isNull(this.newVal)) return false;
+      return this.oldVal !== this.newVal;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.hasNoHData {
+  color: #30b08f !important;
+}
+
+.d-txt {
+  white-space: pre-line;
+}
+.el-icon-warning {
+  z-index: 5;
+}
+</style>