kz-ui-base 1.0.161 → 2.0.148

package/views/system/common/modal/UserModal.vue

@@ -7,7 +7,7 @@
           <div class="head-container">
             <el-input
               v-model="deptName"
-              :placeholder="t('userModal.placeholder.deptPostName')"
+              placeholder="请输入部门|岗位名称"
               clearable
               size="small"
               prefix-icon="el-icon-search"
@@ -34,50 +34,50 @@
       <el-col :span="20" :xs="24">
         <div class="wrapper-container" v-show="showSearch">
           <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-            <el-form-item :label="t('userModal.userCode')" prop="userCode">
+            <el-form-item label="用户编码" prop="userCode">
               <el-input
                 v-model="queryParams.userCode"
-                :placeholder="t('userModal.placeholder.userCode')"
+                placeholder="请输入用户编码"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item :label="t('userModal.userName')" prop="userName">
+            <el-form-item label="用户账号" prop="userName">
               <el-input
                 v-model="queryParams.userName"
-                :placeholder="t('userModal.placeholder.userName')"
+                placeholder="请输入用户账号"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item :label="t('userModal.nickName')" prop="nickName">
+            <el-form-item label="用户名称" prop="nickName">
               <el-input
                 v-model="queryParams.nickName"
-                :placeholder="t('userModal.placeholder.nickName')"
+                placeholder="请输入用户名称"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item :label="t('userModal.phone')" prop="phone">
+            <el-form-item label="手机号码" prop="phone">
               <el-input
                 v-model="queryParams.phone"
-                :placeholder="t('userModal.placeholder.phone')"
+                placeholder="请输入手机号码"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item :label="t('userModal.status')" prop="status">
+            <el-form-item label="在职状态" prop="status">
               <el-select
                 v-model="queryParams.status"
-                :placeholder="t('userModal.placeholder.status')"
+                placeholder="在职状态"
                 clearable
                 size="small"
                 style="width: 240px"
@@ -90,7 +90,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item :label="t('userModal.createTime')">
+            <el-form-item label="创建时间">
               <el-date-picker
                 v-model="dateRange"
                 size="small"
@@ -98,13 +98,13 @@
                 value-format="yyyy-MM-dd"
                 type="daterange"
                 range-separator="-"
-                :start-placeholder="t('userModal.placeholder.startDate')"
-                :end-placeholder="t('userModal.placeholder.endDate')"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ t('userModal.search') }}</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ t('userModal.reset') }}</el-button>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -119,20 +119,20 @@
                     @select="handleSelect"
                     @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
-            <el-table-column :label="t('userModal.userCode')" align="center" key="userCode" prop="userCode" v-if="columns[0].visible" min-width="120" />
-            <el-table-column :label="t('userModal.userName')" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+            <el-table-column label="用户编码" align="center" key="userCode" prop="userCode" v-if="columns[0].visible" min-width="120" />
+            <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
                              :show-overflow-tooltip="true" min-width="120" />
-            <el-table-column :label="t('userModal.nickName')" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+            <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
                              :show-overflow-tooltip="true" min-width="120" />
-            <el-table-column :label="t('userModal.deptPost')" align="center" key="post.postName" v-if="columns[3].visible"
+            <el-table-column label="部门|岗位" align="center" key="post.postName" v-if="columns[3].visible"
                              :show-overflow-tooltip="true" min-width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.dept.deptName }}/{{ scope.row.post.postName }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="t('userModal.phone')" align="center" key="phone" prop="phone" v-if="columns[4].visible"
+            <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
                              min-width="120" />
-            <el-table-column :label="t('userModal.status')" align="center" key="status" v-if="columns[5].visible" min-width="120">
+            <el-table-column label="在职状态" align="center" key="status" v-if="columns[5].visible" min-width="120">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.status"
                            active-value="0"
@@ -140,12 +140,12 @@
                            @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
-            <el-table-column :label="t('userModal.createTime')" align="center" prop="createTime" v-if="columns[6].visible" min-width="160">
+            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" min-width="160">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="t('userModal.createBy')" align="center" prop="createBy" v-if="columns[7].visible" min-width="160" :formatter="userDisplayFormat">
+            <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible" min-width="160" :formatter="userDisplayFormat">
             </el-table-column>
           </el-table>
           <pagination
@@ -158,8 +158,8 @@
         </div>
       </el-col>
         <div v-if="value && value.btnShow" class="dialog-footer" style="margin-top: 10px;position:static;">
-          <el-button type="primary" @click="submitForm">{{ t('userModal.confirm') }}</el-button>
-          <el-button @click="cancel">{{ t('userModal.cancel') }}</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
         </div>
     </el-row>
   </div>
@@ -280,9 +280,49 @@ export default {
         postId: undefined
       },
       // 列信息
-      columns: [],
+      columns: [
+        {key: 0, label: `用户编码`, visible: true},
+        {key: 1, label: `用户账号`, visible: true},
+        {key: 2, label: `用户名称`, visible: true},
+        {key: 3, label: `部门|岗位`, visible: true},
+        {key: 4, label: `手机号码`, visible: true},
+        {key: 5, label: `状态`, visible: true},
+        { key: 6, label: `创建时间`, visible: true },
+        { key: 7, label: `创建人`, visible: true }
+      ],
       // 表单校验
-      rules: {}
+      rules: {
+        postId: [
+          {required: true, message: "部门|岗位不能为空", trigger: "blur"}
+        ],
+        userCode: [
+          {required: true, message: "用户编码不能为空", trigger: "blur"}
+        ],
+        userName: [
+          {required: true, message: "用户账号不能为空", trigger: "blur"}
+        ],
+        nickName: [
+          {required: true, message: "用户名称不能为空", trigger: "blur"}
+        ],
+        password: [
+          {required: true, message: "用户密码不能为空", trigger: "blur"},
+          {min: 6, max: 20, message: '用户密码长度必须介于 6 和 20 之间', trigger: 'blur'}
+        ],
+        email: [
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phone: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
     }
   },
   watch: {
@@ -301,48 +341,6 @@ export default {
     }
   },
   created() {
-    this.columns = [
-      {key: 0, label: this.t('userModal.userCode'), visible: true},
-      {key: 1, label: this.t('userModal.userName'), visible: true},
-      {key: 2, label: this.t('userModal.nickName'), visible: true},
-      {key: 3, label: this.t('userModal.deptPost'), visible: true},
-      {key: 4, label: this.t('userModal.phone'), visible: true},
-      {key: 5, label: this.t('userModal.status'), visible: true},
-      {key: 6, label: this.t('userModal.createTime'), visible: true},
-      {key: 7, label: this.t('userModal.createBy'), visible: true}
-    ];
-    this.rules = {
-      postId: [
-        {required: true, message: this.t('userModal.required.deptPost'), trigger: "blur"}
-      ],
-      userCode: [
-        {required: true, message: this.t('userModal.required.userCode'), trigger: "blur"}
-      ],
-      userName: [
-        {required: true, message: this.t('userModal.required.userName'), trigger: "blur"}
-      ],
-      nickName: [
-        {required: true, message: this.t('userModal.required.nickName'), trigger: "blur"}
-      ],
-      password: [
-        {required: true, message: this.t('userModal.required.password'), trigger: "blur"},
-        {min: 6, max: 20, message: this.t('userModal.required.passwordLength'), trigger: 'blur'}
-      ],
-      email: [
-        {
-          type: "email",
-          message: this.t('userModal.required.email'),
-          trigger: ["blur", "change"]
-        }
-      ],
-      phone: [
-        {
-          pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-          message: this.t('userModal.required.phone'),
-          trigger: "blur"
-        }
-      ]
-    };
     this.getList()
     this.getTreeSelect()
     this.getDicts("sys_normal_disable").then(response => {
@@ -470,13 +468,13 @@ export default {
       debugger
       if (this.isReturnEntity) {
         if (!this.multipleSelection || this.multipleSelection.length === 0) {
-          this.msgError(this.t('userModal.selectUserTip'));
+          this.msgError("请选择一笔用户数据！");
         } else {
           this.$emit("confirm", this.multipleChoice ? this.multipleSelection : this.multipleSelection?.[0])
         }
       } else {
         if (! this.ids ||  this.ids.length === 0) {
-          this.msgError(this.t('userModal.selectUserTip'));
+          this.msgError("请选择一笔用户数据！");
         } else {
           this.$emit("confirm", this.ids);
         }

package/components/base/dialog/MultiLanguageDialog.vue

@@ -1,308 +0,0 @@
-<template>
-  <el-dialog
-    :title="t('config.multi_language_config')"
-    :visible.sync="dialogVisible"
-    width="900px"
-    append-to-body
-    v-dialogDrag
-    @close="handleDialogClose"
-  >
-    <div v-for="(columnName, index) in config.dataLangColumnFields" :key="index">
-      <el-card :body-style="{ padding: '10px' }" style="margin-bottom: 15px;">
-        <div slot="header" class="clearfix">
-          <span>{{ getLabelByKey(columnName) }}</span>
-        </div>
-        <el-table :data="getTableData(columnName)" height="300" border size="small">
-          <el-table-column property="value" :label="t('config.value')" />
-          <el-table-column v-for="(lang, langIndex) in languages" :key="langIndex">
-            <template slot="header">
-              <span>{{ lang.label }}</span>
-            </template>
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row[lang.value]"
-                :placeholder="`请输入${lang.label}`"
-                size="small"
-              />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-card>
-    </div>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="handleClose">{{ t('config.close') }}</el-button>
-      <el-button type="primary" @click="handleSubmit">{{ t('config.confirm') }}</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import request from '@utils/request'
-import { batchSaveTranslation } from './config.js'
-
-export default {
-  name: "MultiLanguageDialog",
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    config: {
-      type: Object,
-      default: () => ({
-        entityName: 'sys_config',
-        dataLangColumnFields: [],
-        dataLangIdField: 'id',
-        data: []
-      })
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      languages: [],
-      tableDataMap: {} // 存储每个字段的表格数据
-    }
-  },
-  watch: {
-    visible(val) {
-      this.dialogVisible = val
-    },
-    dialogVisible(val) {
-      this.$emit('update:visible', val)
-      if (val) {
-        // 弹框打开时重新初始化数据
-        this.getLanguages()
-      }
-    }
-  },
-  methods: {
-    getLabelByKey(key) {
-      const labelMap = {
-        configName: this.t('config.config_name'),
-        configKey: this.t('config.config_key'),
-        configValue: this.t('config.config_value'),
-        configType: this.t('config.config_type'),
-        remark: this.t('config.remark')
-      }
-      return labelMap[key] || key
-    },
-    /**
-     * 通过 dataLangFieldMap 映射字段名
-     * 如果原始字段找不到，尝试通过映射获取值
-     * @param {Object} row - 数据行
-     * @param {string} field - 原始字段名
-     * @returns {any} 字段值
-     */
-    getFieldValueByMap(row, field) {
-      // 如果直接能找到字段，直接返回
-      if (row[field] !== undefined && row[field] !== null && row[field] !== '') {
-        return row[field]
-      }
-      // 如果找不到，尝试通过 dataLangFieldMap 映射
-      const fieldMap = this.config.dataLangFieldMap
-      if (fieldMap) {
-        // 查找映射关系中 value 等于 field 的 key
-        const mappedKey = Object.keys(fieldMap).find(key => fieldMap[key] === field)
-        if (mappedKey && row[mappedKey] !== undefined && row[mappedKey] !== null && row[mappedKey] !== '') {
-          return row[mappedKey]
-        }
-      }
-      return null
-    },
-    getTableData(columnName) {
-      // 如果已经有数据，直接返回（保持响应式）
-      if (this.tableDataMap[columnName]) {
-        return this.tableDataMap[columnName]
-      }
-      // 初始化数据
-      const data = this.config.data.map((row, index) => {
-        const item = {
-          id: this.getFieldValueByMap(row, this.config.dataLangIdField) || row.configId,
-          // 使用 getFieldValueByMap 获取原始值（会处理字段映射）
-          value: this.getFieldValueByMap(row, columnName) || '-',
-          configKey: row.configKey
-        }
-        // 为每个语言初始化字段
-        this.languages.forEach(lang => {
-          item[lang.value] = ''
-        })
-        return item
-      })
-      this.tableDataMap[columnName] = data
-      return data
-    },
-    initTableData() {
-      // 初始化所有字段的数据
-      this.config.dataLangColumnFields.forEach(columnName => {
-        this.tableDataMap[columnName] = this.config.data.map((row, index) => {
-          const item = {
-            id: this.getFieldValueByMap(row, this.config.dataLangIdField) || row.configId,
-            // 使用 getFieldValueByMap 获取原始值（会处理字段映射）
-            value: this.getFieldValueByMap(row, columnName) || '-',
-            configKey: row.configKey
-          }
-          this.languages.forEach(lang => {
-            item[lang.value] = ''
-          })
-          return item
-        })
-      })
-    },
-    getLanguages() {
-      request({
-        url: '/system/api/i18n/locales',
-        method: 'get'
-      }).then(response => {
-        if (response.data) {
-          this.languages = Object.keys(response.data).map(key => ({
-            label: response.data[key],
-            value: key
-          }))
-          // 语言加载完成后初始化表格数据
-          this.initTableData()
-          // 批量查询翻译并回填
-          this.fetchAndFillTranslations()
-        }
-      }).catch(error => {
-        console.error('获取语言列表失败:', error)
-        // 默认使用中英文
-        this.languages = [
-          { label: '中文 (中国)', value: 'zh_CN' },
-          { label: 'English (United States)', value: 'en_US' }
-        ]
-        // 语言加载完成后初始化表格数据
-        this.initTableData()
-        // 批量查询翻译并回填
-        this.fetchAndFillTranslations()
-      })
-    },
-    /** 批量获取翻译并回填 - 按每个语言调用接口 */
-    fetchAndFillTranslations() {
-      if (!this.config.data || this.config.data.length === 0 || this.languages.length === 0) {
-        return
-      }
-      const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
-      const tenantId = userInfo.tenantId
-
-      // 构建请求参数 - 公共部分
-      const recordIds = this.config.data.map((item) =>
-        String(this.getFieldValueByMap(item, this.config.dataLangIdField))
-      ).filter((id) => id && id !== "" && id !== "undefined" && id !== "null")
-
-      if (recordIds.length === 0) {
-        return
-      }
-
-      // 【重要】循环每个语言，分别调用接口回填
-      this.languages.forEach(lang => {
-        const params = {
-          entityName: this.config.entityName,
-          recordIds: recordIds,
-          columnNames: this.config.dataLangColumnFields,
-          locale: lang.value,
-          tenantId: tenantId
-        }
-
-        // 批量查询翻译接口 - 单语言
-        request({
-          url: '/system/api/i18n/translation/batch-get-multi',
-          method: 'post',
-          data: params
-        }).then(response => {
-          if (response.code === 200 && response.data) {
-            this.fillTranslationsByLocale(response.data, lang.value)
-          }
-        }).catch(error => {
-          console.error(`获取${lang.label}翻译失败:`, error)
-        })
-      })
-    },
-    /** 按指定语言回填到对应的 input 列 */
-    fillTranslationsByLocale(translationMap, currentLocale) {
-      // translationMap 格式：{"1": {"dictName": "用户性别"}}
-      // currentLocale: "zh_CN" / "en_US"
-      this.config.dataLangColumnFields.forEach(columnName => {
-        const tableData = this.tableDataMap[columnName] || []
-        tableData.forEach((rowData, rowIndex) => {
-          const originalRow = this.config.data[rowIndex]
-          const recordId = String(this.getFieldValueByMap(originalRow, this.config.dataLangIdField))
-
-          // 如果这条数据有翻译，放到对应语言的 input 中
-          if (translationMap[recordId] && translationMap[recordId][columnName]) {
-            const translationValue = translationMap[recordId][columnName]
-            // currentLocale = "zh_CN" 对应 rowData["zh_CN"]
-            rowData[currentLocale] = translationValue
-          }
-        })
-      })
-    },
-    handleClose() {
-      this.dialogVisible = false
-    },
-    handleDialogClose() {
-      // 弹框关闭时清空数据，确保下次打开时重新初始化
-      this.languages = []
-      this.tableDataMap = {}
-    },
-    handleSubmit() {
-      // 构建批量保存翻译的请求数据
-      const saveData = []
-
-      this.config.dataLangColumnFields.forEach(columnName => {
-        const tableData = this.tableDataMap[columnName] || []
-        tableData.forEach((rowData, rowIndex) => {
-          const originalRow = this.config.data[rowIndex]
-          // 获取实际的记录 ID（通过 dataLangFieldMap 映射）
-          const recordId = this.getFieldValueByMap(originalRow, this.config.dataLangIdField) || originalRow.configId
-
-          this.languages.forEach(lang => {
-            const translationValue = rowData[lang.value]
-            // 只有当用户填写了翻译内容时才保存
-            if (translationValue && translationValue.trim() !== '') {
-              // 从 localStorage 获取 userInfo 中的 tenantId
-              const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
-              saveData.push({
-                entityName: this.config.entityName || 'sys_config',
-                recordId: String(recordId),
-                columnName: columnName,
-                locale: lang.value,
-                translation: translationValue,
-                tenantId: userInfo.tenantId || undefined
-              })
-            }
-          })
-        })
-      })
-
-      console.log('保存数据:', saveData)
-
-      if (saveData.length === 0) {
-        this.$message.warning(this.t('config.please_enter_translation'))
-        return
-      }
-
-      // 调用批量保存翻译接口
-      batchSaveTranslation(saveData).then(response => {
-        if (response.code === 200) {
-          this.$message.success(this.t('config.translation_save_success'))
-          this.$emit('update:visible', false)
-          this.$emit('saved')
-        } else {
-          this.$message.error(response.msg || this.t('config.translation_save_failed'))
-        }
-      }).catch(error => {
-        console.error('批量保存翻译失败:', error)
-        this.$message.error(this.t('config.translation_save_failed'))
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.clearfix {
-  font-weight: bold;
-  font-size: 14px;
-}
-</style>

package/components/base/dialog/config.js

@@ -1,85 +0,0 @@
-import request from '@utils/request'
-
-// 查询参数列表
-export function listConfig(query) {
-  return request({
-    url: '/system/config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询参数详细
-export function getConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'get'
-  })
-}
-
-// 根据参数键名查询参数值
-export function getConfigKey(configKey) {
-  return request({
-    url: '/system/config/configKey/' + configKey,
-    method: 'get'
-  })
-}
-
-// 根据参数键名查询参数值
-export function innerConfigKey(configKey) {
-  return request({
-    url: '/system/config/innerConfigKey/' + configKey,
-    method: 'get'
-  })
-}
-
-// 新增参数配置
-export function addConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改参数配置
-export function updateConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除参数配置
-export function delConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'delete'
-  })
-}
-
-// 刷新参数缓存
-export function refreshCache() {
-  return request({
-    url: '/system/config/refreshCache',
-    method: 'delete'
-  })
-}
-// 批量保存或更新翻译
-export function batchSaveTranslation(data) {
-  return request({
-    url: '/system/api/i18n/translation/batch-save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 批量获取翻译
-export function batchGetTranslation(data) {
-  return request({
-    url: '/system/api/i18n/translation/batch-get-multi',
-    method: 'post',
-    data: data
-  })
-}