Pre Merge pull request !74 from 周建/master

src/views/bpm/form/formEditor.vue

@@ -133,15 +133,24 @@ const openModel = (title: string) => {
 }
 /** 复制 **/
 const copy = async (text: string) => {
-  const { copy, copied, isSupported } = useClipboard({ source: text })
+  // const { copy, copied, isSupported } = useClipboard({ source: JSON.stringify(text) })
-  if (!isSupported) {
+  // if (!isSupported.value) {
-    message.error(t('common.copyError'))
+  //   message.error(t('common.copyError'))
-  } else {
+  // } else {
-    await copy()
+  //   await copy()
-    if (unref(copied)) {
+  //   if (unref(copied.value)) {
-      message.success(t('common.copySuccess'))
+  //     message.success(t('common.copySuccess'))
-    }
+  //   }
-  }
+  // }
+  let url = JSON.stringify(text)
+  let oInput = document.createElement('textarea')
+  oInput.value = url
+  document.body.appendChild(oInput)
+  oInput.select() // 选择对象;
+  // console.log(oInput.value)
+  document.execCommand('Copy') // 执行浏览器复制命令
+  message.success(t('common.copySuccess'))
+  oInput.remove()
 }
 // ========== 初始化 ==========
 onMounted(() => {

src/views/infra/build/index.vue

@@ -77,15 +77,24 @@ const showTemplate = () => {
 
 /** 复制 **/
 const copy = async (text: string) => {
-  const { copy, copied, isSupported } = useClipboard({ source: text })
+  // const { copy, copied, isSupported } = useClipboard({ source: JSON.stringify(text) })
-  if (!isSupported) {
+  // if (!isSupported.value) {
-    message.error(t('common.copyError'))
+  //   message.error(t('common.copyError'))
-  } else {
+  // } else {
-    await copy()
+  //   await copy()
-    if (unref(copied)) {
+  //   if (unref(copied.value)) {
-      message.success(t('common.copySuccess'))
+  //     message.success(t('common.copySuccess'))
-    }
+  //   }
-  }
+  // }
+  let url = JSON.stringify(text)
+  let oInput = document.createElement('textarea')
+  oInput.value = url
+  document.body.appendChild(oInput)
+  oInput.select() // 选择对象;
+  // console.log(oInput.value)
+  document.execCommand('Copy') // 执行浏览器复制命令
+  message.success(t('common.copySuccess'))
+  oInput.remove()
 }
 
 const makeTemplate = () => {

src/views/infra/codegen/components/Preview.vue

@@ -130,11 +130,11 @@ const handleFiles = (datas: CodegenPreviewVO[]) => {
 /** 复制 **/
 const copy = async (text: string) => {
   const { copy, copied, isSupported } = useClipboard({ source: text })
-  if (!isSupported) {
+  if (!isSupported.value) {
     message.error(t('common.copyError'))
   } else {
     await copy()
-    if (unref(copied)) {
+    if (unref(copied.value)) {
       message.success(t('common.copySuccess'))
     }
   }

src/views/infra/config/config.data.ts

@@ -6,7 +6,8 @@ export const rules = reactive({
   category: [required],
   name: [required],
   key: [required],
-  value: [required]
+  value: [required],
+  visible: [{ required: true, message: '请选择是否可见', trigger: 'change' }]
 })
 
 // CrudSchema

src/views/infra/config/index.vue

@@ -93,8 +93,8 @@ const message = useMessage() // 消息弹窗
 // 列表相关的变量
 const [registerTable, { reload, deleteData, exportList }] = useXTable({
   allSchemas: allSchemas,
-  getListApi: ConfigApi.getConfigPageApi,
+  getListApi: ConfigApi.getConfigPage,
-  deleteApi: ConfigApi.deleteConfigApi,
+  deleteApi: ConfigApi.deleteConfig,
   exportListApi: ConfigApi.exportConfigApi
 })
 
@@ -127,14 +127,6 @@ const handleCreate = async () => {
       },
       2
     )
-    unref(formRef)?.addSchema(
-      {
-        field: 'value',
-        label: '参数键值',
-        component: 'Input'
-      },
-      3
-    )
   }
 }
 
@@ -142,17 +134,15 @@ const handleCreate = async () => {
 const handleUpdate = async (rowId: number) => {
   setDialogTile('update')
   // 设置数据
-  const res = await ConfigApi.getConfigApi(rowId)
+  const res = await ConfigApi.getConfig(rowId)
   unref(formRef)?.delSchema('key')
-  unref(formRef)?.delSchema('value')
-
   unref(formRef)?.setValues(res)
 }
 
 // 详情操作
 const handleDetail = async (rowId: number) => {
   setDialogTile('detail')
-  const res = await ConfigApi.getConfigApi(rowId)
+  const res = await ConfigApi.getConfig(rowId)
   detailData.value = res
 }
 
@@ -167,10 +157,10 @@ const submitForm = async () => {
       try {
         const data = unref(formRef)?.formModel as ConfigApi.ConfigVO
         if (actionType.value === 'create') {
-          await ConfigApi.createConfigApi(data)
+          await ConfigApi.createConfig(data)
           message.success(t('common.createSuccess'))
         } else {
-          await ConfigApi.updateConfigApi(data)
+          await ConfigApi.updateConfig(data)
           message.success(t('common.updateSuccess'))
         }
         dialogVisible.value = false

src/views/infra/fileList/index.vue

@@ -59,6 +59,7 @@
       :on-exceed="handleExceed"
       :on-success="handleFileSuccess"
       :on-error="excelUploadError"
+      :on-change="handleFileChange"
       :before-remove="beforeRemove"
       :auto-upload="false"
       accept=".jpg, .png, .gif"
@@ -83,7 +84,7 @@
   </XModal>
 </template>
 <script setup lang="ts" name="FileList">
-import type { UploadInstance, UploadRawFile, UploadProps } from 'element-plus'
+import type { UploadInstance, UploadRawFile, UploadProps, UploadFile } from 'element-plus'
 // 业务相关的 import
 import { allSchemas } from './fileList.data'
 import * as FileApi from '@/api/infra/fileList'
@@ -119,9 +120,11 @@ const beforeUpload = (file: UploadRawFile) => {
   return isImg && isLt5M
 }
 // 处理上传的文件发生变化
-// const handleFileChange = (uploadFile: UploadFile): void => {
+const handleFileChange = (uploadFile: UploadFile): void => {
-//   uploadRef.value.data.path = uploadFile.name
+  // uploadRef.value.data.path = uploadFile.name
-// }
+  console.log(uploadFile, 'uploadFile')
+  uploadDisabled.value = false
+}
 // 文件上传
 const submitFileForm = () => {
   uploadHeaders.value = {
@@ -148,10 +151,12 @@ const beforeRemove: UploadProps['beforeRemove'] = () => {
 // 文件数超出提示
 const handleExceed = (): void => {
   message.error('最多只能上传一个文件！')
+  uploadDisabled.value = false
 }
 // 上传错误提示
 const excelUploadError = (): void => {
   message.error('导入数据失败，请您重新上传！')
+  uploadDisabled.value = false
 }
 
 // 详情操作
@@ -164,14 +169,26 @@ const handleDetail = (row: FileApi.FileVO) => {
 
 // ========== 复制相关 ==========
 const handleCopy = async (text: string) => {
-  const { copy, copied, isSupported } = useClipboard({ source: text })
+  let url = text
-  if (!isSupported) {
+  let oInput = document.createElement('textarea')
-    message.error(t('common.copyError'))
+  oInput.value = url
-  } else {
+  document.body.appendChild(oInput)
-    await copy()
+  oInput.select() // 选择对象;
-    if (unref(copied)) {
+  // console.log(oInput.value)
-      message.success(t('common.copySuccess'))
+  document.execCommand('Copy') // 执行浏览器复制命令
-    }
+  message.success(t('common.copySuccess'))
-  }
+  oInput.remove()
+  // const { copy, copied, isSupported } = useClipboard({ source: text, read: true })
+  // console.log(copy, 'copycopycopy')
+  // console.log(copied, 'copiedcopiedcopied')
+  // console.log(isSupported, 'isSupportedisSupportedisSupported')
+  // if (!isSupported.value) {
+  //   message.error(t('common.copyError'))
+  // } else {
+  //   await copy()
+  //   if (unref(copied.value)) {
+  //     message.success(t('common.copySuccess'))
+  //   }
+  // }
 }
 </script>

src/views/system/notice/form.vue

@@ -1,131 +0,0 @@
-<template>
-  <Dialog :title="modelTitle" v-model="modelVisible" width="800">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="80px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="公告标题" prop="title">
-        <el-input v-model="formData.title" placeholder="请输入公告标题" />
-      </el-form-item>
-      <el-form-item label="公告内容" prop="content">
-        <Editor :model-value="formData.content" height="150px" />
-      </el-form-item>
-      <el-form-item label="公告类型" prop="type">
-        <el-select v-model="formData.type" placeholder="请选择公告类型" clearable>
-          <el-option
-            v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE)"
-            :key="parseInt(dict.value)"
-            :label="dict.label"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="parseInt(dict.value)"
-            :label="dict.label"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输备注" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-        <el-button @click="modelVisible = false">取 消</el-button>
-      </div>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { DICT_TYPE, getDictOptions } from '@/utils/dict'
-import * as NoticeApi from '@/api/system/notice'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const modelVisible = ref(false) // 弹窗的是否展示
-const modelTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  title: '',
-  type: undefined,
-  content: '',
-  status: undefined,
-  remark: ''
-})
-const formRules = reactive({
-  title: [{ required: true, message: '公告标题不能为空', trigger: 'blur' }],
-  type: [{ required: true, message: '公告类型不能为空', trigger: 'change' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
-  content: [{ required: true, message: '公告内容不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const openModal = async (type: string, id?: number) => {
-  modelVisible.value = true
-  modelTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await NoticeApi.getNotice(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as NoticeApi.NoticeVO
-    if (formType.value === 'create') {
-      await NoticeApi.createNotice(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await NoticeApi.updateNotice(data)
-      message.success(t('common.updateSuccess'))
-    }
-    modelVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    title: '',
-    type: undefined,
-    content: '',
-    status: undefined,
-    remark: ''
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/system/notice/index.vue

@@ -1,159 +1,148 @@
 <template>
-  <content-wrap>
+  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-      <el-form-item label="公告标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入公告标题"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公告状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择公告状态" clearable>
-          <el-option
-            v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="parseInt(dict.value)"
-            :label="dict.label"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          @click="openModal('create')"
-          v-hasPermi="['system:notice:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-      </el-form-item>
-    </el-form>
-
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list" align="center">
+    <XTable @register="registerTable">
-      <el-table-column label="公告编号" align="center" prop="id" />
+      <!-- 操作：新增 -->
-      <el-table-column label="公告标题" align="center" prop="title" />
+      <template #toolbar_buttons>
-      <el-table-column label="公告类型" align="center" prop="type">
+        <XButton
-        <template #default="scope">
+          type="primary"
-          <dict-tag :type="DICT_TYPE.SYSTEM_NOTICE_TYPE" :value="scope.row.type" />
+          preIcon="ep:zoom-in"
-        </template>
+          :title="t('action.add')"
-      </el-table-column>
+          v-hasPermi="['system:notice:create']"
-      <el-table-column label="状态" align="center" prop="status">
+          @click="handleCreate()"
-        <template #default="scope">
+        />
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+      </template>
-        </template>
+      <template #actionbtns_default="{ row }">
-      </el-table-column>
+        <!-- 操作：修改 -->
-      <el-table-column
+        <XTextButton
-        label="创建时间"
+          preIcon="ep:edit"
-        align="center"
+          :title="t('action.edit')"
-        prop="createTime"
+          v-hasPermi="['system:notice:update']"
-        width="180"
+          @click="handleUpdate(row.id)"
-        :formatter="dateFormatter"
+        />
-      />
+        <!-- 操作：详情 -->
-      <el-table-column label="操作" align="center">
+        <XTextButton
-        <template #default="scope">
+          preIcon="ep:view"
-          <el-button
+          :title="t('action.detail')"
-            link
+          v-hasPermi="['system:notice:query']"
-            type="primary"
+          @click="handleDetail(row.id)"
-            @click="openModal('update', scope.row.id)"
+        />
-            v-hasPermi="['system:notice:update']"
+        <!-- 操作：删除 -->
-          >
+        <XTextButton
-            编辑
+          preIcon="ep:delete"
-          </el-button>
+          :title="t('action.del')"
-          <el-button
+          v-hasPermi="['system:notice:delete']"
-            link
+          @click="deleteData(row.id)"
-            type="danger"
+        />
-            @click="handleDelete(scope.row.id)"
+      </template>
-            v-hasPermi="['system:notice:delete']"
+    </XTable>
-          >
+  </ContentWrap>
-            删除
+  <!-- 弹窗 -->
-          </el-button>
+  <XModal id="noticeModel" v-model="dialogVisible" :title="dialogTitle">
-        </template>
+    <!-- 对话框(添加 / 修改) -->
-      </el-table-column>
+    <Form
-    </el-table>
+      ref="formRef"
-    <!-- 分页 -->
+      v-if="['create', 'update'].includes(actionType)"
-    <Pagination
+      :schema="allSchemas.formSchema"
-      :total="total"
+      :rules="rules"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
     />
-  </content-wrap>
+    <!-- 对话框(详情) -->
-
+    <Descriptions
-  <!-- 表单弹窗：添加/修改 -->
+      v-if="actionType === 'detail'"
-  <notice-form ref="modalRef" @success="getList" />
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    >
+      <template #content="{ row }">
+        <Editor :model-value="row.content" :readonly="true" />
+      </template>
+    </Descriptions>
+    <template #footer>
+      <!-- 按钮：保存 -->
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :title="t('action.save')"
+        :loading="actionLoading"
+        @click="submitForm()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
+    </template>
+  </XModal>
 </template>
-<script setup lang="tsx">
+<script setup lang="ts" name="Notice">
-import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import type { FormExpose } from '@/components/Form'
-import { dateFormatter } from '@/utils/formatTime'
+// 业务相关的 import
 import * as NoticeApi from '@/api/system/notice'
-import { DictTag } from '@/components/DictTag'
+import { rules, allSchemas } from './notice.data'
-import NoticeForm from './form.vue'
+
-const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const message = useMessage() // 消息弹窗
-const loading = ref(true) // 列表的加载中
+// 列表相关的变量
-const total = ref(0) // 列表的总页数
+const [registerTable, { reload, deleteData }] = useXTable({
-const list = ref([]) // 列表的数据
+  allSchemas: allSchemas,
-const queryParams = reactive({
+  getListApi: NoticeApi.getNoticePageApi,
-  title: '',
+  deleteApi: NoticeApi.deleteNoticeApi
-  type: undefined,
-  status: undefined,
-  pageNo: 1,
-  pageSize: 100
 })
-const queryFormRef = ref() // 搜索的表单
+// 弹窗相关的变量
+const dialogVisible = ref(false) // 是否显示弹出层
+const dialogTitle = ref('edit') // 弹出层标题
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const formRef = ref<FormExpose>() // 表单 Ref
+const detailData = ref() // 详情 Ref
 
-/** 查询公告列表 */
+// 设置标题
-const getList = async () => {
+const setDialogTile = (type: string) => {
-  loading.value = true
+  dialogTitle.value = t('action.' + type)
-  try {
+  actionType.value = type
-    const data = await NoticeApi.getNoticePage(queryParams)
+  dialogVisible.value = true
-
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
 }
 
-/** 搜索按钮操作 */
+// 新增操作
-const handleQuery = () => {
+const handleCreate = () => {
-  queryParams.pageNo = 1
+  setDialogTile('create')
-  getList()
 }
 
-/** 重置按钮操作 */
+// 修改操作
-const resetQuery = () => {
+const handleUpdate = async (rowId: number) => {
-  queryFormRef.value.resetFields()
+  setDialogTile('update')
-  handleQuery()
+  // 设置数据
+  const res = await NoticeApi.getNoticeApi(rowId)
+  unref(formRef)?.setValues(res)
 }
 
-/** 添加/修改操作 */
+// 详情操作
-const modalRef = ref()
+const handleDetail = async (rowId: number) => {
-const openModal = (type: string, id?: number) => {
+  setDialogTile('detail')
-  modalRef.value.openModal(type, id)
+  // 设置数据
+  const res = await NoticeApi.getNoticeApi(rowId)
+  detailData.value = res
 }
 
-/** 删除按钮操作 */
+// 提交新增/修改的表单
-const handleDelete = async (id: number) => {
+const submitForm = async () => {
-  try {
+  const elForm = unref(formRef)?.getElFormRef()
-    // 删除的二次确认
+  if (!elForm) return
-    await message.delConfirm()
+  elForm.validate(async (valid) => {
-    // 发起删除
+    if (valid) {
-    await NoticeApi.deleteNotice(id)
+      actionLoading.value = true
-    message.success(t('common.delSuccess'))
+      // 提交请求
-    // 刷新列表
+      try {
-    await getList()
+        const data = unref(formRef)?.formModel as NoticeApi.NoticeVO
-  } catch {}
+        if (actionType.value === 'create') {
+          await NoticeApi.createNoticeApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await NoticeApi.updateNoticeApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        dialogVisible.value = false
+      } finally {
+        actionLoading.value = false
+        await reload()
+      }
+    }
+  })
 }
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
 </script>

src/views/system/notice/notice.data.ts

@@ -0,0 +1,59 @@
+import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+const { t } = useI18n() // 国际化
+
+// 表单校验
+export const rules = reactive({
+  title: [required],
+  type: [required]
+})
+
+// CrudSchema
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id',
+  primaryType: 'seq',
+  action: true,
+  columns: [
+    {
+      title: '公告标题',
+      field: 'title',
+      isSearch: true
+    },
+    {
+      title: '公告类型',
+      field: 'type',
+      dictType: DICT_TYPE.SYSTEM_NOTICE_TYPE,
+      dictClass: 'number'
+    },
+    {
+      title: t('common.status'),
+      field: 'status',
+      dictType: DICT_TYPE.COMMON_STATUS,
+      dictClass: 'number',
+      isSearch: true
+    },
+    {
+      title: '公告内容',
+      field: 'content',
+      table: {
+        type: 'html'
+      },
+      form: {
+        component: 'Editor',
+        colProps: {
+          span: 24
+        },
+        componentProps: {
+          valueHtml: ''
+        }
+      },
+      isTable: false
+    },
+    {
+      title: t('common.createTime'),
+      field: 'createTime',
+      formatter: 'formatDate',
+      isForm: false
+    }
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

src/views/system/user/user.data.ts

@@ -28,7 +28,7 @@ export const rules = reactive({
     }
   ],
   status: [required],
-  postIds: [{ required: true, message: '请选择岗位', trigger: ['blur', 'change'] }],
+  postIds: [required],
   mobile: [
     required,
     {
@@ -86,11 +86,6 @@ const crudSchemas = reactive<VxeCrudSchema>({
       field: 'deptId',
       isTable: false
     },
-    {
-      title: '岗位',
-      field: 'postIds',
-      isTable: false
-    },
     {
       title: t('common.status'),
       field: 'status',
@@ -103,6 +98,11 @@ const crudSchemas = reactive<VxeCrudSchema>({
         }
       }
     },
+    {
+      title: '岗位',
+      field: 'postIds',
+      isTable: false
+    },
     {
       title: '最后登录时间',
       field: 'loginDate',