no message

package-lock.json

@@ -4716,9 +4716,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.13.9",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.9.tgz",
-      "integrity": "sha512-3OBzQqTFIaV2AYu0KHMWgdSz04bOQSO3UHMJBCx08wXjcBezzrXoODQLdfWBYQDNhE+hpZo3mfxTLcOwbANrzw==",
+      "version": "2.13.10",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.10.tgz",
+      "integrity": "sha512-t4T4j8mSOLizW9DOKEJj9LH7tc8kskUe2t+T+jQZpQmHOzqRon124Edt7kU6JVPBhaacTtR7NBmzZGiwqec/aQ==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

@@ -18,7 +18,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/excel": "^1.3.0",
     "@vue/composition-api": "^1.7.1",
-    "@zjlib/element-plugins": "^2.13.9",
+    "@zjlib/element-plugins": "^2.13.10",
     "@zjlib/element-ui2": "^1.0.3",
     "axios": "0.18.1",
     "chatgpt": "^4.1.2",

src/components/tabPage/index.vue

@@ -1,101 +0,0 @@
-<template>
-  <zj-page-container>
-    <el-tabs v-model="activeKey" type="card" @tab-click="tabClick" closable @tab-remove="removeTab">
-      <el-tab-pane v-for="(item, index) in activeList" :key="item.key" :label="item.label || item.key"
-        :name="item.key"></el-tab-pane>
-    </el-tabs>
-    <zj-page-fill>
-      <slot :activeKey="showActiveKey" />
-    </zj-page-fill>
-  </zj-page-container>
-</template>
-
-<script>
-export default {
-  name: "TabPage",
-  props: {
-    defaultActives: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      activeKey: this?.defaultActives?.length ? this?.defaultActives?.[0]?.key : "",
-      oldActiveKey: this?.defaultActives?.length ? this?.defaultActives?.[0]?.key : "",
-      activeList: [...this.defaultActives]
-    };
-  },
-  computed: {
-    showActiveKey() {
-      var data = this.activeList.find(item => item.key == this.oldActiveKey)
-      return data?.activeKey || data?.key || ""
-    }
-  },
-  methods: {
-    // 点击
-    tabClick(tab) {
-      if (this.oldActiveKey != (tab.name || tab)) {
-        this.activeList.find(item => item.key == this.oldActiveKey)?.closeEvent?.()
-        this.$nextTick(() => {
-          this.activeList.find(item => item.key == (tab.name || tab))?.triggerEvent?.()
-          this.$nextTick(() => {
-            this.activeKey = (tab.name || tab)
-            this.oldActiveKey = this.activeKey
-          })
-        })
-      }
-    },
-    // 添加
-    addTab(tabObj) {
-      if (tabObj.key === undefined) {
-        console.error("缺少")
-        return
-      }
-      for (var i = 0; i < this.activeList.length; i++) {
-        if (this.activeList[i].key === tabObj.key) {
-          this.activeList.splice(i, 1, tabObj);
-          this.$nextTick(() => {
-            this.tabClick(tabObj.key)
-          })
-          return
-        }
-      }
-      this.activeList.push(tabObj)
-      this.$nextTick(() => {
-        this.tabClick(tabObj.key)
-      })
-    },
-    // 删除
-    removeTab(tab) {
-      var i;
-      for (i = 0; i < this.activeList.length; i++) {
-        if (this.activeList[i].key === tab) {
-          if (this.activeList[i].essential) {
-            this.$message.warning(`${this.activeList[i].label || this.activeList[i].key}是必须页面不能删除！`)
-            return
-          }
-          this.activeList[i]?.closeEvent?.()
-          this.activeList.splice(i, 1);
-          break
-        }
-      }
-      if (this.activeList[i]) {
-        this.tabClick(this.activeList[i].key)
-        return
-      }
-      if (this.activeList[i - 1]) {
-        this.tabClick(this.activeList[i - 1].key)
-        return
-      }
-      this.tabClick("")
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-::v-deep .el-tabs__header{
-  margin: 0 0 0 0 !important;
-}
-</style>

src/main.js

@@ -73,9 +73,6 @@ AMap.initAMapApiLoader({
   plugins: ['AMap.Geocoder', 'AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.DistrictSearch']
 })
 
-
-import tabPage from "@/components/tabPage/index.vue"
-Vue.component(tabPage.name, tabPage);
 // // 本地引用;
 // import ElementPlugins, { AMap } from '@packages'
 // Vue.use(ElementPlugins, {

src/views/setting/departmentManage/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <tabPage ref="tabPage" :defaultActives="[{ key: 'list', label: '列表页面', essential: true }]">
-    <template slot-scope="{activeKey}">
+  <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: '列表页面', essential: true }]">
+    <template slot-scope="{activeKey, data}">
       <div class="app-container">
         <div v-if="activeKey == 'list'" class="mymain-container">
           <div>
@@ -97,13 +97,13 @@
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button @click="cancelMainForm">取 消</el-button>
+            <el-button @click="data.removeTab">取 消</el-button>
             <el-button type="primary" @click="submitMainForm">确 定</el-button>
           </div>
         </div>
       </div>
     </template>
-  </tabPage>
+  </zj-tab-page>
 </template>
 
 <script>