cloud-web-corejs 1.0.249 → 1.0.251

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

@@ -0,0 +1,88 @@
+<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 nopd0 form-version-compare-dialog"
+      width="1200px"
+      @close="dialogClose"
+      v-el-drag-dialog
+      v-el-dialog-center
+      :fullscreen="true"
+    >
+      <div
+        class="cont compare-dialog-cont"
+        style="height: calc(100vh - 48px); overflow: auto"
+      >
+        <compareContent
+          v-if="compareReady"
+          :objType="objType"
+          :objCode="objCode"
+          :compareHData1="compareHData1"
+          :compareHData2="compareHData2"
+          :preVersion="preVersion"
+          :curVersion="curVersion"
+          @reverCallback="reverCallback"
+        />
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "compareDialog",
+  props: ["visiable", "objType", "objCode", "relationCode", "preRow", "curRow"],
+  components: {
+    compareContent: () => import("./compareContent.vue"),
+  },
+  data() {
+    return {
+      showDialog: true,
+      falseValue: false,
+      title: "",
+      compareHData1: null,
+      compareHData2: null,
+      preVersion: null,
+      curVersion: null,
+      compareReady: false,
+    };
+  },
+  created() {
+    this.initTitle();
+    this.initCompare();
+  },
+  methods: {
+    initCompare() {
+      if (!this.preRow?.content || !this.curRow?.content) {
+        return;
+      }
+      this.compareHData1 = JSON.parse(this.preRow.content);
+      this.compareHData2 = JSON.parse(this.curRow.content);
+      this.preVersion = this.preRow.version;
+      this.curVersion = this.curRow.version;
+      this.compareReady = true;
+    },
+    initTitle() {
+      const titleMap = {
+        FormTemplate: "表单模板历史版本对比",
+        FormScript: "逻辑脚本历史版本对比",
+        SzTaMb: "数据表历史版本对比",
+      };
+      this.title = titleMap[this.objType] || "历史版本对比";
+    },
+    reverCallback() {
+      this.$emit("reverCallback");
+      this.dialogClose();
+    },
+    dialogClose() {
+      this.$emit("close");
+      this.$emit("update:visiable", false);
+    },
+  },
+};
+</script>

package/src/views/bd/setting/formVersion/compareMixin.js

@@ -0,0 +1,93 @@
+export default {
+  props: {
+    compareHData1: {
+      type: Object,
+      default: () => ({}),
+    },
+    compareHData2: {
+      type: Object,
+      default: () => ({}),
+    },
+    preVersion: [String, Number],
+    curVersion: [String, Number],
+    objType: String,
+    objCode: String,
+  },
+  methods: {
+    isNull(val) {
+      return val == null || val === "" || val === undefined;
+    },
+    isDiff(val1, val2) {
+      if (this.isNull(val1) && this.isNull(val2)) return false;
+      return val1 !== val2;
+    },
+    rowDiffClass(val1, val2) {
+      return this.isDiff(val1, val2) ? "id-difference" : "";
+    },
+    formatBool(val, trueText = "是", falseText = "否") {
+      if (val === true || val === 1) return this.$t1(trueText);
+      if (val === false || val === 0) return this.$t1(falseText);
+      return val ?? "";
+    },
+    formatTags(tags) {
+      if (!tags || !tags.length) return "";
+      return tags
+        .map((item) => item.tagName)
+        .filter(Boolean)
+        .join(", ");
+    },
+    formatDataRange(val) {
+      if (val === 1) return this.$t1("集团");
+      if (val === 0) return this.$t1("当前组织");
+      return val ?? "";
+    },
+    formatFormCode(val) {
+      if (val === "intf") return this.$t1("intf(接口)");
+      if (val === "busgeneral") return this.$t1("busgeneral(业务通用)");
+      return val ?? "";
+    },
+    formatScriptUrlPath(val, data) {
+      if (!data) return "";
+      return `${data.formCode || ""}/${data.scriptCode || ""}`;
+    },
+    formatJson(content) {
+      if (this.isNull(content)) return "";
+      if (typeof content === "object") {
+        try {
+          return JSON.stringify(content, null, 2);
+        } catch (e) {
+          return String(content);
+        }
+      }
+      const text = String(content).trim();
+      if (!text) return "";
+      try {
+        return JSON.stringify(JSON.parse(text), null, 2);
+      } catch (e) {
+        return text;
+      }
+    },
+    auditFields() {
+      return [
+        { key: "createBy", label: "创建人" },
+        { key: "createDate", label: "创建时间" },
+        { key: "modifyBy", label: "更新人" },
+        { key: "modifyDate", label: "更新时间" },
+      ];
+    },
+    getFieldVal(data, field) {
+      if (!data) return "";
+      let val = data[field.key];
+      if (field.formatter) {
+        return field.formatter(val, data);
+      }
+      return val ?? "";
+    },
+    fieldDiffClass(field) {
+      return this.rowDiffClass(
+        this.getFieldVal(this.compareHData1, field),
+        this.getFieldVal(this.compareHData2, field)
+      );
+    },
+  },
+};

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>

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

@@ -0,0 +1,94 @@
+<template>
+  <div class="compare-view-wrap">
+    <compareBasicSection
+      sectionTitle="基础信息"
+      headerLabel="查看表单脚本"
+      :objType="objType"
+      :objCode="objCode"
+      :compareHData1="compareHData1"
+      :compareHData2="compareHData2"
+      :preVersion="preVersion"
+      :curVersion="curVersion"
+      :fields="basicFields"
+      @reverCallback="$emit('reverCallback')"
+    />
+    <compareCodeSection
+      sectionTitle="脚本"
+      :preVersion="preVersion"
+      :curVersion="curVersion"
+      :leftCode="compareHData1.script || ''"
+      :rightCode="compareHData2.script || ''"
+      mode="java"
+      enableDiff
+    />
+  </div>
+</template>
+
+<script>
+import compareMixin from "./compareMixin";
+import compareBasicSection from "./compareBasicSection.vue";
+import compareCodeSection from "./compareCodeSection.vue";
+
+export default {
+  name: "formScriptCompareView",
+  mixins: [compareMixin],
+  components: {
+    compareBasicSection,
+    compareCodeSection,
+  },
+  computed: {
+    isFormScriptType1() {
+      return this.compareHData1?.scriptType === 1 || this.compareHData2?.scriptType === 1;
+    },
+    basicFields() {
+      const commonFields = [
+        { key: "scriptName", label: "脚本名称" },
+        { key: "scriptCode", label: "脚本编码" },
+      ];
+      const type1Fields = this.isFormScriptType1
+        ? [
+            { key: "menuKindName", label: "表单分类" },
+            {
+              key: "formCode",
+              label: "表单模板编码",
+              formatter: (val) => this.formatFormCode(val),
+            },
+            {
+              key: "urlPath",
+              label: "Url路径",
+              formatter: (val, data) => this.formatScriptUrlPath(val, data),
+            },
+          ]
+        : [];
+      return [
+        ...commonFields,
+        ...type1Fields,
+        {
+          key: "enabled",
+          label: "是否启用",
+          formatter: (val) => this.formatBool(val, "启用", "禁用"),
+        },
+        {
+          key: "transactions",
+          label: "开启事务",
+          formatter: (val) => this.formatBool(val),
+        },
+        ...(this.isFormScriptType1
+          ? [
+              { key: "serviceName", label: "服务名" },
+              { key: "uri", label: "自定义URL" },
+              {
+                key: "formScriptTagDTOs",
+                label: "项目标签",
+                formatter: (val) => this.formatTags(val),
+              },
+            ]
+          : []),
+        { key: "scriptRemark", label: "脚本说明" },
+        { key: "sid", label: "唯一标识" },
+        ...this.auditFields(),
+      ];
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,74 @@
+<template>
+  <div class="compare-view-wrap">
+    <compareBasicSection
+      sectionTitle="基础信息"
+      headerLabel="查看表单模板"
+      :objType="objType"
+      :objCode="objCode"
+      :compareHData1="compareHData1"
+      :compareHData2="compareHData2"
+      :preVersion="preVersion"
+      :curVersion="curVersion"
+      :fields="basicFields"
+      @reverCallback="$emit('reverCallback')"
+    />
+    <compareCodeSection
+      sectionTitle="表单模板JSON"
+      :preVersion="preVersion"
+      :curVersion="curVersion"
+      :leftCode="leftFormViewContent"
+      :rightCode="rightFormViewContent"
+      mode="json"
+      enableDiff
+    />
+  </div>
+</template>
+
+<script>
+import compareMixin from "./compareMixin";
+import compareBasicSection from "./compareBasicSection.vue";
+import compareCodeSection from "./compareCodeSection.vue";
+
+export default {
+  name: "formTemplateCompareView",
+  mixins: [compareMixin],
+  components: {
+    compareBasicSection,
+    compareCodeSection,
+  },
+  computed: {
+    leftFormViewContent() {
+      return this.formatJson(this.compareHData1?.formViewContent);
+    },
+    rightFormViewContent() {
+      return this.formatJson(this.compareHData2?.formViewContent);
+    },
+    basicFields() {
+      return [
+        { key: "formName", label: "模板名称" },
+        { key: "formCode", label: "模板编码" },
+        {
+          key: "enabled",
+          label: "是否启用",
+          formatter: (val) => this.formatBool(val, "启用", "禁用"),
+        },
+        {
+          key: "hasWf",
+          label: "启用流程",
+          formatter: (val) => this.formatBool(val),
+        },
+        { key: "menuKindName", label: "表单分类" },
+        { key: "remark", label: "备注" },
+        {
+          key: "formTemplateTagDTOs",
+          label: "项目标签",
+          formatter: (val) => this.formatTags(val),
+        },
+        { key: "serviceName", label: "服务名" },
+        { key: "sid", label: "唯一标识" },
+        ...this.auditFields(),
+      ];
+    },
+  },
+};
+</script>