cloud-web-corejs 1.0.249 → 1.0.251

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.249",
+  "version": "1.0.251",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/designer.js

@@ -96,6 +96,7 @@ let chartContainers = [],
         wfTheme: null,
         otherTabEnabled: false,
         otherTabList: [],
+        hideNormalTab: false,
         customListTabLabel: null,
         globalConfig: null,
       },

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -227,6 +227,9 @@
           <el-form-item :label="i18nt('启用其他标签页')">
             <el-switch v-model="formConfig.otherTabEnabled"></el-switch>
           </el-form-item>
+          <el-form-item :label="i18nt('隐藏常规标签')">
+            <el-switch v-model="formConfig.hideNormalTab"></el-switch>
+          </el-form-item>
           <el-form-item :label="i18nt('其他标签页配置')"> </el-form-item>
           <el-form-item label-width="0">
             <div>

package/src/components/xform/utils/util.js

@@ -1004,6 +1004,7 @@ export function getDefaultFormConfig() {
     wfTheme: null,
     otherTabEnabled: false,
     otherTabList: [],
+    hideNormalTab: false,
     customListTabLabel: null,
     globalConfig: null,
     // 表单级动态字段规则：按本地规则/后台脚本动态控制整个表单内任意字段/容器的显隐/必填/只读/禁用/取值

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

@@ -0,0 +1,55 @@
+<template>
+  <el-button
+    type="primary"
+    plain
+    class="button-sty"
+    icon="el-icon-set-up"
+    @click="openHistoryDialog"
+  >
+    {{ $t1("查看历史版本") }}
+    <ftHistoryDialog
+      v-if="historyDialogVisible"
+      :visiable.sync="historyDialogVisible"
+      :objType="objType"
+      :objCode="objCode"
+      :relationCode="relationCode"
+      @reverCallback="reverCallback"
+    />
+  </el-button>
+</template>
+<script>
+export default {
+  name: "historyButton",
+  props: {
+    objType: {
+      type: String,
+      default: null,
+    },
+    objCode: {
+      type: String,
+      default: null,
+    },
+    relationCode: {
+      type: String,
+      default: null,
+    },
+  },
+  components: {
+    ftHistoryDialog: () =>
+      import("@base/views/bd/setting/formVersion/ftHistoryDialog.vue"),
+  },
+  data() {
+    return {
+      historyDialogVisible: false,
+    };
+  },
+  methods: {
+    openHistoryDialog() {
+      this.historyDialogVisible = true;
+    },
+    reverCallback() {
+      this.$emit("reverCallback");
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,125 @@
+<template>
+  <div class="compare-cont">
+    <div class="title"><b>{{ $t1(sectionTitle) }}</b></div>
+    <table class="table-border_1">
+      <tbody>
+        <tr>
+          <th>{{ $t1(headerLabel) }}</th>
+          <td>
+            <span class="version-blue">{{ $t1("版本号") }}：{{ preVersion }}</span>
+            <div class="compare-revert-btn">
+              <reverButton
+                :objType="objType"
+                :objCode="objCode"
+                :hData="compareHData1"
+                @reverCallback="$emit('reverCallback')"
+              />
+            </div>
+          </td>
+          <td>
+            <span class="version-green">{{ $t1("版本号") }}：{{ curVersion }}</span>
+            <div class="compare-revert-btn">
+              <reverButton
+                :objType="objType"
+                :objCode="objCode"
+                :hData="compareHData2"
+                @reverCallback="$emit('reverCallback')"
+              />
+            </div>
+          </td>
+        </tr>
+        <tr
+          v-for="field in fields"
+          :key="field.key"
+          :class="fieldDiffClass(field)"
+        >
+          <th>{{ $t1(field.label) }}</th>
+          <td>{{ getFieldVal(compareHData1, field) }}</td>
+          <td>{{ getFieldVal(compareHData2, field) }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script>
+import compareMixin from "./compareMixin";
+import reverButton from "./reverButton.vue";
+
+export default {
+  name: "compareBasicSection",
+  mixins: [compareMixin],
+  components: {
+    reverButton,
+  },
+  props: {
+    sectionTitle: {
+      type: String,
+      default: "基础信息",
+    },
+    headerLabel: {
+      type: String,
+      required: true,
+    },
+    fields: {
+      type: Array,
+      default: () => [],
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "./compareContMixin.scss";
+
+.compare-cont {
+  @include compare-cont-shell;
+  @include compare-cont-title;
+  @include compare-version-label;
+  margin:16px;
+}
+.table-border_1 {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+
+  th,
+  td {
+    padding: 10px 12px;
+    border: 1px solid rgba(0,0,0,0.15);
+    line-height: 20px;
+    vertical-align: middle;
+    word-break: break-all;
+  }
+
+  th {
+    width: 160px;
+    background: rgba(0,0,0,0.04);
+    color: rgba(0,0,0,.65);
+    font-weight: 500;
+    text-align: left;
+  }
+
+  td {
+    width: calc((100% - 160px) / 2);
+    color: rgba(0,0,0,.85);
+
+    .version-blue,
+    .version-green {
+      margin-top: 2px;
+      margin-bottom: 0;
+    }
+
+    .compare-revert-btn {
+      float: right;
+    }
+  }
+
+  tr.id-difference {
+    td {
+      background: #fef0f0;
+      color: $red;
+    }
+  }
+}
+</style>