create-jnrs-template-vue 1.1.5 → 1.1.6

package/jnrs-template-vue/src/views/system/dict/index.vue

@@ -0,0 +1,176 @@
+<script setup lang="ts">
+import { ElMessage } from 'element-plus'
+import { ref, onActivated } from 'vue'
+import { DictApi, DictDetailApi, DictChangeApi } from '@/api/system'
+import { useAsyncTableHeight } from '@jnrs/vue-core/composables'
+import type { DictItem } from '@jnrs/shared'
+
+const { maxHeight } = useAsyncTableHeight('el_table_dict', 0)
+const loading = ref(false)
+const tableData = ref<DictItem[]>()
+const predefineColors = ref([
+  '#000000',
+  '#999999',
+  '#f2f2f2',
+  '#ffffff',
+  '#65DC79',
+  '#5887F7',
+  '#E43634',
+  '#FEA822',
+  '#C9512C'
+])
+
+onActivated(() => {
+  getList()
+})
+
+const getList = () => {
+  loading.value = true
+  DictApi()
+    .then((res) => {
+      tableData.value = res
+    })
+    .finally(() => {
+      loading.value = false
+    })
+}
+
+const handleExpandChange = (row: DictItem) => {
+  loading.value = true
+  DictDetailApi(String(row.id))
+    .then((res) => {
+      row.options = res
+    })
+    .finally(() => {
+      loading.value = false
+    })
+}
+
+// 保存键值对
+const editKeyValue = (row: DictItem) => {
+  if (!row.label) {
+    ElMessage({
+      type: 'warning',
+      message: 'label 不能为空'
+    })
+    return false
+  }
+  loading.value = true
+  DictChangeApi(row)
+    .then(() => {
+      ElMessage({
+        type: 'success',
+        message: '修改成功',
+        grouping: true
+      })
+    })
+    .finally(() => {
+      loading.value = false
+    })
+}
+</script>
+
+<template>
+  <div class="main">
+    <el-card shadow="never">
+      <template #header>
+        <div class="card_header">
+          <h3>字典管理</h3>
+        </div>
+      </template>
+      <el-table
+        class="el_table_dict"
+        :data="tableData"
+        :height="maxHeight"
+        scrollbar-always-on
+        border
+        v-loading="loading"
+        row-key="id"
+        @expand-change="handleExpandChange"
+      >
+        <el-table-column prop="dictName" label="字典名" />
+        <el-table-column prop="describe" label="说明" />
+        <el-table-column type="expand" fixed="right" label="字典值" width="100">
+          <template #default="scope">
+            <div
+              class="table_expand animation15"
+              style="animation-duration: 0.5s; animation-delay: 0s"
+            >
+              <div class="table_expand_top">
+                <h5>字典值列表</h5>
+              </div>
+              <el-table :data="scope.row.options" :border="true" size="small" row-key="value">
+                <el-table-column
+                  label="value"
+                  prop="value"
+                  width="100"
+                  align="center"
+                ></el-table-column>
+                <el-table-column label="label" prop="label">
+                  <template #default="optionScope">
+                    <el-input v-model="optionScope.row.label" maxlength="20" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="颜色" prop="displayColor">
+                  <template #default="optionScope">
+                    <el-color-picker
+                      v-model="optionScope.row.displayColor"
+                      :predefine="predefineColors"
+                    />
+                    <span style="margin-left: 10px">
+                      {{ optionScope.row.displayColor || '无' }}
+                    </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="sequence" label="排序" width="180" align="center">
+                  <template #default="optionScope">
+                    <el-input-number
+                      v-model="optionScope.row.sequence"
+                      :min="1"
+                      :max="999"
+                      :step="1"
+                      controls-position="right"
+                      step-strictly
+                      style="width: 140px"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="100" align="center" fixed="right">
+                  <template #default="optionScope">
+                    <el-button type="success" size="small" @click="editKeyValue(optionScope.row)">
+                      确认修改
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.table_expand {
+  padding: 10px;
+  color: var(--jnrs-font-primary);
+  background: var(--jnrs-background-primary);
+
+  .table_expand_top {
+    position: relative;
+
+    h5 {
+      font-size: 14px;
+      margin-bottom: 10px;
+    }
+
+    .table_expand_top_btn {
+      position: absolute;
+      right: 0;
+      top: 0;
+      z-index: 1;
+    }
+  }
+}
+</style>

package/jnrs-template-vue/src/views/system/menu/index.vue

@@ -0,0 +1,67 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useMenuStore } from '@/stores'
+import { getDictLabel } from '@/utils/common'
+import { useAsyncTableHeight } from '@jnrs/vue-core/composables'
+
+const { maxHeight } = useAsyncTableHeight('el_table_menu', 0)
+const loading = ref(false)
+
+const { menus } = useMenuStore()
+</script>
+
+<template>
+  <div>
+    <el-card shadow="never">
+      <template #header>
+        <div class="card_header">
+          <h3>菜单管理</h3>
+        </div>
+      </template>
+      <el-table
+        class="el_table_menu"
+        :data="menus"
+        :height="maxHeight"
+        scrollbar-always-on
+        row-key="meta.uuid"
+        border
+        v-loading="loading"
+      >
+        <el-table-column prop="meta.title" label="名称" min-width="120" />
+        <el-table-column prop="path" label="路由地址" min-width="120" />
+        <el-table-column prop="role" label="权限" min-width="120">
+          <template #default="{ row }">
+            <span v-if="!row.meta.role" style="color: #999">auto</span>
+            <template v-else>
+              {{ row.meta.role.map((d: string | number) => getDictLabel('role', d)) }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column prop="editRole" label="操作权限" min-width="120">
+          <template #default="scope">
+            <template v-if="!scope.row.editRole">
+              <span style="color: #999" v-if="!scope.row.role">auto</span>
+              <!-- <template v-else>
+                {{ scope.row.role.map((d) => getDictLabel('role', d.split('Role')[1])) }}
+              </template> -->
+            </template>
+            <!-- <template v-else>
+              {{ scope.row.editRole.map((d) => getDictLabel('role', d.split('Role')[1])) }}
+            </template> -->
+          </template>
+        </el-table-column>
+        <el-table-column prop="type" label="类型" width="80" align="center">
+          <template #default="scope">
+            <el-tag type="primary" v-if="scope.row.path">菜单</el-tag>
+            <el-tag type="success" v-else>目录</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="activate" label="图标" width="80" align="center">
+          <template #default="scope">
+            <el-icon v-if="scope.row.icon"><component :is="scope.row.icon" /></el-icon>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>

package/jnrs-template-vue/src/views/system/mine/baseInfo.vue

@@ -1,41 +1,32 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
+import { storeToRefs } from 'pinia'
 import { ElMessage } from 'element-plus'
 import type { UploadProps } from 'element-plus'
 import { useAuthStore } from '@/stores'
 import { useAvatar } from '@/composables/common/useAvatar'
+import { getOneDictList } from '@/utils/common'
+import type { User } from '@jnrs/shared'
 
-const { userInfo, token } = useAuthStore()
+const { userInfo, token } = storeToRefs(useAuthStore())
 const { avatar } = useAvatar()
 const loading = ref(false)
 const ruleFormRef = ref()
-const ruleForm = ref({
+const ruleForm = ref<User>({
+  id: 0,
   account: '',
   name: '',
   workNo: '',
-  jobTitle: '',
+  jobTitle: 0,
   workgroup: '',
-  role: ''
+  role: 0,
+  avatarFileName: ''
 })
 const rules = ref({
   // account: { required: true, message: '请输入', trigger: 'change' },
   // role: { required: true, message: '请输入', trigger: 'change' },
   // name: { required: true, message: '请输入', trigger: 'change' },
   // workNo: { required: true, message: '请输入', trigger: 'change' },
-  // email: [
-  //   { required: false, message: '请输入', trigger: 'change' },
-  //   {
-  //     validator: (rule, value, callback) => {
-  //       if (value && !isEmail(value)) {
-  //         callback(new Error('请输入有效的邮箱!'))
-  //       } else {
-  //         callback()
-  //       }
-  //     },
-  //     required: false,
-  //     trigger: 'blur'
-  //   }
-  // ]
 })
 
 interface ApiResponse {
@@ -44,9 +35,15 @@ interface ApiResponse {
   data: string
 }
 
+onMounted(() => {
+  if (userInfo.value) {
+    ruleForm.value = userInfo.value
+  }
+})
+
 const handleAvatarSuccess: UploadProps['onSuccess'] = (response: ApiResponse) => {
   loading.value = false
-  if (response.code === 0) {
+  if (userInfo.value && response.code === 0) {
     userInfo.value.avatarFileName = response.data
     ElMessage.success({ message: '头像上传成功' })
   }
@@ -69,28 +66,39 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
 </script>
 
 <template>
-  <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto">
+  <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto" disabled>
     <el-form-item label="登录账号" prop="account">
-      <el-input v-model.trim="ruleForm.account" style="width: 200px" disabled />
+      <el-input v-model.trim="ruleForm.account" style="width: 200px" />
     </el-form-item>
     <el-form-item label="名称" prop="name">
-      <el-input v-model.trim="ruleForm.name" style="width: 200px" disabled />
+      <el-input v-model.trim="ruleForm.name" style="width: 200px" />
     </el-form-item>
     <el-form-item label="工号" prop="workNo">
-      <el-input v-model.trim="ruleForm.workNo" style="width: 200px" disabled />
+      <el-input v-model.trim="ruleForm.workNo" style="width: 200px" />
     </el-form-item>
     <el-form-item label="职称" prop="jobTitle">
-      <el-input v-model.trim="ruleForm.jobTitle" style="width: 200px" disabled />
+      <el-select v-model="ruleForm.jobTitle" style="width: 200px">
+        <el-option
+          :label="item.label"
+          :value="item.value"
+          v-for="(item, index) in getOneDictList('jobTitle')"
+          :key="index"
+        />
+      </el-select>
     </el-form-item>
     <el-form-item label="部门/班组" prop="workgroup">
-      <el-input v-model.trim="ruleForm.workgroup" style="width: 200px" disabled />
+      <el-input v-model.trim="ruleForm.workgroup" style="width: 200px" />
     </el-form-item>
     <el-form-item label="职位/账号权限" prop="role">
-      <el-input v-model.trim="ruleForm.role" style="width: 200px" disabled />
+      <el-select v-model="ruleForm.role" style="width: 200px">
+        <el-option
+          :label="item.label"
+          :value="item.value"
+          v-for="(item, index) in getOneDictList('role')"
+          :key="index"
+        />
+      </el-select>
     </el-form-item>
-    <!-- <el-form-item label="邮箱" prop="email">
-      <el-input v-model.trim="ruleForm.email" style="width: 200px" />
-    </el-form-item> -->
     <el-form-item label="头像" prop="avatarFileName" class="uploader_item">
       <el-upload
         action="/api/user/avatar"

package/jnrs-template-vue/src/views/system/mine/securitySettings.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue'
-import { LoginApi, PasswordChangeApi } from '@/api/base'
+import { PasswordChangeApi } from '@/api/system'
 import { useAuthStore } from '@/stores'
 import { handleRouter } from '@jnrs/vue-core/router'
 import { isWeakPwd } from '@jnrs/shared/validator'
 import type { FormInstance, FormItemRule } from 'element-plus'
 import { ElMessage } from 'element-plus'
-import { LogoutApi } from '@/api/base/index'
+import { LogoutApi } from '@/api/system'
 
 const { userInfo, asyncClearAuth } = useAuthStore()
 const loading = ref(false)
@@ -45,22 +45,16 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   try {
     const valid = await formEl.validate()
-    if (valid) {
+    if (valid && userInfo?.id) {
       loading.value = true
-      const loginRes = await LoginApi({
-        account: userInfo.account,
-        password: ruleForm.value.originPassword
+      await PasswordChangeApi({
+        userId: userInfo.id,
+        password: ruleForm.value.password
       })
-      if (loginRes.token) {
-        await PasswordChangeApi({
-          userId: userInfo.id,
-          password: ruleForm.value.password
-        })
-        ElMessage.success('密码修改成功，请重新登录系统')
-        await LogoutApi()
-        await asyncClearAuth()
-        handleRouter({ name: 'Login' }, 'replace')
-      }
+      ElMessage.success('密码修改成功，请重新登录系统')
+      await LogoutApi()
+      await asyncClearAuth()
+      handleRouter({ name: 'Login' }, 'replace')
     }
   } catch {
   } finally {
@@ -99,9 +93,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
       />
     </el-form-item>
     <el-form-item>
-      <el-button class="form_submit" type="primary" @click="submitForm(formRef)">
-        保存修改
-      </el-button>
+      <el-button class="form_submit" type="primary" @click="submitForm(formRef)">保存修改</el-button>
     </el-form-item>
   </el-form>
 </template>

package/jnrs-template-vue/src/views/system/role/editDialog.vue

@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import type { FormInstance } from 'element-plus'
+import { ref, nextTick } from 'vue'
+defineOptions({
+  name: 'editDialog'
+})
+
+const loading = ref(false)
+const dialogVisible = ref(false)
+const ruleFormRef = ref<FormInstance>()
+const ruleForm = ref({
+  id: '',
+  name: '',
+  enname: '',
+  remark: '',
+  usable: '1'
+})
+const rules = ref({
+  name: { required: true, message: '请输入角色名称', trigger: 'change' },
+  enname: { required: true, message: '请输入英文名称', trigger: 'change' },
+  usable: { required: true, message: '请选择是否可用', trigger: 'change' }
+})
+
+const toggleVisible = () => {
+  dialogVisible.value = !dialogVisible.value
+  nextTick(() => {
+    ruleFormRef.value?.resetFields()
+  })
+}
+
+const submitForm = () => {
+  if (!ruleFormRef.value) return
+  ruleFormRef.value.validate(async (valid) => {
+    if (!valid) return
+  })
+}
+
+defineExpose({
+  toggleVisible
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    width="600"
+    :append-to-body="true"
+    :close-on-click-modal="true"
+    :close-on-press-escape="true"
+  >
+    <template #header>
+      <h3>{{ ruleForm.id ? '修改' : '添加' }}角色</h3>
+    </template>
+    <el-form
+      ref="ruleFormRef"
+      :model="ruleForm"
+      :rules="rules"
+      label-width="auto"
+      v-loading="loading"
+      style="width: 80%; margin: 0 auto"
+    >
+      <el-form-item prop="id" v-show="false">
+        <el-input v-model="ruleForm.id" />
+      </el-form-item>
+      <el-form-item label="角色名称" prop="name">
+        <el-input v-model="ruleForm.name" maxlength="20" />
+      </el-form-item>
+      <el-form-item label="英文名称" prop="enname">
+        <el-input v-model="ruleForm.enname" maxlength="20" />
+      </el-form-item>
+      <el-form-item label="说明" prop="remark">
+        <el-input v-model="ruleForm.remark" maxlength="200" type="textarea" :rows="5" />
+      </el-form-item>
+      <el-form-item label="是否可用" prop="usable">
+        <el-switch
+          v-model="ruleForm.usable"
+          inline-prompt
+          active-text="是"
+          inactive-text="否"
+          :active-value="true"
+          :inactive-value="false"
+          width="50"
+          style="--el-switch-on-color: #67c23a; --el-switch-off-color: #f56c6c"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="toggleVisible()" :loading="loading">取消</el-button>
+        <el-button type="primary" @click="submitForm()" :loading="loading">提交</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>

package/jnrs-template-vue/src/views/system/role/index.vue

@@ -1,9 +1,36 @@
 <script setup lang="ts">
 import { ref } from 'vue'
+import { useAuthStore } from '@/stores'
+
+const { dict } = useAuthStore()
+const loading = ref(false)
+const tableData = ref(dict?.role)
 </script>
 
 <template>
-  <div>role</div>
+  <div class="main">
+    <el-card shadow="never">
+      <template #header>
+        <div class="card_header">
+          <h3>角色管理</h3>
+        </div>
+      </template>
+      <el-table
+        class="el_table_role"
+        header-cell-class-name="tableData_header_cell"
+        :data="tableData"
+        scrollbar-always-on
+        border
+        v-loading="loading"
+      >
+        <el-table-column prop="label" label="角色名称" align="center" />
+        <!-- <el-table-column prop="codeValue" label="系统权限" align="center" /> -->
+        <el-table-column prop="value" label="值" align="center">
+          <template #default="scope">
+            {{ scope.row.value + '[' + typeof scope.row.value + ']' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
 </template>
-
-<style lang="scss" scoped></style>

package/jnrs-template-vue/vite.config.ts

@@ -33,8 +33,9 @@ export default defineConfig({
     }),
     viteMockServe({
       mockPath: 'viteMockServe', // mock 文件目录
+      watchFiles: true, // mock 文件热更新
       enable: isMock, // 是否开启
-      logger: isMock // 打印 mock 日志
+      logger: isMock // 是否在终端显示请求日志
     })
   ],
   resolve: {

package/jnrs-template-vue/viteMockServe/dictItemRes.json

@@ -0,0 +1,27 @@
+{
+  "data": [
+    {
+      "id": 7,
+      "value": 0,
+      "label": "未审批",
+      "displayColor": "#FEA822",
+      "sequence": 1
+    },
+    {
+      "id": 8,
+      "value": 1,
+      "label": "未通过",
+      "displayColor": "#E43634",
+      "sequence": 2
+    },
+    {
+      "id": 9,
+      "value": 2,
+      "label": "已通过",
+      "displayColor": "#65DC79",
+      "sequence": 3
+    }
+  ],
+  "code": 0,
+  "msg": "操作成功"
+}