cloud-web-corejs 1.0.54-dev.592 → 1.0.54-dev.594

package/package.json

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

package/src/components/formOplog/mixins.js

@@ -1,80 +1,85 @@
-/**version-1.0*/
-let tmixins = {};
-tmixins = {
-  props: ["dataId", "type", "parentTarget", 'option'],
-  data() {
-    return {
-      oplogDTOs: [],
-      m1Option: {}
-    };
-  },
-  computed: {
-    target: function () {
-      return this.parentTarget || this;
-    }
-  },
-  mounted() {
-    this.initOplogDTOs();
-  },
-  methods: {
-    initOplogDTOs() {
-      const tableOption = {
-        vue: this,
-        tableRef: 'table-m1',
-        tableName: 'component-form_oplog-m1Grid',
-        columns: [{
-          type: 'checkbox',
-          fixed: 'left',
-          width: 48,
-          resizable: false
-        },
-          {
-            title: this.$t1('操作时间'),
-            field: 'createDate',
-            width: 150
-          },
-          {
-            title: this.$t1('操作人员'),
-            field: 'createBy',
-            width: 150
-          },
-          {
-            title: this.$t1('操作日志'),
-            field: 'logContent',
-            width: 150
-          },
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
-        ]
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-        this.m1Option = opts;
-      });
-
-    },
-    initData(option) {
-      let data = option.param ? option.param() : {};
-      let url = option.url || (USER_PREFIX + '/form_oplog/listPage');
-      this.target.$commonHttp({
-        aes: true,
-        url: url,
-        method: `post`,
-        data: {
-          ...data,
-          searchCount: false
-        },
-        isLoading: true,
-        modalStrictly: true,
-        success: res => {
-          let rows = res.objx ? (res.objx.records || res.objx || []) : [];
-          this.oplogDTOs = rows;
-        }
-      });
-    },
-  }
-};
-export const mixins = tmixins
+/**version-1.0*/
+let tmixins = {};
+tmixins = {
+  props: ["dataId", "type", "parentTarget", 'option'],
+  data() {
+    return {
+      oplogDTOs: [],
+      m1Option: {}
+    };
+  },
+  computed: {
+    target: function () {
+      return this.parentTarget || this;
+    }
+  },
+  mounted() {
+    this.initOplogDTOs();
+  },
+  methods: {
+    initOplogDTOs() {
+      const tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'component-form_oplog-m1Grid',
+        columns: [{
+          type: 'checkbox',
+          fixed: 'left',
+          width: 48,
+          resizable: false
+        },
+          {
+            title: this.$t1('操作时间'),
+            field: 'createDate',
+            width: 150
+          },
+          {
+            title: this.$t1('操作人员'),
+            field: 'createBy',
+            width: 150
+          },
+          {
+            title: this.$t1('操作日志'),
+            field: 'logContent',
+            width: 150
+          },
+          {
+            title: this.$t1('版本'),
+            field: 'version',
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.m1Option = opts;
+      });
+
+    },
+    initData(option) {
+      let data = option.param ? option.param() : {};
+      let url = option.url || (USER_PREFIX + '/form_oplog/listPage');
+      this.target.$commonHttp({
+        aes: true,
+        url: url,
+        method: `post`,
+        data: {
+          ...data,
+          searchCount: false
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: res => {
+          let rows = res.objx ? (res.objx.records || res.objx || []) : [];
+          this.oplogDTOs = rows;
+        }
+      });
+    },
+  }
+};
+export const mixins = tmixins

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: "ftHistoryButton",
+  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/ftHistoryDialog.vue

@@ -0,0 +1,384 @@
+<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="overflow: hidden">
+        <el-tabs ref="xTabs" v-model="activeName" class="tab-box">
+          <el-tab-pane :label="$t1('详情')" name="first">
+            <component
+              :is="editContent"
+              v-if="showEdit"
+              visible-key="showEdit"
+              :hData="hData"
+              :parent-target="_self"
+              @reload="$reloadHandle"
+              @openDesignDialog="openDesingerDialogByChild"
+              @reverCallback="reverCallback"
+            ></component>
+          </el-tab-pane>
+          <el-tab-pane :label="$t1('列表')" name="second">
+            <div class="grid-height">
+              <vxe-grid
+                ref="table-m1"
+                v-bind="vxeOption"
+                @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                @custom="$vxeTableUtil.customHandle"
+              >
+                <template #form>
+                  <div class="clearfix screen-btns">
+                    <div class="fr">
+                      <vxe-button
+                        icon="el-icon-brush"
+                        class="button-sty"
+                        @click="resetEvent"
+                        type="text"
+                        status="primary"
+                        plain
+                        >{{ $t1("重置") }}
+                      </vxe-button>
+                      <vxe-button
+                        status="warning"
+                        icon="el-icon-search"
+                        class="button-sty"
+                        @click="searchEvent"
+                      >
+                        {{ $t1("搜索") }}
+                      </vxe-button>
+                    </div>
+                  </div>
+                  <vxe-form
+                    class="screen-box"
+                    title-width="92px"
+                    title-align="right"
+                    :data="formData"
+                    @submit="searchEvent"
+                    @reset="resetEvent"
+                  >
+                    <vxe-form-item :title="$t1('版本号') + ':'">
+                      <template v-slot>
+                        <base-input-number v-model="formData.version" />
+                      </template>
+                    </vxe-form-item>
+                  </vxe-form>
+                </template>
+              </vxe-grid>
+            </div>
+          </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>
+    </el-dialog>
+  </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"),
+  },
+  created() {
+    this.initSetting();
+    this.initTitle();
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  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: "历史列表",
+    };
+  },
+  watch: {
+    formDesTabs(val) {
+      if (this.showFormScriptList == false && val == "second") {
+        this.showFormScriptList = true;
+      }
+    },
+  },
+  methods: {
+    initTitle() {
+      let titleMap = {
+        FormTemplate: "表单模板历史版本",
+        FormScript: "逻辑脚本历史版本",
+        SzTaMb: "数据表历史版本",
+      };
+      this.title = titleMap[this.objType];
+    },
+    initTableM1() {
+      let that = this;
+      let objNameTitleMap = {
+        FormTemplate: "模板名称",
+        FormScript: "脚本名称",
+        SzTaMb: "数据表名称",
+      };
+      let objNameTitle = objNameTitleMap[this.objType];
+      let objCodeTitleMap = {
+        FormTemplate: "模板编码",
+        FormScript: "脚本编码",
+        SzTaMb: "数据表编码",
+      };
+      let objCodeTitle = objCodeTitleMap[this.objType];
+
+      let tableOption = {
+        vue: that,
+        tableRef: "table-m1",
+        tableName: "bd_formVersion_dialog-m1",
+        path: USER_PREFIX + "/formVersion/listPage",
+        param: () => {
+          return {
+            ...this.formData,
+            objType: this.objType,
+            objCode: this.objCode,
+            relationCode: this.relationCode,
+          };
+        },
+        columns: [
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          {
+            title: this.$t1(objNameTitle),
+            field: "objName",
+            width: 150,
+            fixed: "left",
+          },
+          {
+            title: this.$t1(objCodeTitle),
+            field: "objCode",
+            width: 150,
+          },
+          {
+            title: this.$t1("版本号"),
+            field: "version",
+            width: 150,
+          },
+          {
+            title: this.$t1("创建时间"),
+            field: "createDate",
+            width: 150,
+          },
+          {
+            width: 90,
+            fixed: "right",
+            title: "",
+            sortable: false,
+            slots: {
+              default: ({ row }) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditView(row);
+                      }}
+                    >
+                      <el-tooltip
+                        enterable={false}
+                        effect="dark"
+                        content="查看"
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-edit" />
+                      </el-tooltip>
+                    </a>
+                  </div>,
+                ];
+              },
+            },
+          },
+        ],
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
+        that.vxeOption = opts;
+      });
+    },
+    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.formVersion;
+      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();
+    },
+  },
+};
+</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;
+  }
+}
+</style>

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

@@ -0,0 +1,66 @@
+<template>
+  <el-button
+    type="primary"
+    plain
+    class="button-sty"
+    icon="el-icon-set-up"
+    @click="saveData"
+  >
+    {{ $t1("回退当前版本") }}
+  </el-button>
+</template>
+<script>
+import { USER_PREFIX } from "@/prefixConfig";
+
+export default {
+  name: "ftHistoryButton",
+  props: {
+    hData: Object,
+    objType: {
+      type: String,
+      default: "",
+    },
+    objCode: {
+      type: String,
+      default: "",
+    },
+  },
+  components: {
+    ftHistoryDialog: () =>
+      import("@base/views/bd/setting/formVersion/ftHistoryDialog.vue"),
+  },
+  data() {
+    return {
+      historyDialogVisible: false,
+    };
+  },
+  methods: {
+    saveData() {
+      let url = null;
+      if (this.objType === "FormTemplate") {
+        url = USER_PREFIX + "/formTemplate/update";
+      } else if (this.objType === "FormScript") {
+        url = USER_PREFIX + "/formScript/update";
+      } else if (this.objType === "SzTaMb") {
+        url = USER_PREFIX + "/szTaMb/update";
+      }
+      this.$baseConfirm(this.$t1("您确定要回退当前版本吗？")).then(() => {
+        this.$http({
+          aes: true,
+          url: url,
+          method: `post`,
+          data: this.hData,
+          isLoading: true,
+          success: (res) => {
+            this.$message({
+              message: res.content,
+              type: "success",
+            });
+            this.$emit("reverCallback");
+          },
+        });
+      });
+    },
+  },
+};
+</script>