回退 'Pull Request !84 : 修改测试所提bug'

Author: YunaiV

.gitignore

@@ -6,3 +6,6 @@ dist-ssr
 /dist*
 *-lock.*
 pnpm-debug
+
+.idea
+.history

src/views/bpm/form/formEditor.vue

@@ -133,24 +133,15 @@ const openModel = (title: string) => {
 }
 /** 复制 **/
 const copy = async (text: string) => {
-  // const { copy, copied, isSupported } = useClipboard({ source: JSON.stringify(text) })
-  // if (!isSupported.value) {
-  //   message.error(t('common.copyError'))
-  // } else {
-  //   await copy()
-  //   if (unref(copied.value)) {
-  //     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 { copy, copied, isSupported } = useClipboard({ source: text })
+  if (!isSupported) {
+    message.error(t('common.copyError'))
+  } else {
+    await copy()
+    if (unref(copied)) {
+      message.success(t('common.copySuccess'))
+    }
+  }
 }
 // ========== 初始化 ==========
 onMounted(() => {

src/views/infra/build/index.vue

@@ -77,24 +77,15 @@ const showTemplate = () => {
 
 /** 复制 **/
 const copy = async (text: string) => {
-  // const { copy, copied, isSupported } = useClipboard({ source: JSON.stringify(text) })
-  // if (!isSupported.value) {
-  //   message.error(t('common.copyError'))
-  // } else {
-  //   await copy()
-  //   if (unref(copied.value)) {
-  //     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 { copy, copied, isSupported } = useClipboard({ source: text })
+  if (!isSupported) {
+    message.error(t('common.copyError'))
+  } else {
+    await copy()
+    if (unref(copied)) {
+      message.success(t('common.copySuccess'))
+    }
+  }
 }
 
 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.value) {
+  if (!isSupported) {
     message.error(t('common.copyError'))
   } else {
     await copy()
-    if (unref(copied.value)) {
+    if (unref(copied)) {
       message.success(t('common.copySuccess'))
     }
   }

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

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

src/views/infra/config/index.vue

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

src/views/infra/fileList/index.vue

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