create-jnrs-template-vue 1.2.3 → 1.2.4

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

@@ -1,18 +1,16 @@
 <script setup lang="ts">
+import type { FormInstance } from 'element-plus'
 import { ref, onMounted } from 'vue'
-import { storeToRefs } from 'pinia'
-import { ElMessage } from 'element-plus'
-import type { UploadProps } from 'element-plus'
 import { useAuthStore } from '@jnrs/vue-core/pinia'
-import { useAvatar } from '@/composables/base/useAvatar'
 import { getDictList } from '@/utils/packages'
-import type { User } from '@jnrs/shared'
+import { JnFileUpload } from '@jnrs/vue-core/components'
+import { AvatarChangeApi } from '@/api/system'
+import { objectMatchAssign } from '@jnrs/shared'
 
-const { userInfo, token } = storeToRefs(useAuthStore())
-const { avatar } = useAvatar()
-const loading = ref(false)
-// const ruleFormRef = ref()
-const ruleForm = ref<User>({
+const { userInfo } = useAuthStore()
+// const loading = ref(false)
+const ruleFormRef = ref<FormInstance>()
+const ruleForm = ref({
   id: 0,
   account: '',
   name: '',
@@ -20,7 +18,8 @@ const ruleForm = ref<User>({
   jobTitle: 0,
   workgroup: '',
   role: 0,
-  avatarFileName: ''
+  avatarFileName: '',
+  file: []
 })
 const rules = ref({
   // account: { required: true, message: '请输入', trigger: 'change' },
@@ -29,44 +28,14 @@ const rules = ref({
   // workNo: { required: true, message: '请输入', trigger: 'change' },
 })
 
-interface ApiResponse {
-  code: number
-  message: string
-  data: string
-}
-
 onMounted(() => {
-  if (userInfo.value) {
-    ruleForm.value = userInfo.value
-  }
+  const matched = objectMatchAssign(ruleForm.value, userInfo)
+  ruleForm.value = matched
 })
-
-const handleAvatarSuccess: UploadProps['onSuccess'] = (response: ApiResponse) => {
-  loading.value = false
-  if (userInfo.value && response.code === 0) {
-    userInfo.value.avatarFileName = response.data
-    ElMessage.success({ message: '头像上传成功' })
-  }
-}
-
-const handleProgress = () => {
-  loading.value = true
-}
-
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-  if (rawFile.type.indexOf('image/') < 0) {
-    ElMessage.error('上传头像只能是图片格式！')
-    return false
-  } else if (rawFile.size / 1024 / 1024 > 10) {
-    ElMessage.error('上传头像图片大小不能超过10MB!')
-    return false
-  }
-  return true
-}
 </script>
 
 <template>
-  <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto" disabled>
+  <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto" :disabled="true">
     <el-form-item label="登录账号" prop="account">
       <el-input v-model.trim="ruleForm.account" style="width: 200px" />
     </el-form-item>
@@ -94,23 +63,21 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
         <el-option :label="item.label" :value="item.value" v-for="(item, index) in getDictList('role')" :key="index" />
       </el-select>
     </el-form-item>
-    <el-form-item label="头像" prop="avatarFileName" class="uploader_item">
-      <el-upload
-        action="/api/user/avatar"
-        :headers="{
-          Authorization: 'Bearer ' + token
-        }"
-        :show-file-list="false"
-        :before-upload="beforeAvatarUpload"
-        :on-progress="handleProgress"
-        :on-success="handleAvatarSuccess"
-      >
-        <img v-if="avatar" :src="avatar" class="uploader_avatar" />
-        <el-icon v-else class="uploader_icon"><Plus /></el-icon>
-      </el-upload>
+    <el-form-item label="头像" prop="file" class="uploader_item">
+      <JnFileUpload
+        v-model="ruleForm.file"
+        :formRef="ruleFormRef"
+        validateFieldName="newImageFiles"
+        accept=".png,.jpg,.bmp,.gif"
+        :fileSizeMb="50"
+        :limit="1"
+        :showFileList="false"
+        :autoUploadApi="AvatarChangeApi"
+        style="width: 500px"
+      />
     </el-form-item>
     <!-- <el-form-item>
-      <el-button class="form_submit" :loading="loading" type="primary" @click="submitForm(ruleFormRef)">
+      <el-button class="form_submit" :loading="loading" type="primary" @click="submitForm">
         保存修改
       </el-button>
     </el-form-item> -->

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

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { RoleApi } from '@/api/system'
+import { JnTable } from '@jnrs/vue-core/components'
 
 const loading = ref(false)
 const tableData = ref()
@@ -18,33 +19,23 @@ onMounted(() => {
 </script>
 
 <template>
-  <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="角色名称" width="200" align="center" />
-        <el-table-column prop="value" label="值" width="200" align="center">
-          <template #default="{ row }">
-            {{ row.value + ' [' + typeof row.value + ']' }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="permissions" label="可用权限" header-align="center">
-          <template #default="{ row }">
-            {{ row.permissions }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+  <el-card v-loading="loading">
+    <template #header>
+      <span>角色管理</span>
+    </template>
+
+    <JnTable :data="tableData">
+      <el-table-column prop="label" label="角色名称" width="200" align="center" />
+      <el-table-column prop="value" label="值" width="200" align="center">
+        <template #default="{ row }">
+          {{ row.value + ' [' + typeof row.value + ']' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="permissions" label="可用权限" header-align="center">
+        <template #default="{ row }">
+          {{ row.permissions }}
+        </template>
+      </el-table-column>
+    </JnTable>
+  </el-card>
 </template>

package/jnrs-template-vue/src/views/visual/index.vue

@@ -1,22 +1,59 @@
 <script setup lang="ts">
-const goLogin = () => {
-  // removeAll()
-  window.location.href = '/login'
-}
-const goHome = () => {
-  window.location.href = '/'
-}
-const goBack = () => {
-  window.history.go(-1)
-}
+import type { MsgIdMessage, TypeDataMessage } from '@/types/webSocket'
+import { isMsgIdMessage, isTypeDataMessage } from '@/types/webSocket'
+import { storeToRefs } from 'pinia'
+import { useWebSocket } from '@jnrs/vue-core/composables'
+import { useRouter } from '@jnrs/vue-core/router'
+import { useSystemStore } from '@jnrs/vue-core/pinia'
+
+const router = useRouter()
+const systemStore = useSystemStore()
+const { documentFullscreen } = storeToRefs(systemStore)
+const { toggleFullScreen } = systemStore
+
+const { isLoading, wsStateInfo } = useWebSocket({
+  url: '/ws/monitor',
+  connectionTimeoutDuration: 3_000, // 修改仅为测试
+  onMessage: (rawMessage: unknown) => {
+    if (isMsgIdMessage(rawMessage)) {
+      const msg = rawMessage as MsgIdMessage
+      if (msg.msgId && msg.d && typeof msg.d === 'object') {
+        // console.log('接收 msgId 数据:', msg)
+      }
+    } else if (isTypeDataMessage(rawMessage)) {
+      const msg = rawMessage as TypeDataMessage
+      if (msg.type && msg.data && typeof msg.data === 'object') {
+        // console.log('接收 type 数据:', msg)
+      }
+    }
+  }
+})
 </script>
 
 <template>
-  <div>visual</div>
-  <div class="main_mid_btn">
-    <el-button @click="goLogin" style="margin-right: 20px">重新登录</el-button>
-    <el-button type="primary" plain @click="goHome" style="margin-right: 20px">返回首页</el-button>
-    <el-button type="primary" @click="goBack">返回上一页</el-button>
+  <div
+    class="visual"
+    v-loading="isLoading"
+    element-loading-background="rgba(0,0,0,.5)"
+    element-loading-text="网络加载中..."
+  >
+    <div class="visual_head">
+      <div class="visual_head_left">
+        <div class="visual_title">
+          <b>数字孪生看板</b>
+          <span>{{ wsStateInfo }}</span>
+        </div>
+      </div>
+      <div class="visual_head_right">
+        <span class="btn" @click="toggleFullScreen">
+          {{ !documentFullscreen ? '启用全屏' : '退出全屏' }}
+        </span>
+        <span class="btn" @click="router.push('/')">返回首页</span>
+      </div>
+    </div>
+    <div class="visual_canvas">
+      <i>canvas</i>
+    </div>
   </div>
 </template>
 
@@ -25,4 +62,82 @@ const goBack = () => {
 @function px2vw($px) {
   @return math.div($px, 1920) * 100vw;
 }
+
+.visual {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  font-size: px2vw(18);
+  overflow: hidden;
+  user-select: none;
+
+  .visual_head {
+    position: absolute;
+    z-index: 10;
+    display: flex;
+    justify-content: space-between;
+    align-items: top;
+    width: 100%;
+    padding: px2vw(10);
+    color: #fff;
+
+    .visual_title {
+      display: inline-flex;
+      align-items: center;
+      font-size: px2vw(24);
+      height: px2vw(30);
+      background: #000;
+      border: px2vw(2) solid #f2f2f2;
+      margin: 0 0 px2vw(5) 0;
+      overflow: hidden;
+
+      b {
+        display: inline-block;
+        padding: 0 px2vw(5);
+        font-size: px2vw(24);
+        background: #f2f2f2;
+        color: #000;
+      }
+
+      span {
+        padding: 0 px2vw(8);
+        color: #f2f2f2;
+        box-sizing: border-box;
+      }
+    }
+
+    .visual_head_right {
+      .btn {
+        align-items: center;
+        padding: 0 px2vw(8);
+        color: #f2f2f2;
+        background: var(--jnrs-color-primary);
+        border-radius: px2vw(2);
+        margin: 0 px2vw(2);
+        transition: all 0.25s ease;
+        cursor: pointer;
+
+        &:hover {
+          filter: brightness(1.3);
+        }
+      }
+    }
+  }
+
+  .visual_canvas {
+    position: relative;
+    width: 100%;
+    height: 100%;
+
+    i {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      font-size: px2vw(100);
+      color: #fff;
+      opacity: 0.5;
+    }
+  }
+}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jnrs-template-vue",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "巨能前端工程化开发，Vue 项目模板脚手架",
   "keywords": [
     "vue",

package/jnrs-template-vue/src/composables/base/useAvatar.ts

@@ -1,36 +0,0 @@
-import { ref, toRefs, watch } from 'vue'
-// import { getImgSrc } from '@/utils/common'
-// import { useCommonStore } from '@jnrs/vue-core/pinia'
-// import imgFailed from '@/assets/img/common/404.png'
-import defaultAvatar from '@/assets/images/common/avatar.png'
-
-export const useAvatar = () => {
-  // const { userInfo } = toRefs(useCommonStore())
-  const avatar = ref(defaultAvatar)
-
-  // watch(
-  //   () => userInfo.value.avatar,
-  //   nv => {
-  //     if (nv) {
-  //       getImgSrc(nv).then(res => {
-  //         avatar.value = URL.createObjectURL(res.data)
-  //       })
-  //     }
-  //   }
-  // )
-
-  // const at = userInfo.value.avatar
-  // if (at) {
-  //   getImgSrc(at)
-  //     .then(res => {
-  //       avatar.value = URL.createObjectURL(res.data)
-  //     })
-  //     .catch(() => {
-  //       avatar.value = imgFailed
-  //     })
-  // }
-
-  return {
-    avatar
-  }
-}

package/jnrs-template-vue/src/composables/tools/useMouseSelection.ts

@@ -1,150 +0,0 @@
-/**
- * @Author : TanRui
- * @WeChat : Tan578853789
- * @File   : useMouseSelection.ts
- * @Date   : 2025/04/14
- * @Desc.  : 鼠标框选表格进行多选、回车执行回调
- */
-
-import { onMounted, onUnmounted, onActivated, onDeactivated } from 'vue'
-
-/**
- * @param {*} containerClass 表格或容器类名，默认值 el-table，如果页面存在多个表格，则必须分别传入自定义类名
- * @param {*} rowClass 表格或容器类名，默认值 el-table__row
- * @param {*} callback 框选后的回调，默认处理的是 input[type='checkbox'] 元素
- * @returns handleMouseDown
- * @example <el-table @mousedown="handleMouseDown" @selection-change="handleSelectionChange">
- */
-export function useMouseSelection({
-  containerClass = 'jn_table',
-  rowClass = 'el-table__row',
-  callback = handleSelection
-} = {}) {
-  let isDragging = false
-  let startPoint = { x: 0, y: 0 }
-  let endPoint = { x: 0, y: 0 }
-
-  onMounted(() => {
-    window.addEventListener('mouseup', handleMouseUp)
-  })
-
-  onUnmounted(() => {
-    window.removeEventListener('mouseup', handleMouseUp)
-  })
-
-  onActivated(() => {
-    window.addEventListener('mouseup', handleMouseUp)
-  })
-
-  onDeactivated(() => {
-    window.removeEventListener('mouseup', handleMouseUp)
-  })
-
-  // 鼠标按下事件
-  const handleMouseDown = (event: MouseEvent) => {
-    window.addEventListener('mousemove', handleMouseMove)
-    isDragging = false
-    startPoint = { x: event.clientX, y: event.clientY }
-    endPoint = { ...startPoint }
-  }
-
-  // 鼠标移动事件
-  const handleMouseMove = (event: MouseEvent) => {
-    endPoint = { x: event.clientX, y: event.clientY }
-    // 判断是否为拖动
-    if (Math.abs(endPoint.x - startPoint.x) > 5 && Math.abs(endPoint.y - startPoint.y) > 25) {
-      isDragging = true
-    }
-    // 如果没有拖动，则认为是单击
-    if (isDragging) {
-      selectRows()
-    }
-    setFixedRectBoxStyle()
-  }
-
-  // 鼠标抬起事件
-  const handleMouseUp = () => {
-    window.removeEventListener('mousemove', handleMouseMove)
-    // 如果没有拖动，则认为是单击
-    if (isDragging) {
-      isDragging = false
-    }
-    setFixedRectBoxStyle()
-  }
-
-  // 判断选中的行
-  const selectRows = () => {
-    const container = document.querySelector(`.${containerClass}`) as HTMLElement
-    const rows = container?.querySelectorAll(`.${rowClass}`) as NodeListOf<HTMLElement>
-    if (!rows) {
-      return false
-    }
-    rows.forEach((row) => {
-      const rect = row.getBoundingClientRect()
-      const isIntersecting =
-        rect.right > Math.min(startPoint.x, endPoint.x) &&
-        rect.left < Math.max(startPoint.x, endPoint.x) &&
-        rect.bottom > Math.min(startPoint.y, endPoint.y) &&
-        rect.top < Math.max(startPoint.y, endPoint.y)
-      if (isIntersecting && callback) {
-        callback(row)
-      }
-    })
-  }
-
-  // 设置框选框的位置
-  const setFixedRectBoxStyle = () => {
-    const selectionBox = document.querySelector('.useMouseSelection_fixedRectBox') as HTMLElement
-    if (selectionBox) {
-      const left = Math.min(startPoint.x, endPoint.x) + 'px'
-      const top = Math.min(startPoint.y, endPoint.y) + 'px'
-      const width = Math.abs(endPoint.x - startPoint.x) + 'px'
-      const height = Math.abs(endPoint.y - startPoint.y) + 'px'
-      Object.assign(selectionBox.style, {
-        display: isDragging ? 'block' : 'none',
-        left: left,
-        top: top,
-        width: width,
-        height: height
-      })
-
-      const container = document.querySelector(`.${containerClass}`) as HTMLElement
-      Object.assign(container.style, {
-        'user-select': isDragging ? 'none' : 'auto'
-      })
-    }
-  }
-
-  checkAndAddElement()
-
-  return {
-    handleMouseDown
-  }
-}
-
-// 回调选中逻辑
-const handleSelection = (row: HTMLElement) => {
-  const checkbox = row.querySelector("input[type='checkbox']") as HTMLInputElement
-  if (checkbox && !checkbox.checked) {
-    checkbox.click()
-  }
-}
-
-// 往页面上添加框选框元素
-const checkAndAddElement = () => {
-  const fixedRectBox = document.querySelector('.useMouseSelection_fixedRectBox')
-  if (!fixedRectBox) {
-    const newDiv = document.createElement('div')
-    newDiv.className = 'useMouseSelection_fixedRectBox'
-    Object.assign(newDiv.style, {
-      display: 'none',
-      position: 'fixed',
-      'z-index': 100,
-      border: '2px dashed #409eff',
-      'background-color': 'rgba(64, 158, 255, 0.2)',
-      'pointer-events': 'none',
-      'will-change': 'transform'
-    })
-    document.body.appendChild(newDiv)
-  }
-}