Merge branch 'main' of https://git.light120.com/zc/admin_core

2026-04-18 15:26:57 +08:00
parent 3654d2a927 2c265bc93c
commit dd921e4648
21 changed files with 1175 additions and 122 deletions
--- a/src/api/system/index.js
+++ b/src/api/system/index.js
@@ -18,6 +18,7 @@ export { default as modelFieldServer } from './modelFieldServer'
 export { default as modelServer } from './modelServer'
 export { default as paramSetupServer } from './paramSetupServer'
 export { default as sysControlTypeServer } from './sysControlTypeServer'
+export { default as sysTenantServer } from './sysTenantServer'



--- a/src/api/system/sysTenantServer.js
+++ b/src/api/system/sysTenantServer.js
@@ -0,0 +1,22 @@
+import http from '@/utils/http'
+
+class SysTenantServer {
+  async list() {
+    return http.get('/sys_tenant/index', {})
+  }
+
+  async add(row) {
+    return http.post('/sys_tenant/add', row)
+  }
+
+  async edit(row) {
+    return http.post('/sys_tenant/edit', row)
+  }
+
+  async del(row) {
+    return http.post('/sys_tenant/del', row)
+  }
+}
+
+const sysTenantServer = new SysTenantServer()
+export default sysTenantServer
--- a/src/assets/css/ivewExpand.less
+++ b/src/assets/css/ivewExpand.less
@@ -110,6 +110,9 @@
 }

 .table-warp {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
  .ivu-card-body {
    height: 100%;
    display: flex;
@@ -186,20 +189,21 @@
  text-overflow: ellipsis;
 }

-/* 自适应表格宽度 */
+/* 与 View Design 一致：横向/纵向滚动由 .ivu-table-body 上的 overflow 类控制，避免 wrapper 与整表同高导致横向条在页面最底 */
 .ivu-table-wrapper {
  width: 100%;
  height: 100%;
-  overflow-x: auto;
-  overflow-y: auto;
+  overflow: hidden;
  flex: 1;
  display: flex;
  flex-direction: column;
+  min-height: 0;
 }

 .ivu-table {
  width: 100% !important;
  flex: 1;
+  min-height: 0;
 }

 /* 移除 table-layout: auto，使用 iView 默认的 fixed 布局以确保列对齐 */
@@ -208,8 +212,8 @@
 } */

 .ivu-table-body {
-  overflow-y: auto;
  flex: 1;
+  min-height: 0;
 }

 /* 按钮风格一致 */
--- a/src/components/main/components/header-bar/header-bar.less
+++ b/src/components/main/components/header-bar/header-bar.less
@@ -5,14 +5,24 @@
  height: 64px;
  display: flex;
  flex-direction: row;
+  align-items: center;

-  .custom-content-con {
-    height: 64px;
-    padding-right: 120px;
-    line-height: 64px;
-    display: inline-block;
-    vertical-align: top;
+  .header-breadcrumb {
+    margin-left: 30px;
    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+    line-height: 64px;
  }

+  .header-right-slot {
+    flex-shrink: 0;
+    height: 64px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: nowrap;
+    padding-right: 10px;
+    line-height: 64px;
+  }
 }
--- a/src/components/main/components/header-bar/header-bar.vue
+++ b/src/components/main/components/header-bar/header-bar.vue
@@ -1,8 +1,8 @@
 <template>
  <div class="header-bar">
    <sider-trigger :collapsed="collapsed" icon="md-menu" @on-change="handleCollpasedChange"></sider-trigger>
-    <custom-bread-crumb show-icon style="margin-left: 30px;" :list="breadCrumbList"></custom-bread-crumb>
-    <div class="custom-content-con">
+    <custom-bread-crumb class="header-breadcrumb" show-icon :list="breadCrumbList"></custom-bread-crumb>
+    <div class="header-right-slot">
      <slot></slot>
    </div>
  </div>
--- a/src/components/main/components/terminal/index.vue
+++ b/src/components/main/components/terminal/index.vue
@@ -19,7 +19,7 @@ export default {

  computed: {
    iconclass() {
-      let curClass = 'terminal-icon ml10'
+      let curClass = 'terminal-icon'
      // Terminal 功能暂时禁用
      // if (this.isServerRun) {
      //   curClass += ' run'
@@ -39,6 +39,8 @@ export default {
 <style lang="less" scoped>
 .terminal-box {
  margin-top: 3px;
+  margin-right: 10px;
+  flex-shrink: 0;
 }
 .terminal-icon {
  color: #c5c8ce;
--- a/src/components/main/components/user/user.vue
+++ b/src/components/main/components/user/user.vue
@@ -3,7 +3,7 @@
    <label class="loginName-box">{{userName}}</label>
    <Dropdown>

-      <Avatar :src="typeof userAvator === 'string' ? userAvator : userIcon" />
+      <Avatar :src="avatarSrc" />

      <Icon :size="18" type="md-arrow-dropdown"></Icon>
      <DropdownMenu slot="list">
@@ -21,7 +21,7 @@

 <script>
 import './user.less'
-import { mapMutations, mapActions } from 'vuex'
+import { mapActions } from 'vuex'

 const userIcon = require("@/assets/images/administrato.png").default

@@ -39,6 +39,23 @@ export default {
      userIcon:  userIcon
    }
  },
+  computed: {
+    /** 接口无头像或空串时用本地默认图，避免 Avatar 空 src 显示灰色块 */
+    avatarSrc() {
+      const v = this.userAvator
+      if (v != null && typeof v === 'string' && v.trim() !== '') {
+        const s = v.trim()
+        if (/^https?:\/\//i.test(s)) {
+          return s
+        }
+        if (this.$http && typeof this.$http.ImgSrc === 'function') {
+          return this.$http.ImgSrc(s)
+        }
+        return s
+      }
+      return this.userIcon
+    },
+  },
  methods: {
    ...mapActions('user', ['handleLogOut']),
    logout() {
@@ -55,9 +72,9 @@ export default {
 </script>
 <style lang="less" scoped>
 .user-avator-dropdown {
-  position: absolute;
-  top: 0px;
-  right: 10px;
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
 }

 .loginName-box {
--- a/src/components/main/main.vue
+++ b/src/components/main/main.vue
@@ -16,8 +16,15 @@

        <Header  class="header-con-main">
          <headerBar class="header-con" @on-coll-change="collpasedChange" :collapsed="collapsed">
-            <Terminal></Terminal>
-            <user :userName="userName" :user-avator="userAvator || ''" />
+            <div class="header-user-area">
+              <Terminal></Terminal>
+              <span
+                v-if="currentTenant"
+                class="main-tenant-tag"
+                :title="'租户：' + currentTenant.name + '（' + currentTenant.code + '）'"
+              >{{ currentTenant.name }}</span>
+              <user :userName="userName" :user-avator="userAvator || ''" />
+            </div>
          </headerBar>
        </Header>
        <Layout  class="main-layout-content">
@@ -42,7 +49,7 @@ import User from './components/user'
 import ABackTop from './components/a-back-top'
 import Fullscreen from './components/fullscreen'
 import Language from './components/language'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import headerBar from './components/header-bar'
 import loadFlower from '../load-flower/index'
 import Terminal from './components/terminal'
@@ -77,6 +84,7 @@ export default {
      userName: 'user/userName',
      userAvator: 'user/avatorImgPath'
    }),
+    ...mapState('user', ['currentTenant']),
    cacheList() {
      return ['ParentView']
    }
@@ -149,6 +157,30 @@ export default {
  z-index: 999999;
 }

+.header-user-area {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-wrap: nowrap;
+  flex-shrink: 0;
+}
+
+.main-tenant-tag {
+  margin-right: 12px;
+  flex-shrink: 0;
+  padding: 0 10px;
+  height: 28px;
+  line-height: 28px;
+  font-size: 13px;
+  color: #2d8cf0;
+  background: rgba(45, 140, 240, 0.08);
+  border-radius: 4px;
+  max-width: 160px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .sidebar-brand {
  display: flex;
  justify-content: center;
--- a/src/components/tables/fieldRenderer.vue
+++ b/src/components/tables/fieldRenderer.vue
@@ -59,15 +59,7 @@
 <script>
 import templateRender from './templateRender'
 import FrameworkSwitch from '../switch/index.vue'
-
-// 导入框架中的图标配置
-let icons = []
-try {
-  icons = require('../../config/icons.json') || []
-} catch (e) {
-  console.warn('未找到图标配置文件，图标选择功能将不可用', e)
-  icons = []
-}
+import { SELECT_ICON_OPTIONS } from './selectIconOptions'

 export default {
  name: 'FieldRenderer',
@@ -91,7 +83,7 @@ export default {
  },
  data() {
    return {
-      icons: []
+      icons: SELECT_ICON_OPTIONS
    }
  },
  computed: {
@@ -112,21 +104,13 @@ export default {
      return this.value
    }
  },
-  mounted() {
-    // 安全处理图标数据
-    if (Array.isArray(icons)) {
-      this.icons = icons.map((item) => item.trim ? item.trim() : item)
-    } else {
-      this.icons = []
-    }
-  },
  methods: {
    // 组件映射表 - 统一管理组件类型
    getComponentName(componentType) {
      const componentMap = {
        'Select': 'Select',
        'Radio': 'RadioGroup',
-        'SelectIcon': 'AutoComplete',
+        'SelectIcon': 'Select',
        'UploadSingle': 'UploadSingle',
        'TextArea': 'TextArea',
        'Input': 'Input',
@@ -174,7 +158,9 @@ export default {
        baseProps.filterable = true
        baseProps.clearable = true
      } else if (col.com === 'SelectIcon') {
-        baseProps.icon = 'ios-search'
+        baseProps.filterable = true
+        baseProps.clearable = true
+        baseProps.placeholder = col.placeholder || '搜索或选择图标'
      } else if (col.com === 'TextArea') {
        baseProps.rows = 4
        baseProps.placeholder = '请输入内容'
@@ -255,6 +241,7 @@ export default {
        'TextArea': 'width:100%;',
        'DatePicker': 'width:100%;',
        'TimePicker': 'width:100%;',
+        'SelectIcon': 'width:100%;',
        "inputNumber": "width:100%;",
        
      }
--- a/src/components/tables/index.vue
+++ b/src/components/tables/index.vue
@@ -13,11 +13,24 @@
        <a v-if="isDown&&value&&value.length>0" class="link right-link" @click="downExecl">下载</a>
      </div>

-      <Table :class="tbClass" ref="tablesMain" border :data="insideTableData" :width='defaultWidth' :height='defaultHeight' :columns="insideColumns" v-bind="$attrs" @on-selection-change='onSelect'>
-        <slot></slot>
-        <slot name="footer" slot="footer"></slot>
-        <slot name="loading" slot="loading"></slot>
-      </Table>
+      <div class="table-main">
+        <Table
+          v-bind="$attrs"
+          :class="tbClass"
+          ref="tablesMain"
+          border
+          :data="insideTableData"
+          :width="defaultWidth"
+          :height="defaultHeight"
+          :max-height="effectiveTableMaxHeight"
+          :columns="insideColumns"
+          @on-selection-change="onSelect"
+        >
+          <slot></slot>
+          <slot name="footer" slot="footer"></slot>
+          <slot name="loading" slot="loading"></slot>
+        </Table>
+      </div>
    </div>

  </div>
@@ -81,6 +94,9 @@ export default {
      },
      // 动态计算的偏移量
      calculatedOffset: null,
+      /** 传给 iView Table 的 max-height（px），使表体在可视区内滚动，横向条始终在视口底部 */
+      bodyViewportMaxHeight: null,
+      _tableContentResizeObserver: null,
    }
  },

@@ -145,6 +161,13 @@ export default {
      // 使用手动指定的偏移量
      return `calc(100vh - ${this.maxHeightOffset}px)`
    },
+
+    /** 未传 height 时由容器测量得到，避免宽表横向滚动条落在整表最底部 */
+    effectiveTableMaxHeight() {
+      if (this.height) return undefined
+      if (this.bodyViewportMaxHeight == null) return undefined
+      return this.bodyViewportMaxHeight
+    },
  },

  methods: {
@@ -174,6 +197,7 @@ export default {
          // 触发表格重新渲染
          this.$refs.tablesMain.$forceUpdate()
        }
+        this.syncTableBodyMaxHeight()
      })
    },
    onChangePage(page) {
@@ -184,6 +208,43 @@ export default {
      this.$emit('on-select', selection, row)
    },

+    syncTableBodyMaxHeight() {
+      if (this.height) {
+        this.bodyViewportMaxHeight = null
+        return
+      }
+      this.$nextTick(() => {
+        const wrap = this.$refs.table_content
+        if (!wrap) return
+        const titleEl = wrap.querySelector('.table-title')
+        const titleH = (this.title || this.isDown) && titleEl ? titleEl.offsetHeight : 0
+        const avail = wrap.clientHeight - titleH
+        const next = Math.max(160, Math.floor(avail))
+        if (this.bodyViewportMaxHeight !== next) {
+          this.bodyViewportMaxHeight = next
+        }
+        this.$nextTick(() => {
+          const inst = this.$refs.tablesMain
+          if (inst && typeof inst.handleResize === 'function') {
+            inst.handleResize()
+          }
+        })
+      })
+    },
+
+    setupTableContentResizeObserver() {
+      const el = this.$refs.table_content
+      if (!el || typeof ResizeObserver === 'undefined') return
+      if (this._tableContentResizeObserver) {
+        this._tableContentResizeObserver.disconnect()
+      }
+      const ro = new ResizeObserver(() => {
+        this.syncTableBodyMaxHeight()
+      })
+      ro.observe(el)
+      this._tableContentResizeObserver = ro
+    },
+
    // 动态计算表格容器上方所有元素的高度总和
    calculateOffset() {
      this.$nextTick(() => {
@@ -203,6 +264,9 @@ export default {

        // 计算总偏移量
        this.calculatedOffset = topOffset + pageBoxHeight + bottomPadding
+        this.$nextTick(() => {
+          this.syncTableBodyMaxHeight()
+        })
      })
    },
  },
@@ -243,6 +307,7 @@ export default {

      // 动态计算偏移量
      this.calculateOffset()
+      this.setupTableContentResizeObserver()
      
      // 如果数据或列配置为空，输出警告
      if (!this.insideTableData || this.insideTableData.length === 0) {
@@ -255,21 +320,34 @@ export default {

    // 监听窗口大小变化，重新计算偏移量
    window.addEventListener('resize', this.calculateOffset)
+    window.addEventListener('resize', this.syncTableBodyMaxHeight)
  },

  beforeDestroy() {
    // 移除窗口大小监听
    window.removeEventListener('resize', this.calculateOffset)
+    window.removeEventListener('resize', this.syncTableBodyMaxHeight)
+    if (this._tableContentResizeObserver) {
+      this._tableContentResizeObserver.disconnect()
+      this._tableContentResizeObserver = null
+    }
  },
 }
 </script>
 <style lang="less" scoped>
 .table-warp {
  width: 100%;
-
+  flex: 1;
+  display: flex;
+  flex-direction: column;
  .table-content {
-    overflow-y: auto;
+    /* 纵向由 Table 内部表体滚动；避免与外层双滚动导致横向条在整页最底 */
+    overflow: hidden;
    width: 100%;
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;

    .table-title {
      font-weight: bold;
@@ -279,10 +357,17 @@ export default {
      padding: 0rem 0.15rem;
      height: 50px;
      line-height: 50px;
+      flex-shrink: 0;
      .right-link {
        float: right;
      }
    }
+
+    .table-main {
+      flex: 1;
+      min-height: 0;
+      overflow: hidden;
+    }
  }

  .page-box {
--- a/src/components/tables/selectIconOptions.js
+++ b/src/components/tables/selectIconOptions.js
@@ -0,0 +1,306 @@
+/**
+ * 菜单/表单「图标」下拉选项（与 View Design Icon 的 type 一致）
+ * 不依赖 icons.json，保证 UMD 打包后无需额外静态资源即可使用
+ */
+export const SELECT_ICON_OPTIONS = [
+  'md-add',
+  'md-add-circle',
+  'md-alarm',
+  'md-albums',
+  'md-alert',
+  'md-american-football',
+  'md-analytics',
+  'md-aperture',
+  'md-apps',
+  'md-appstore',
+  'md-archive',
+  'md-arrow-back',
+  'md-arrow-down',
+  'md-arrow-dropdown',
+  'md-arrow-dropdown-circle',
+  'md-arrow-dropleft',
+  'md-arrow-dropleft-circle',
+  'md-arrow-dropright',
+  'md-arrow-dropright-circle',
+  'md-arrow-dropup',
+  'md-arrow-dropup-circle',
+  'md-arrow-forward',
+  'md-arrow-round-back',
+  'md-arrow-round-down',
+  'md-arrow-round-forward',
+  'md-arrow-round-up',
+  'md-arrow-up',
+  'md-at',
+  'md-attach',
+  'md-backspace',
+  'md-barcode',
+  'md-baseball',
+  'md-basket',
+  'md-basketball',
+  'md-battery-charging',
+  'md-battery-dead',
+  'md-battery-full',
+  'md-beaker',
+  'md-beer',
+  'md-bicycle',
+  'md-bluetooth',
+  'md-boat',
+  'md-body',
+  'md-bonfire',
+  'md-book',
+  'md-bookmark',
+  'md-bookmarks',
+  'md-bowtie',
+  'md-briefcase',
+  'md-browsers',
+  'md-brush',
+  'md-bug',
+  'md-build',
+  'md-bulb',
+  'md-bus',
+  'md-cafe',
+  'md-calculator',
+  'md-calendar',
+  'md-call',
+  'md-camera',
+  'md-car',
+  'md-card',
+  'md-cart',
+  'md-cash',
+  'md-chatboxes',
+  'md-chatbubbles',
+  'md-checkbox',
+  'md-checkbox-outline',
+  'md-checkmark',
+  'md-checkmark-circle',
+  'md-checkmark-circle-outline',
+  'md-clipboard',
+  'md-clock',
+  'md-close',
+  'md-close-circle',
+  'md-closed-captioning',
+  'md-cloud',
+  'md-cloud-circle',
+  'md-cloud-done',
+  'md-cloud-download',
+  'md-cloud-outline',
+  'md-cloud-upload',
+  'md-cloudy',
+  'md-cloudy-night',
+  'md-code',
+  'md-code-download',
+  'md-code-working',
+  'md-cog',
+  'md-color-fill',
+  'md-color-filter',
+  'md-color-palette',
+  'md-color-wand',
+  'md-compass',
+  'md-construct',
+  'md-contact',
+  'md-contacts',
+  'md-contract',
+  'md-contrast',
+  'md-copy',
+  'md-create',
+  'md-crop',
+  'md-cube',
+  'md-cut',
+  'md-desktop',
+  'md-disc',
+  'md-document',
+  'md-done-all',
+  'md-download',
+  'md-easel',
+  'md-egg',
+  'md-exit',
+  'md-expand',
+  'md-eye',
+  'md-eye-off',
+  'md-fastforward',
+  'md-female',
+  'md-filing',
+  'md-film',
+  'md-finger-print',
+  'md-flag',
+  'md-flame',
+  'md-flash',
+  'md-flask',
+  'md-flower',
+  'md-folder',
+  'md-folder-open',
+  'md-football',
+  'md-funnel',
+  'md-game-controller-a',
+  'md-game-controller-b',
+  'md-git-branch',
+  'md-git-commit',
+  'md-git-compare',
+  'md-git-merge',
+  'md-git-network',
+  'md-git-pull-request',
+  'md-glasses',
+  'md-globe',
+  'md-grid',
+  'md-hammer',
+  'md-hand',
+  'md-happy',
+  'md-headset',
+  'md-heart',
+  'md-heart-outline',
+  'md-help',
+  'md-help-buoy',
+  'md-help-circle',
+  'md-home',
+  'md-ice-cream',
+  'md-image',
+  'md-images',
+  'md-infinite',
+  'md-information',
+  'md-information-circle',
+  'md-ionic',
+  'md-ionitron',
+  'md-jet',
+  'md-key',
+  'md-keypad',
+  'md-laptop',
+  'md-leaf',
+  'md-link',
+  'md-list',
+  'md-list-box',
+  'md-locate',
+  'md-lock',
+  'md-log-in',
+  'md-log-out',
+  'md-magnet',
+  'md-mail',
+  'md-mail-open',
+  'md-male',
+  'md-man',
+  'md-map',
+  'md-medal',
+  'md-medical',
+  'md-medkit',
+  'md-megaphone',
+  'md-menu',
+  'md-mic',
+  'md-mic-off',
+  'md-microphone',
+  'md-moon',
+  'md-more',
+  'md-move',
+  'md-musical-note',
+  'md-musical-notes',
+  'md-navigate',
+  'md-no-smoking',
+  'md-notifications',
+  'md-notifications-off',
+  'md-notifications-outline',
+  'md-nuclear',
+  'md-nutrition',
+  'md-open',
+  'md-options',
+  'md-outlet',
+  'md-paper',
+  'md-paper-plane',
+  'md-partly-sunny',
+  'md-pause',
+  'md-paw',
+  'md-people',
+  'md-person',
+  'md-person-add',
+  'md-phone-landscape',
+  'md-phone-portrait',
+  'md-photos',
+  'md-pie',
+  'md-pin',
+  'md-pint',
+  'md-pizza',
+  'md-plane',
+  'md-planet',
+  'md-play',
+  'md-podium',
+  'md-power',
+  'md-pricetag',
+  'md-pricetags',
+  'md-print',
+  'md-pulse',
+  'md-qr-scanner',
+  'md-quote',
+  'md-radio',
+  'md-radio-button-off',
+  'md-radio-button-on',
+  'md-rainy',
+  'md-recording',
+  'md-redo',
+  'md-refresh',
+  'md-refresh-circle',
+  'md-remove',
+  'md-remove-circle',
+  'md-reorder',
+  'md-repeat',
+  'md-resize',
+  'md-restaurant',
+  'md-return-left',
+  'md-return-right',
+  'md-reverse-camera',
+  'md-rewind',
+  'md-ribbon',
+  'md-rose',
+  'md-sad',
+  'md-school',
+  'md-search',
+  'md-send',
+  'md-settings',
+  'md-share',
+  'md-share-alt',
+  'md-shirt',
+  'md-shuffle',
+  'md-skip-backward',
+  'md-skip-forward',
+  'md-snow',
+  'md-speedometer',
+  'md-square',
+  'md-square-outline',
+  'md-star',
+  'md-star-half',
+  'md-star-outline',
+  'md-stats',
+  'md-stopwatch',
+  'md-subway',
+  'md-sunny',
+  'md-swap',
+  'md-switch',
+  'md-sync',
+  'md-tablet-landscape',
+  'md-tablet-portrait',
+  'md-tennisball',
+  'md-text',
+  'md-thermometer',
+  'md-thumbs-down',
+  'md-thumbs-up',
+  'md-thunderstorm',
+  'md-time',
+  'md-timer',
+  'md-train',
+  'md-transgender',
+  'md-trash',
+  'md-trending-down',
+  'md-trending-up',
+  'md-trophy',
+  'md-umbrella',
+  'md-undo',
+  'md-unlock',
+  'md-videocam',
+  'md-volume-down',
+  'md-volume-mute',
+  'md-volume-off',
+  'md-volume-up',
+  'md-walk',
+  'md-warning',
+  'md-watch',
+  'md-water',
+  'md-wifi',
+  'md-wine',
+  'md-woman'
+]
--- a/src/config/menuConfig.js
+++ b/src/config/menuConfig.js
@@ -115,6 +115,17 @@ export const defaultMenus = [
        is_show_menu: 1,
        icon: 'md-text',
        sort: 3
+      },
+      {
+        id: 125,
+        name: '租户管理',
+        path: '/system/tenant',
+        component: 'system/sys_tenant',
+        parent_id: 120,
+        type: '页面',
+        is_show_menu: 1,
+        icon: 'md-git-branch',
+        sort: 4
      }
    ]
  }
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -3,6 +3,16 @@ import uiTool from '../utils/uiTool'
 import { defaultMenus, filterMenusByIds } from '../config/menuConfig'
 import userServer from '../api/system/userServer'

+function readTenantLs() {
+  try {
+    const s = localStorage.getItem('currentTenant')
+    if (!s || s === 'undefined') return null
+    return JSON.parse(s)
+  } catch {
+    return null
+  }
+}
+
 export default {
  namespaced: true,
  state: {
@@ -10,7 +20,9 @@ export default {
    avatorImgPath: '',
    token: getToken(),
    authorityMenus: [],
-    menuList: localStorage.getItem('menuList') ? JSON.parse(localStorage.getItem('menuList')) : []
+    menuList: localStorage.getItem('menuList') ? JSON.parse(localStorage.getItem('menuList')) : [],
+    /** 登录返回的租户信息：{ id, name, code, is_platform } */
+    currentTenant: readTenantLs()
  },
  mutations: {
    setAvator(state, avatorPath) {
@@ -31,6 +43,14 @@ export default {
    setMenuList(state, menus) {
      state.menuList = menus
      localStorage.setItem('menuList', JSON.stringify(menus))
+    },
+    setCurrentTenant(state, tenant) {
+      state.currentTenant = tenant && typeof tenant === 'object' ? tenant : null
+      if (state.currentTenant) {
+        localStorage.setItem('currentTenant', JSON.stringify(state.currentTenant))
+      } else {
+        localStorage.removeItem('currentTenant')
+      }
    }
  },
  getters: {
@@ -162,6 +182,11 @@ export default {

        commit('setUserName', name)
        commit('setToken', token)
+        if (res.data.tenant) {
+          commit('setCurrentTenant', res.data.tenant)
+        } else {
+          commit('setCurrentTenant', null)
+        }

        // 登录接口返回的 authorityMenus 是菜单 ID 数组字符串
        console.log('登录返回的菜单 IDs:', authorityMenusIds)
@@ -205,6 +230,7 @@ export default {
      commit('setToken', '')
      commit('setAuthorityMenus', '[]')
      commit('setMenuList', [])
+      commit('setCurrentTenant', null)
      localStorage.removeItem('menuList')
      window.location.reload()
    }
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -1,6 +1,27 @@
 import axios from 'axios'
 import { formatDate } from './tools'

+/** 递归删除对象中值为空字符串的键（不修改数组内的空字符串元素） */
+function stripEmptyStringKeys(value) {
+  if (value === null || value === undefined) {
+    return value
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => stripEmptyStringKeys(item))
+  }
+  if (typeof value === 'object' && Object.prototype.toString.call(value) === '[object Object]') {
+    const next = {}
+    for (const k of Object.keys(value)) {
+      const v = value[k]
+      if (v === '') {
+        continue
+      }
+      next[k] = stripEmptyStringKeys(v)
+    }
+    return next
+  }
+  return value
+}

 class Http {
  constructor() {
@@ -131,13 +152,18 @@ class Http {
    }

    param = JSON.parse(JSON.stringify(param))
-    return param
+    return stripEmptyStringKeys(param)
  }

  formatFormDataParam(param) {
+    param = param || {}
    let formData = new FormData()
-    Object.keys(param).forEach(key => {
-      formData.append(key, param[key])
+    Object.keys(param).forEach((key) => {
+      const v = param[key]
+      if (v === '') {
+        return
+      }
+      formData.append(key, v)
    })
    return formData
  }
--- a/src/views/index.js
+++ b/src/views/index.js
@@ -4,6 +4,7 @@ import SysLog from './system/sys_log.vue'
 import SysParamSetup from './system/sys_param_setup.vue'
 import SysRole from './system/sys_role.vue'
 import SysUser from './system/sys_user.vue'
+import SysTenant from './system/sys_tenant.vue'
 import SysLogOperate from './system/sys_log_operate.vue'


@@ -36,6 +37,7 @@ export function setupComponentMap(customMap = {}, uiTool) {
    'system/sys_param_setup': SysParamSetup,
    'system/sys_role': SysRole,
    'system/sys_user': SysUser,
+    'system/sys_tenant': SysTenant,
    'system/sys_control': SysControl,
    'system/sys_menu': SysMenu,
    'system/sys_title': SysTitle,
@@ -60,6 +62,7 @@ export default {
  SysParamSetup,
  SysRole,
  SysUser,
+  SysTenant,
  SysControl,
  SysMenu,
  SysTitle,
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -9,7 +9,7 @@
    </div>

    <div class="login-con">
-      <Card icon="log-in" title="欢迎登录" style="width:350px;height:300px;" :bordered="false">
+      <Card icon="log-in" title="欢迎登录" style="width:350px;height:260px;" :bordered="false">
        <div class="form-con">
          <login-form @on-success-valid="handleSubmit"></login-form>
        </div>
@@ -45,7 +45,10 @@ export default {
    ...mapActions('user', ['handleLogin']),
    async handleSubmit({ userName, password }) {
      try {
-        let userFrom = { name: userName, password: password }
+        let userFrom = {
+          name: userName,
+          password: password
+        }
        await this.handleLogin({
          userFrom,
          Main,
--- a/src/views/system/sys_role.vue
+++ b/src/views/system/sys_role.vue
@@ -1,5 +1,8 @@
 <template>
  <div class="content-view">
+    <Alert type="info" show-icon closable style="margin-bottom: 12px">
+      角色为<strong>全库共用</strong>，不按租户隔离；各租户用户可在「用户管理」中绑定同一角色，菜单权限以角色配置为准。
+    </Alert>
    <div class="table-head-tool">
      <Button type="primary" @click="showAddWarp">新增</Button>
    </div>
@@ -73,6 +76,23 @@ export default {
    this.init()
  },
  methods: {
+    parseRoleMenuIds(menus) {
+      if (menus == null || menus === '') {
+        return []
+      }
+      if (Array.isArray(menus)) {
+        return menus.map((id) => Number(id)).filter((id) => !Number.isNaN(id))
+      }
+      if (typeof menus === 'string') {
+        try {
+          const parsed = JSON.parse(menus)
+          return this.parseRoleMenuIds(parsed)
+        } catch {
+          return []
+        }
+      }
+      return []
+    },
    async init() {
      let res = await roleServer.list()
      this.gridOption.data = res.data
@@ -120,12 +140,8 @@ export default {

      let res = await menuServer.list()
      let tree = uiTool.transformTree(res.data)
-      if (row.menus) {
-        this.expandTreeAll = JSON.parse(row.menus)
-        this.treeData = this.mapTree(tree)
-      } else {
-        this.treeData = this.mapTree(tree)
-      }
+      this.expandTreeAll = this.parseRoleMenuIds(row.menus)
+      this.treeData = this.mapTree(tree)

      this.isShowPermission = true
    },
@@ -136,7 +152,7 @@ export default {
          p.children = this.mapTree(p.children)
        }

-        let row = this.expandTreeAll.find((p2) => p2 === p.id)
+        let row = this.expandTreeAll.find((p2) => Number(p2) === Number(p.id))
        if (row) {
          p.checked = true
        }
--- a/src/views/system/sys_tenant.vue
+++ b/src/views/system/sys_tenant.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="content-view">
+    <Alert type="warning" show-icon style="margin-bottom: 12px">
+      仅<strong>平台租户</strong>（is_platform=1）可维护租户列表；普通租户登录后本页仅能看到自身租户信息。
+      新增时<strong>租户编码可留空</strong>，留空则由服务端自动生成；填写则使用自定义编码（须唯一）。需在数据库执行迁移脚本创建 <code>sys_tenant</code> 表及默认数据。
+    </Alert>
+    <div class="table-head-tool">
+      <Button type="primary" @click="showAddWarp">新增租户</Button>
+    </div>
+    <div class="table-body">
+      <tables ref="tables" v-model="gridOption.data" :columns="gridOption.columns" />
+    </div>
+    <editModal ref="editModal" :columns="gridOption.columns" :data="gridOption.editRow" />
+  </div>
+</template>
+
+<script>
+import uiTool from '@/utils/uiTool'
+import sysTenantServer from '@/api/system/sysTenantServer'
+
+export default {
+  name: 'sys_tenant_page',
+  data() {
+    return {
+      gridOption: {
+        editRow: {},
+        columns: [
+          { title: 'id', key: 'id' },
+          { title: '名称', key: 'name', name: 'name', required: true },
+          {
+            title: '租户编码',
+            key: 'code',
+            name: 'code',
+            placeholder: '留空则保存时自动生成；填写则使用自定义编码（须唯一）'
+          },
+          { title: '备注', key: 'remark', name: 'remark' },
+          {
+            title: '状态',
+            key: 'status',
+            name: 'status',
+            com: 'Radio',
+            source: [
+              { key: 1, value: '启用' },
+              { key: 0, value: '停用' }
+            ],
+            render(h, p) {
+              return h('span', p.row.status === 1 ? '启用' : '停用')
+            }
+          },
+          {
+            title: '平台租户',
+            key: 'is_platform',
+            name: 'is_platform',
+            com: 'Switch',
+            render(h, p) {
+              return h('span', Number(p.row.is_platform) === 1 ? '是' : '否')
+            }
+          },
+          {
+            title: '操作',
+            render: (h, params) => {
+              if (params.row.id === 1) {
+                return h('span', { style: { color: '#999' } }, '内置租户')
+              }
+              const btns = [
+                {
+                  title: '修改',
+                  type: 'primary',
+                  click: () => this.showEditWarp(params.row)
+                },
+                {
+                  title: '删除',
+                  type: 'primary',
+                  click: () => this.delConfirm(params.row)
+                }
+              ]
+              return uiTool.getBtn(h, btns)
+            }
+          }
+        ],
+        data: []
+      }
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    normalizeTenantRow(row) {
+      const r = { ...row }
+      r.is_platform = r.is_platform === true || r.is_platform === 1 || r.is_platform === '1' ? 1 : 0
+      if (r.code != null && typeof r.code === 'string' && !r.code.trim()) {
+        delete r.code
+      }
+      return r
+    },
+    async init() {
+      const res = await sysTenantServer.list()
+      if (res && res.code === 0) {
+        this.gridOption.data = res.data || []
+      }
+    },
+    showAddWarp() {
+      this.$refs.editModal.addShow(
+        { status: 1, is_platform: 0 },
+        async (row) => {
+          await sysTenantServer.add(this.normalizeTenantRow(row))
+          this.$Message.success('新增成功')
+          this.init()
+        }
+      )
+    },
+    showEditWarp(row) {
+      this.$refs.editModal.editShow(row, async (newRow) => {
+        await sysTenantServer.edit(this.normalizeTenantRow(newRow))
+        this.$Message.success('修改成功')
+        this.init()
+      })
+    },
+    delConfirm(row) {
+      uiTool.delConfirm(async () => {
+        await sysTenantServer.del(row)
+        this.$Message.success('删除成功')
+        this.init()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.content-view {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+}
+.table-body {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+</style>
--- a/src/views/system/sys_user.vue
+++ b/src/views/system/sys_user.vue
@@ -1,5 +1,9 @@
 <template>
  <div class="content-view">
+    <Alert v-if="currentTenant" type="info" show-icon closable style="margin-bottom: 12px">
+      当前租户：<strong>{{ currentTenant.name }}</strong>（{{ currentTenant.code }}）。用户按租户隔离；
+      <strong>角色全库共用</strong>，下拉中的角色对所有租户一致。
+    </Alert>

    <div class="table-head-tool">
      <Button type="primary" @click="showAddWarp">新增</Button>
@@ -16,9 +20,10 @@
  </div>
 </template>
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import userServer from '@/api/system/userServer'
 import roleServer from '@/api/system/roleServer'
+import sysTenantServer from '@/api/system/sysTenantServer'
 import uiTool from '@/utils/uiTool'

 export default {
@@ -29,8 +34,21 @@ export default {
      gridOption: {
        editRow: {},
        columns: [
-          { title: '登陆名', key: 'name' },
-
+          { title: '登陆名', key: 'name', name: 'name' },
+          {
+            title: '租户',
+            key: 'tenant_id',
+            name: 'tenant_id',
+            com: 'Select',
+            required: true,
+            render(h, params) {
+              if (params.row.tenant) {
+                const t = params.row.tenant
+                return h('span', `${t.name || ''}（${t.code || ''}）`)
+              }
+              return h('span', params.row.tenant_id != null ? String(params.row.tenant_id) : '')
+            }
+          },
          {
            title: '密码',
            key: 'password',
@@ -41,6 +59,7 @@ export default {
          {
            title: '所属角色',
            key: 'roleId',
+            name: 'roleId',
            com: 'Select',
            render: (h, params) => {
              if (params.row.role) {
@@ -83,6 +102,12 @@ export default {
    ...mapGetters({
      shopList: 'shop/shopList',
    }),
+    ...mapState('user', ['currentTenant']),
+  },
+  watch: {
+    currentTenant() {
+      this.initCol()
+    },
  },
  created() {
    this.init()
@@ -94,31 +119,53 @@ export default {
      this.gridOption.data = res.data
    },
    async initCol() {
-      let res = await roleServer.list()
-      this.roles = res.data
-      let roleSource = this.roles.map((p) => {
-        return {
-          key: p.id,
-          value: p.name,
-        }
-      })
+      const res = await roleServer.list()
+      this.roles = res.data || []
+      const roleSource = this.roles.map((p) => ({
+        key: p.id,
+        value: p.name,
+      }))

-      let roleRow = this.gridOption.columns.find((p) => p.key === 'roleId')
+      const roleRow = this.gridOption.columns.find((p) => p.key === 'roleId')
      if (roleRow) {
        roleRow.source = roleSource
      }
+
+      const tenantRes = await sysTenantServer.list()
+      const tenants = tenantRes && tenantRes.code === 0 && Array.isArray(tenantRes.data) ? tenantRes.data : []
+      const tenantSource = tenants.map((t) => ({
+        key: Number(t.id),
+        value: `${t.name || ''}（${t.code || ''}）`,
+      }))
+
+      const platform = this.currentTenant && Number(this.currentTenant.is_platform) === 1
+      const tenantCol = this.gridOption.columns.find((p) => p.key === 'tenant_id')
+      if (tenantCol) {
+        tenantCol.source = tenantSource
+        tenantCol.disabled = !platform
+        tenantCol.disabledOnAdd = !platform
+      }
    },

    showAddWarp() {
-      this.$refs.editModal.addShow({}, async (newRow) => {
-        await userServer.add(newRow)
+      const tid = this.currentTenant && this.currentTenant.id != null ? Number(this.currentTenant.id) : undefined
+      this.$refs.editModal.addShow({ tenant_id: tid }, async (newRow) => {
+        const payload = { ...newRow }
+        if (payload.tenant_id != null) {
+          payload.tenant_id = Number(payload.tenant_id)
+        }
+        await userServer.add(payload)
        this.$Message.success('新增成功！')
        this.init()
      })
    },
    showEditWarp(row) {
-      this.$refs.editModal.editShow(row, async (newRow) => {
-        await userServer.edit(newRow)
+      this.$refs.editModal.editShow({ ...row }, async (newRow) => {
+        const payload = { ...newRow }
+        if (payload.tenant_id != null) {
+          payload.tenant_id = Number(payload.tenant_id)
+        }
+        await userServer.edit(payload)
        this.$Message.success('修改成功！')
        this.init()
      })