cloud-web-corejs 1.0.76 → 1.0.78

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

@@ -7,17 +7,27 @@
           {{ 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>
           <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData"
-                     v-if="isDev && !szTaMb.systems && menuKindAuth.editAuth===1">
+                     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 && menuKindAuth.editAuth===1"> {{ $t1('创建/更新数据表') }}
-          </el-button>
         </div>
       </div>
       <baseTabs>
@@ -32,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 />
                   </el-form-item>
                 </td>
                 <th><em class="f-red">*</em>{{ $t1('数据库表名') }}</th>
@@ -145,7 +155,16 @@
                   {{ $t1('服务名') }}
                 </th>
                 <td colspan="7">
-                  {{szTaMb.serviceName}}
+                  {{ szTaMb.serviceName }}
+                </td>
+              </tr>
+
+              <tr>
+                <th>
+                  {{ $t1('唯一标识') }}
+                </th>
+                <td colspan="7">
+                  {{ szTaMb.sid }}
                 </td>
               </tr>
               <tr>
@@ -207,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>
@@ -250,7 +269,8 @@
                 <template #orders="{row, rowIndex}">
                   <el-form-item :prop="'szTaZdMbDTOs.' + rowIndex + '.orders'"
                                 :rules="[{required: false, trigger: ['blur', 'change']}]">
-                    <base-input-number v-model="row.orders" clearable :disabled="!!row.systems" @change="changeOrders(row)"/>
+                    <base-input-number v-model="row.orders" clearable :disabled="!!row.systems"
+                                       @change="changeOrders(row)"/>
                   </el-form-item>
                 </template>
               </vxe-grid>
@@ -282,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"
@@ -320,6 +340,7 @@
                     v-model="referenceEntity"
                     @clear="
                           referenceKey = null;
+                          refServiceName = null;
                           referenceShowFields = [];
                           $forceUpdate();
                         "
@@ -413,6 +434,43 @@
     />
     <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>