cloud-web-corejs 1.0.258 → 1.0.259

package/src/views/bd/setting/form_template/formDesignerDialog.vue

@@ -1,171 +1,172 @@
-<template>
-  <el-drawer
-    :title="$t1('表单设计({formName})', { formName })"
-    :visible.sync="showDesingerDialog"
-    :modal="false"
-    :destroy-on-close="true"
-    size="100%"
-    direction="rtl"
-    :before-close="closeFormDesignwinEvent"
-    :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="readonly"
-          :historyFlag="historyFlag"
-          :widgetList="widgetList"
-          :columnFlag="columnFlag"
-          :sourceData="sourceData"
-          :formTemplate="formTemplate"
-          :jsonFlag="jsonFlag"
-        ></designer>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('后端脚本')" name="second" v-if="showFormScript">
-        <formScriptList
-          :formCode="formCode"
-          :formTemplate="formTemplate"
-          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>
-</template>
-<script>
-import indexUtil from "@base/utils";
-export default {
-  props: {
-    visiable: {
-      type: Boolean,
-      default: false,
-    },
-    formName: {
-      type: String,
-      default: "",
-    },
-    formCode: {
-      type: String,
-      default: "",
-    },
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-    formTemplate: {
-      type: Object,
-      default: () => {},
-    },
-    showFormScript: {
-      type: Boolean,
-      default: true,
-    },
-    historyFlag: {
-      type: Boolean,
-      default: false,
-    },
-    jsonFlag: {
-      type: Boolean,
-      default: false,
-    },
-    widgetList: Array,
-    columnFlag: Boolean,
-    sourceData: Object,
-  },
-  components: {
-    designer: () => import("@base/views/user/form/vform/designer.vue"),
-    formScriptList: () => import("@base/views/bd/setting/form_script/form_list.vue"),
-  },
-  data() {
-    return {
-      showDesingerDialog: true,
-      isFullscreen: false,
-      formDesTabs: "first",
-      currentFormTemplate: {},
-      designerReadonly: false,
-      showFormScriptList: false,
-    };
-  },
-  watch: {
-    formDesTabs(val) {
-      if (this.showFormScriptList === false && val === "second") {
-        this.showFormScriptList = true;
-      }
-    },
-  },
-  methods: {
-    handleFormDesignClose() {
-      this.showDesingerDialog = false;
-      this.formDesTabs = "first";
-      this.showFormScriptList = false;
-      this.$emit("close");
-      this.$emit("update:visiable", false);
-    },
-    handleFullscreen() {
-      let isFullscreen = this.isFullscreen;
-      if (!isFullscreen) {
-        indexUtil.addClass(document.body, "hideMenu");
-      } else {
-        indexUtil.removeClass(document.body, "hideMenu");
-      }
-      this.isFullscreen = !isFullscreen;
-    },
-    closeFormDesignwinEvent(done) {
-      this.$baseConfirm(this.$t1('请确认"已保存"报表模板，是否继续关闭？')).then(() => {
-        indexUtil.removeClass(document.body, "hideMenu");
-        done && done();
-      });
-    },
-    reflushTemplateList() {
-      this.$emit("reflushTemplateList");
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-::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>
+<template>
+  <el-drawer
+    :title="$t1('表单设计({formName})', { formName })"
+    :visible.sync="showDesingerDialog"
+    :modal="false"
+    :destroy-on-close="true"
+    size="100%"
+    direction="rtl"
+    :before-close="closeFormDesignwinEvent"
+    :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"
+          :id="formTemplate && formTemplate.id"
+          @reflushTemplateList="reflushTemplateList"
+          :readonly="readonly"
+          :historyFlag="historyFlag"
+          :widgetList="widgetList"
+          :columnFlag="columnFlag"
+          :sourceData="sourceData"
+          :formTemplate="formTemplate"
+          :jsonFlag="jsonFlag"
+        ></designer>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('后端脚本')" name="second" v-if="showFormScript">
+        <formScriptList
+          :formCode="formCode"
+          :formTemplate="formTemplate"
+          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>
+</template>
+<script>
+import indexUtil from "@base/utils";
+export default {
+  props: {
+    visiable: {
+      type: Boolean,
+      default: false,
+    },
+    formName: {
+      type: String,
+      default: "",
+    },
+    formCode: {
+      type: String,
+      default: "",
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+    formTemplate: {
+      type: Object,
+      default: () => {},
+    },
+    showFormScript: {
+      type: Boolean,
+      default: true,
+    },
+    historyFlag: {
+      type: Boolean,
+      default: false,
+    },
+    jsonFlag: {
+      type: Boolean,
+      default: false,
+    },
+    widgetList: Array,
+    columnFlag: Boolean,
+    sourceData: Object,
+  },
+  components: {
+    designer: () => import("@base/views/user/form/vform/designer.vue"),
+    formScriptList: () => import("@base/views/bd/setting/form_script/form_list.vue"),
+  },
+  data() {
+    return {
+      showDesingerDialog: true,
+      isFullscreen: false,
+      formDesTabs: "first",
+      currentFormTemplate: {},
+      designerReadonly: false,
+      showFormScriptList: false,
+    };
+  },
+  watch: {
+    formDesTabs(val) {
+      if (this.showFormScriptList === false && val === "second") {
+        this.showFormScriptList = true;
+      }
+    },
+  },
+  methods: {
+    handleFormDesignClose() {
+      this.showDesingerDialog = false;
+      this.formDesTabs = "first";
+      this.showFormScriptList = false;
+      this.$emit("close");
+      this.$emit("update:visiable", false);
+    },
+    handleFullscreen() {
+      let isFullscreen = this.isFullscreen;
+      if (!isFullscreen) {
+        indexUtil.addClass(document.body, "hideMenu");
+      } else {
+        indexUtil.removeClass(document.body, "hideMenu");
+      }
+      this.isFullscreen = !isFullscreen;
+    },
+    closeFormDesignwinEvent(done) {
+      this.$baseConfirm(this.$t1('请确认"已保存"报表模板，是否继续关闭？')).then(() => {
+        indexUtil.removeClass(document.body, "hideMenu");
+        done && done();
+      });
+    },
+    reflushTemplateList() {
+      this.$emit("reflushTemplateList");
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+::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/form_template/ftHistoryDialog.vue

@@ -28,7 +28,7 @@
             <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('重置') }}
+                            plain>{{ $t1('刷新') }}
                 </vxe-button>
                 <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                   {{ $t1('搜索') }}

package/src/views/bd/setting/form_template/itemList.vue

@@ -22,7 +22,7 @@
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{$t1('重置')}}
+                              plain>{{$t1('刷新')}}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{ $t1('搜索') }}
                   </vxe-button>

package/src/views/bd/setting/form_template/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="containt">
-    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="formCode">
+    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="id">
       <el-tab-pane :label="$t1('常规')" name="first">
         <editView
           v-if="showEdit"
@@ -94,7 +94,7 @@
                       type="text"
                       status="primary"
                       plain
-                      >{{ $t1("重置") }}
+                      >{{ $t1("刷新") }}
                     </vxe-button>
                     <vxe-button
                       status="warning"
@@ -201,7 +201,7 @@
         <el-tab-pane
           :key="tab.data.id"
           :label.sync="tab.data.formName"
-          :name="tab.data.formCode"
+          :name="tab.data.id + ''"
           :closable="true"
         >
           <editView

package/src/views/bd/setting/form_template/mixins/edit.js

@@ -116,10 +116,10 @@ modules = {
       }else if (this.dataId) {
         this.$commonHttp({
           aes: true,
-          url: USER_PREFIX + `/formTemplate/getByFormCode`,
+          url: USER_PREFIX + `/formTemplate/get`,
           method: `post`,
           data: {
-            stringOne: this.dataId
+            id: this.dataId
           },
           isLoading: true,
           modalStrictly: true,
@@ -195,7 +195,7 @@ modules = {
               } else {
                 this.$baseReload({
                   updateParam: {
-                    _dataId: this.formTemplate.formCode
+                    _dataId: res.objx || this.formTemplate.id
                   }
                 });
               }

package/src/views/bd/setting/form_template/mixins/list.js

@@ -185,13 +185,13 @@ modules = {
       this.$refs["table-m1"].commitProxy("reload");
     },
     openEditDialog(row) {
-      let formCode = row?.formCode || null;
+      let dataId = row?.id || 0;
       /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
-      if (!formCode) {
-        this.dataId = formCode;
+      if (!dataId) {
+        this.dataId = dataId;
         this.activeName = "first";
         this.$openEditView("showEdit");
       } else {

package/src/views/bd/setting/form_template/mixins/list2.js

@@ -153,13 +153,13 @@ modules = {
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(row) {
-      let formCode = row?.formCode || null;
+      let dataId = row?.id || 0;
       /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
-      if (!formCode) {
-        this.dataId = formCode;
+      if (!dataId) {
+        this.dataId = dataId;
         this.activeName = 'first';
         this.$openEditView('showEdit');
       } else {

package/src/views/bd/setting/form_template/mixins/wf_list.js

@@ -156,13 +156,13 @@ modules = {
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(row) {
-      let formCode = row?.formCode || null;
+      let dataId = row?.id || 0;
       /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
-      if (!formCode) {
-        this.dataId = formCode;
+      if (!dataId) {
+        this.dataId = dataId;
         this.activeName = 'first';
         this.$openEditView('showEdit');
       } else {