Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

template/admin/src/layout/navBars/tagsView/tagsView.vue

@@ -62,7 +62,7 @@ export default {
     // 获取布局配置信息
     getThemeConfig() {
       return this.$store.state.themeConfig.themeConfig;
-    },
+    }, 
     // 动态设置 tagsView 风格样式
     setTagsStyle() {
       return this.$store.state.themeConfig.themeConfig.tagsStyle;

template/admin/src/pages/system/codeGeneration/components/TableForm.vue

@@ -49,7 +49,7 @@
           </Select>
         </template>
         <template slot-scope="{ row, index }" slot="options">
-          <div class="table-options" v-if="['select', 'radio'].includes(tableField[index].from_type)">
+          <div class="table-options" v-if="['select', 'radio', 'checkbox'].includes(tableField[index].from_type)">
             <Select>
               <Option v-for="item in tableField[index].options" :value="item.value" :key="item.value">{{
                 item.label
@@ -60,7 +60,7 @@
           <div v-else>--</div>
         </template>
         <template slot-scope="{ row, index }" slot="action">
-          <a v-if="!foundation.isTable" @click="del(row, index)">删除</a>
+          <a v-if="!foundation.primaryKey" @click="del(row, index)">删除</a>
           <span v-else>--</span>
         </template>
       </Table>
@@ -100,8 +100,7 @@ export default {
       },
     },
     id: {
-      type: String,
-      default: '',
+      type: String | Number,
     },
   },
   data() {
@@ -231,7 +230,12 @@ export default {
         if ((!el.field || !el.field_type) && !['addTimestamps', 'addSoftDelete'].includes(el.field_type)) {
           return this.$Message.warning('请先完善上一条数据');
         }
-        if (el.is_table && !el.table_name && !['addTimestamps', 'addSoftDelete'].includes(el.field_type)) {
+        if (
+          el.is_table &&
+          !el.table_name &&
+          !Number(el.primaryKey) &&
+          !['addTimestamps', 'addSoftDelete'].includes(el.field_type)
+        ) {
           return this.$Message.warning('请输入列表名');
         }
       }

template/admin/src/pages/system/codeGeneration/index.vue

@@ -89,7 +89,7 @@ export default {
       tableField: [],
       rowList: [],
       reqloading: false,
-      id: "",
+      id: '',
     };
   },
   created() {
@@ -102,9 +102,8 @@ export default {
   methods: {
     getDetail(id) {
       crudDet(id).then((res) => {
-        console.log(res);
         let data = res.data.crudInfo.field;
-        this.formItem.foundation.pid = data.pid;
+        this.formItem.foundation.pid = Number(data.pid);
         this.formItem.foundation.tableName = data.tableName;
         this.formItem.foundation.modelName = data.modelName;
         this.formItem.foundation.menuName = data.menuName;

template/admin/src/store/module/app.js

@@ -77,13 +77,15 @@ export default {
     },
     addTag(state, { route, type = 'unshift' }) {
       let router = getRouteTitleHandled(route);
-      console.log(router, 'routerrouterrouter');
+      let i = state.tagNavList.findIndex((item) => item.path === route.path);
+
       if (!routeHasExist(state.tagNavList, router)) {
-        if (type === 'push') state.tagNavList.push(router);
-        else {
-          if (router.name === homeName) state.tagNavList.unshift(router);
-          else state.tagNavList.splice(1, 0, router);
-        }
+        if (type === 'push')
+          if (i < 1) state.tagNavList.push(router);
+          else {
+            if (router.name === homeName) state.tagNavList.unshift(router);
+            else state.tagNavList.splice(1, 0, router);
+          }
         setTagNavListInLocalstorage([...state.tagNavList]);
       }
     },