cloud-web-corejs 1.0.54-dev.600 → 1.0.54-dev.602

package/package.json

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

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

@@ -106,7 +106,7 @@
               v-model="formConfig.addFormCode"
               @clear="
                 formConfig.addFormCode = null;
-                formConfig.addFormName = null
+                formConfig.addFormName = null;
                 $forceUpdate();
               "
               v-el-readonly
@@ -998,7 +998,7 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
   created() {
     //导入表单JSON后需要重新加载自定义CSS样式！！！
     this.designer.handleEvent("form-json-imported", () => {
-      this.formCssCode = this.formConfig.cssCode;
+      this.formCssCode = this.formConfig.cssCode || "";
       insertCustomCssToHead(this.formCssCcssCodeode);
       this.extractCssClass();
       this.designer.emitEvent("form-css-updated", deepClone(this.cssClassList));
@@ -1008,7 +1008,7 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
     /* SettingPanel和FormWidget为兄弟组件, 在FormWidget加载formConfig时，
          此处SettingPanel可能无法获取到formConfig.cssCode, 故加个延时函数！ */
     setTimeout(() => {
-      this.formCssCode = this.formConfig.cssCode;
+      this.formCssCode = this.formConfig.cssCode || "";
       insertCustomCssToHead(this.formCssCode);
       this.extractCssClass();
       this.designer.emitEvent("form-css-updated", deepClone(this.cssClassList));
@@ -1031,7 +1031,7 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
 
     extractCssClass() {
       let regExp = /\..*{/g;
-      let result = this.formCssCode.match(regExp);
+      let result = this.formCssCode ? this.formCssCode.match(regExp) : [];
       let cssNameArray = [];
 
       if (!!result && result.length > 0) {

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -1413,15 +1413,15 @@ export default {
     findColumnByColumnId(columnList, columnId) {
       let result = null;
       if (columnList) {
-        let column = columnList.find((item) => item.columnId == columnId);
+        /* let column = columnList.find((item) => item.columnId == columnId);
         if (!column) {
-        }
+        } */
         for (let column of columnList) {
           if (column.columnId == columnId) {
             result = column;
             break;
           } else if (column.children && column.children.length) {
-            let subColumn = this.findColumnByColumnId(column.children, children);
+            let subColumn = this.findColumnByColumnId(column.children, columnId);
             if (subColumn) {
               result = subColumn;
               break;

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

@@ -19,7 +19,7 @@
 </template>
 <script>
 export default {
-  name: "ftHistoryButton",
+  name: "historyButton",
   props: {
     objType: {
       type: String,

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

@@ -0,0 +1,286 @@
+<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"
+                ></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"
+                ></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"
+        :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) {
+      debugger;
+      let a = 1;
+      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,51 @@
+<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;
+}
+</style>

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

@@ -14,7 +14,11 @@
       v-el-dialog-center
       :fullscreen="true"
     >
-      <div class="cont" id="containt" style="overflow: hidden">
+      <div
+        class="cont"
+        id="containt"
+        style="height: calc(100vh - 58px); overflow: hidden"
+      >
         <el-tabs ref="xTabs" v-model="activeName" class="tab-box">
           <el-tab-pane :label="$t1('详情')" name="first">
             <component
@@ -38,6 +42,16 @@
               >
                 <template #form>
                   <div class="clearfix screen-btns">
+                    <div class="fl">
+                      <el-button
+                        type="primary"
+                        icon="el-icon-compare"
+                        class="button-sty"
+                        @click="compare"
+                      >
+                        {{ $t1("对比") }}
+                      </el-button>
+                    </div>
                     <div class="fr">
                       <vxe-button
                         icon="el-icon-brush"
@@ -71,7 +85,7 @@
                         <base-input-number v-model="formData.version" />
                       </template>
                     </vxe-form-item>
-                    <vxe-form-item :title="$t1('备注') + ':'">
+                    <vxe-form-item :title="$t1('操作日志') + ':'">
                       <template v-slot>
                         <el-input v-model="formData.remark" clearable />
                       </template>
@@ -83,69 +97,47 @@
           </el-tab-pane>
         </el-tabs>
       </div>
-      <el-drawer
-        :title="$t1('表单设计({formName})', { formName })"
-        :visible.sync="showDesingerDialog"
-        :modal="false"
-        :destroy-on-close="true"
-        size="100%"
-        direction="rtl"
-        :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"
-              @reflushTemplateList="reflushTemplateList"
-              :readonly="designerReadonly"
-            ></designer>
-          </el-tab-pane>
-          <!-- <el-tab-pane :label="$t1('后端脚本')" name="second">
-            <formScriptList
-              :formCode="formCode"
-              :formTemplate="currentFormTemplate"
-              v-if="showFormScriptList"
-            ></formScriptList>
-          </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>
+      <formDesignerDialog
+        ref="formDesignerDialog"
+        v-if="showDesingerDialog"
+        :visiable.sync="showDesingerDialog"
+        :formName="formName"
+        :formCode="formCode"
+        @reflushTemplateList="reflushTemplateList"
+        :readonly="designerReadonly"
+        :showFormScript="false"
+        :historyFlag="true"
+        :formTemplate="currentFormTemplate"
+      ></formDesignerDialog>
     </el-dialog>
+    <compareDialog
+      ref="compareDialog"
+      :objType="objType"
+      :objCode="objCode"
+      :relationCode="relationCode"
+      :preRow="preRow"
+      :curRow="curRow"
+      v-if="showCompareDialog"
+      :visiable.sync="showCompareDialog"
+    ></compareDialog>
   </div>
 </template>
 
 <script>
 import { selectDialogMixins } from "@base/mixins/selectDialog";
-import FormTemplateEdit from "@base/views/bd/setting/form_template/edit.vue";
-import FormScriptEdit from "@base/views/bd/setting/form_script/edit.vue";
-import FormScriptEdit1 from "@base/views/bd/setting/form_script/edit1.vue";
-import SzTaMbEdit from "@base/views/bd/setting/table_model/edit.vue";
-import formScriptList from "@base/views/bd/setting/form_script/form_list.vue";
 
 export default {
   name: "ftHistoryDialog",
   props: ["visiable", "objType", "objCode", "relationCode"],
   mixins: [selectDialogMixins],
   components: {
-    FormTemplateEdit,
-    FormScriptEdit,
-    FormScriptEdit1,
-    SzTaMbEdit,
-    formScriptList,
-    designer: () => import("@base/views/user/form/vform/designer.vue"),
+    formDesignerDialog: () =>
+      import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
+    compareDialog: () => import("@base/views/bd/setting/formVersion/compareDialog.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();
@@ -178,6 +170,10 @@ export default {
       showFormScriptList: false,
       formDesTabs: "first",
       title: "历史列表",
+
+      showCompareDialog: false,
+      preRow: null,
+      curRow: null,
     };
   },
   watch: {
@@ -188,6 +184,41 @@ export default {
     },
   },
   methods: {
+    getCompareData(row1, row2, callback) {
+      Promise.all([this.getFormVersion(row1.id), this.getFormVersion(row2.id)]).then(
+        (res) => {
+          let compareHData1 = res[0].objx;
+          let compareHData2 = res[1].objx;
+          callback && callback(compareHData1, compareHData2);
+        }
+      );
+    },
+    getFormVersion(id) {
+      return this.$http({
+        url: USER_PREFIX + "/formVersion/get",
+        method: "post",
+        data: {
+          id: id,
+        },
+      });
+    },
+    compare() {
+      let rows = this.$refs["table-m1"].getCheckboxRecords(true);
+      if (rows.length != 2) {
+        this.$message.error("请选择两个版本进行对比");
+        return;
+      }
+
+      let row1 = rows[0];
+      let row2 = rows[1];
+      let preRow = row1.version > row2.version ? row2 : row1;
+      let curRow = row1.version > row2.version ? row1 : row2;
+      this.getCompareData(preRow, curRow, (compareHData1, compareHData2) => {
+        this.preRow = compareHData1;
+        this.curRow = compareHData2;
+        this.showCompareDialog = true;
+      });
+    },
     initTitle() {
       let titleMap = {
         FormTemplate: "表单模板历史版本",
@@ -243,7 +274,7 @@ export default {
             width: 150,
           },
           {
-            title: this.$t1("备注"),
+            title: this.$t1("操作日志"),
             field: "remark",
             width: 150,
           },
@@ -301,13 +332,13 @@ export default {
           let hData = JSON.parse(objx.content);
           this.hData = hData;
           let map = {
-            FormTemplate: FormTemplateEdit,
-            FormScript: FormScriptEdit,
-            SzTaMb: SzTaMbEdit,
+            FormTemplate: "FormTemplateEdit",
+            FormScript: "FormScriptEdit",
+            SzTaMb: "SzTaMbEdit",
           };
           let scriptTypeMap = {
-            0: FormScriptEdit,
-            1: FormScriptEdit1,
+            0: "FormScriptEdit",
+            1: "FormScriptEdit1",
           };
           if (row.objType === "FormScript") {
             this.editContent = scriptTypeMap[hData.scriptType];
@@ -322,7 +353,7 @@ export default {
     rever(row) {},
     openDesingerDialog(row, callback, readonly = false) {
       this.formCode = row.formCode;
-      this.formName = row.formName + " - " + row.formVersion;
+      this.formName = row.formName + " - " + row.version;
       this.currentFormTemplate = row;
       this.isFullscreen = false;
 
@@ -359,36 +390,9 @@ export default {
 </script>
 <style scoped lang="scss">
 .grid-height {
-  height: calc(100vh - 162px) !important;
+  height: calc(100vh - 110px) !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;
-  }
+::v-deep .detail-wrap .d-cont {
+  height: calc(100vh - 148px) !important;
 }
 </style>