cloud-web-corejs 1.0.54-dev.116 → 1.0.54-dev.117

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

@@ -7,6 +7,20 @@
           {{ dataId ? $t1('查看数据表定义模板') : $t1('新增数据表定义模板') }}
         </div>
         <div class="fr">
+          <el-button type="primary" plain class="button-sty" icon="el-icon-set-up" @click="openDtDialog"
+                     v-if="isDev && !dataId && menuKindAuth.editAuth===1 && !readonly">
+            {{ $t1('引用数据库中数据表结构') }}
+          </el-button>
+          <el-button type="primary" plain class="button-sty" icon="el-icon-set-up" @click="openTmDialog"
+                     v-if="isDev && !dataId && menuKindAuth.editAuth===1 && !readonly">
+            {{ $t1('引用数据表定义的结构') }}
+          </el-button>
+
+          <el-button type="success" class="button-sty" icon="el-icon-check"
+                     @click="createModifyTable()"
+                     v-if="!szTaMb.systems && szTaMb.id && menuKindAuth.editAuth===1 && !readonly">
+            {{ $t1('创建/更新数据表') }}
+          </el-button>
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
             {{ $t1('重置') }}
           </el-button>
@@ -14,11 +28,6 @@
                      v-if="isDev && !szTaMb.systems && menuKindAuth.editAuth===1 && !readonly">
             {{ $t1('保存') }}
           </el-button>
-
-          <el-button type="success" class="button-sty" icon="el-icon-check"
-                     @click="createModifyTable()" v-if="!szTaMb.systems && szTaMb.id && menuKindAuth.editAuth===1 && !readonly">
-            {{ $t1('创建/更新数据表') }}
-          </el-button>
         </div>
       </div>
       <baseTabs>
@@ -33,7 +42,7 @@
                 </th>
                 <td colspan="3">
                   <el-form-item prop="taEn" :rules="[{ required: true, trigger: ['blur', 'change'] }]">
-                    <el-input type="text" autocomplete="off" v-model="szTaMb.taEn" clearable/>
+                    <el-input type="text" autocomplete="off" v-model="szTaMb.taEn" clearable :disabled="szTaMb.fromTable"/>
                   </el-form-item>
                 </td>
                 <th><em class="f-red">*</em>{{ $t1('数据库表名') }}</th>
@@ -217,7 +226,7 @@
                   </template>
                 </template>
                 <template #zdEn="{row, rowIndex}">
-                  <template v-if="!!row.systems || !!row.relationZd">
+                  <template v-if="!!row.systems || !!row.relationZd || row.fromTable">
                     <div :style="!!row.relationZd ? 'margin-left:20px' : ''">{{ row.zdEn }}</div>
                   </template>
                   <template v-else>
@@ -293,9 +302,9 @@
                   @confirm="confirmInsertSzTaMb"
                   :multi="false"
     />
-    <itemSzTaMbDialog v-if="showItemSzTaMbDialog"
-                      :visiable.sync="showItemSzTaMbDialog"
-                      @confirm="confirmInsertItemSzTaMb" multi="false"/>
+    <szTaMbDialog v-if="showItemSzTaMbDialog"
+                  :visiable.sync="showItemSzTaMbDialog"
+                  @confirm="confirmInsertItemSzTaMb" multi="false"/>
     <MenuKindDialog v-if="showMenuKindDialog"
                     :visiable.sync="showMenuKindDialog"
                     @confirm="confirmInsertMenuKind"
@@ -425,14 +434,53 @@
     />
     <preformDialog v-if="showPreformDialog" :visiable.sync="showPreformDialog"
                    @confirm="confirmPreformDialog"></preformDialog>
+
+    <szTaMbDialog v-if="showTmDialog"
+                  :visiable.sync="showTmDialog"
+                  @confirm="confirmTmDialog"
+                  :multi="false"
+    />
+
+    <el-dialog
+      :title="$t1('引用数据库中数据表结构')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      v-if="showDtDialog"
+      :visible.sync="showDtDialog"
+      :modal="false"
+      custom-class="dialog-style list-dialog dialog-checkbox pd_8"
+      width="350px"
+      v-el-drag-dialog
+    >
+      <div class="cont">
+        <el-form ref="editCategoryForm" label-width="102px" class="adSearchForm" style="height: auto; width: auto;">
+          <el-form-item :label="$t1('数据表')">
+            <el-input v-model="dbTable" clearable class="all-width"/>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button type="primary" plain class="button-sty" @click="showDtDialog=false">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t2('取 消', 'system.button.cancel2') }}
+      </el-button>
+      <el-button type="primary" @click="confirmDtDialog" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1('确定') }}
+      </el-button>
+    </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import mixin from "./mixins/edit";
+import viewDialog from "@/layout/components/extractedCode/viewDialog.vue";
 
 export default {
   name: 'szTaMbEdit',
+  components: {viewDialog},
   mixins: [mixin]
 }
 </script>

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

@@ -2,7 +2,6 @@ import formOplogTable from "@base/components/formOplog/index.vue";
 import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
 import projectTagView from "@base/components/projectTag/view.vue";
 import szTaMbDialog from "@base/views/bd/setting/table_model/dialog.vue";
-import itemSzTaMbDialog from "@base/views/bd/setting/table_model/dialog.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import zdDialog from "@base/views/bd/setting/table_model/zdDialog.vue";
 import {getBdFlag} from "@base/api/user";
@@ -21,7 +20,6 @@ modules = {
     preformDialog,
     projectTagView,
     szTaMbDialog,
-    itemSzTaMbDialog,
     MenuKindDialog,
     zdDialog
   },
@@ -39,7 +37,10 @@ modules = {
         serviceName: null,
         taRule: 0,
         dataRange: 0,
-        szTaMbTagDTOs: []
+        szTaMbTagDTOs: [],
+        fromTable: false,
+        taCh: null,
+        sszstEn:null
       },
       treeDefaultZds: [],
       productOption: {},
@@ -66,7 +67,11 @@ modules = {
       showPreformDialog: false,
       menuKindAuth: {
         editAuth: 0
-      }
+      },
+
+      dbTable: null,
+      showDtDialog: false,
+      showTmDialog: false
     };
   },
   created() {
@@ -443,7 +448,13 @@ modules = {
       // }
       // this.customer.szTaZdMbDTOs.push({tacitly: tacitly});
       let newIndex = this.getNewIndex();
-      this.szTaMb.szTaZdMbDTOs.push({zdType: 'Text', enabled: true, orders: newIndex, generateCode: false});
+      this.szTaMb.szTaZdMbDTOs.push({
+        zdType: 'Text',
+        enabled: true,
+        orders: newIndex,
+        generateCode: false,
+        fromTable: false
+      });
     },
     deleteItem(row, rowIndex) {
       let referenceZd = row.referenceZd;
@@ -787,6 +798,109 @@ modules = {
           }
         });
       }
+    },
+    openDtDialog() {
+      //引用数据库中数据表结构
+      this.dbTable = null;
+      this.showDtDialog = true;
+    },
+    confirmDtDialog() {
+      if (!this.dbTable) {
+        this.$baseAlert("数据表不能为空");
+        return
+      }
+      this.$http({
+        // aes: true,
+        url: "/" + this.szTaMb.serviceName + `/dbTable/getSzTaZdMbs`,
+        method: `post`,
+        data: {
+          stringOne: this.dbTable
+        },
+        isLoading: true,
+        success: res => {
+          let items = res.objx || [];
+          /*let szTaZdMbDTOs = items.map(item => {
+            return {
+              ...item,
+              createBy: null,
+              createDate: null,
+              fromTable: true,
+              id: null,
+              modifyBy: null,
+              modifyDate: null
+            }
+          })
+          let newRow = {
+            ...row,
+            createBy: null,
+            createDate: null,
+            fromTable: true,
+            id: null,
+            modifyBy: null,
+            modifyDate: null,
+            sid: null
+          }
+          Object.keys(newRow).forEach(key => {
+            if (key.endsWith('DTOs')) {
+              delete newRow[key]
+            }
+          })
+          Object.assign(this.szTaMb, newRow);
+          this.szTaMb.szTaZdMbDTOs = szTaZdMbDTOs;*/
+        }
+      });
+    },
+    openTmDialog() {
+      //引用数据表定义的结构
+      this.showTmDialog = true;
+    },
+    confirmTmDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.$http({
+          aes: true,
+          url: USER_PREFIX + `/szTaMb/getSzTaZdMbs`,
+          method: `post`,
+          data: {
+            id: row.id
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            let items = res.objx || [];
+            let szTaZdMbDTOs = items.filter(item => !item.systems).map(item => {
+              return {
+                ...item,
+                createBy: null,
+                createDate: null,
+                fromTable: true,
+                id: null,
+                modifyBy: null,
+                modifyDate: null
+              }
+            })
+            let newRow = {
+              ...row,
+              createBy: null,
+              createDate: null,
+              fromTable: true,
+              id: null,
+              modifyBy: null,
+              modifyDate: null,
+              sid: null,
+              taBm: null,
+              taCode: null
+            }
+            Object.keys(newRow).forEach(key => {
+              if (key.endsWith('DTOs')) {
+                delete newRow[key]
+              }
+            })
+            Object.assign(this.szTaMb, newRow);
+            this.szTaMb.szTaZdMbDTOs = szTaZdMbDTOs;
+          }
+        });
+      }
     }
   }
 };