cloud-web-corejs 1.0.54-dev.606 → 1.0.54-dev.608

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

@@ -140,6 +140,39 @@
                   :readonly="true"
                 ></projectTagView>
               </template>
+              <template #operation="{ row }">
+                <a href="javascript:void(0);" class="a-link" @click="openEditDialog(row)">
+                  <el-tooltip
+                    :enterable="false"
+                    effect="dark"
+                    :content="$t1('查看')"
+                    placement="top"
+                    popper-class="tooltip-skin"
+                  >
+                    <i class="el-icon-edit" />
+                  </el-tooltip>
+                </a>
+                <a
+                  href="javascript:void(0);"
+                  class="a-link"
+                  @click="openDesingerDialogByAuth(row)"
+                >
+                  <el-tooltip
+                    :enterable="false"
+                    effect="dark"
+                    :content="$t1('表单设计')"
+                    placement="top"
+                    popper-class="tooltip-skin"
+                  >
+                    <i class="iconfont icon-liuchengguanli-shejiqi_liucheng" />
+                  </el-tooltip>
+                </a>
+                <formVersionButton
+                  objType="FormTemplate"
+                  :objCode="row.formCode"
+                  @reverCallback="searchEvent"
+                ></formVersionButton>
+              </template>
             </vxe-grid>
             <el-drawer
               :title="$t1('流程模板')"
@@ -260,35 +293,4 @@ export default {
   mixins: [mixin],
 };
 </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>
+<style scoped lang="scss"></style>

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

@@ -17,6 +17,7 @@ import {
   getJsxBtnList,
   getJsxStatus,
 } from "@base/views/bd/setting/utils/index";
+import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
 
 let modules = {};
 modules = {
@@ -35,6 +36,7 @@ modules = {
     formTypeEditDialog,
     projectTagDialog,
     formDesignerDialog: () => import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
+    formVersionButton,
   },
   data() {
     return {
@@ -385,29 +387,12 @@ modules = {
             width: 150
           },
           {
-            width: 100,
+            width: 140,
             fixed: "right",
             title: "",
             sortable: false,
             slots: {
-              default: ({row}) => {
-                return getJsxBtnList([
-                  {
-                    iconName: "el-icon-edit",
-                    content: this.$t1("查看"),
-                    onclick: () => {
-                      this.openEditDialog(row);
-                    },
-                  },
-                  {
-                    iconName: "iconfont icon-liuchengguanli-shejiqi_liucheng",
-                    content: this.$t1("表单设计"),
-                    onclick: () => {
-                      this.openDesingerDialogByAuth(row);
-                    },
-                  },
-                ]);
-              },
+              default: "operation",
             },
           },
         ],
@@ -458,6 +443,7 @@ modules = {
           },
           {title: this.$t1('创建人'), field: "createBy", type: "input", common: false},
           {title: this.$t1('更新人'), field: "modifyBy", type: "input", common: false},
+          {title: this.$t1('操作日志'), field: "logContent", type: "input", common: false},
           {
             title: this.$t1('创建时间'),
             field: "startCreateDate",

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

@@ -144,6 +144,24 @@
                   :readonly="true"
                 ></projectTagView>
               </template>
+              <template #operation="{ row }">
+                <a href="javascript:void(0);" class="a-link" @click="openEditDialog(row)">
+                  <el-tooltip
+                    :enterable="false"
+                    effect="dark"
+                    :content="$t1('查看')"
+                    placement="top"
+                    popper-class="tooltip-skin"
+                  >
+                    <i class="el-icon-edit" />
+                  </el-tooltip>
+                </a>
+                <formVersionButton
+                  objType="SzTaMb"
+                  :objCode="row.taCode"
+                  @reverCallback="searchEvent"
+                ></formVersionButton>
+              </template>
             </vxe-grid>
           </div>
         </div>

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

@@ -9,6 +9,7 @@ import {treeScollx} from "@base/utils/global";
 import {getBdFlag} from "@base/api/user";
 import {getJsxBtn, getJsxStatus} from "@base/views/bd/setting/utils";
 import { mapGetters } from "vuex";
+import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
 
 let modules = {};
 modules = {
@@ -19,7 +20,8 @@ modules = {
     tableForm,
     editView,
     MenuKindDialog,
-    projectTagDialog
+    projectTagDialog,
+    formVersionButton
   },
   created() {
   },
@@ -232,20 +234,12 @@ modules = {
             width: 150
           },
           {
-            width: 47,
+            width: 100,
             fixed: 'right',
             title: '',
             sortable: false,
             slots: {
-              default: ({row}) => {
-                return getJsxBtn({
-                  iconName: "el-icon-edit",
-                  content: this.$t1('查看'),
-                  onclick: () => {
-                    this.openEditDialog(row);
-                  }
-                });
-              }
+              default: "operation"
             }
           }
         ],
@@ -275,6 +269,7 @@ modules = {
           {title: this.$t1('项目标签'), field: "tag", type: "input", common: true, slot: "tag"},
           {title: this.$t1('创建人'), field: "createBy", type: "input", common: false},
           {title: this.$t1('更新人'), field: "modifyBy", type: "input", common: false},
+          {title: this.$t1('操作日志'), field: "logContent", type: "input", common: false},
           {
             title: this.$t1('创建时间'),
             field: "startCreateDate",