From 124213bb4c30c7929b68860b3567ea8a28716e1d Mon Sep 17 00:00:00 2001
From: gexinzhineng/gxzn27 <1348660141@qq.com>
Date: Wed, 31 May 2023 15:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E5=9D=97=E6=97=A0=E6=B3=95=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infra/codegen/components/Preview.vue      | 29 ++++++++++++-------
 src/views/infra/job/JobLog.vue                | 13 +++++++++
 src/views/infra/job/job.data.ts               |  1 -
 src/views/infra/job/jobLog.data.ts            | 10 +++++--
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/views/infra/codegen/components/Preview.vue b/src/views/infra/codegen/components/Preview.vue
index 6a6246a8..30f4c04d 100644
--- a/src/views/infra/codegen/components/Preview.vue
+++ b/src/views/infra/codegen/components/Preview.vue
@@ -30,7 +30,7 @@
   </XModal>
 </template>
 <script setup lang="ts">
-import { useClipboard } from '@vueuse/core'
+// import { useClipboard } from '@vueuse/core'
 import { handleTree2 } from '@/utils/tree'
 import { previewCodegenApi } from '@/api/infra/codegen'
 import { CodegenTableVO, CodegenPreviewVO } from '@/api/infra/codegen/types'
@@ -129,15 +129,24 @@ const handleFiles = (datas: CodegenPreviewVO[]) => {
 }
 /** 复制 **/
 const copy = async (text: string) => {
-  const { copy, copied, isSupported } = useClipboard({ source: text })
-  if (!isSupported.value) {
-    message.error(t('common.copyError'))
-  } else {
-    await copy()
-    if (unref(copied.value)) {
-      message.success(t('common.copySuccess'))
-    }
-  }
+  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('复制成功')
+  oInput.remove()
+  // const { copy, copied, isSupported } = useClipboard({ source: text })
+  // if (!isSupported.value) {
+  //   message.error(t('common.copyError'))
+  // } else {
+  //   await copy()
+  //   if (unref(copied.value)) {
+  //     message.success(t('common.copySuccess'))
+  //   }
+  // }
 }
 defineExpose({
   show
diff --git a/src/views/infra/job/JobLog.vue b/src/views/infra/job/JobLog.vue
index 1771bbd7..5bc2fc68 100644
--- a/src/views/infra/job/JobLog.vue
+++ b/src/views/infra/job/JobLog.vue
@@ -49,16 +49,29 @@
 </template>
 <script setup lang="ts" name="JobLog">
 import dayjs from 'dayjs'
+
 import * as JobLogApi from '@/api/infra/jobLog'
 import { allSchemas } from './jobLog.data'
+import { useRoute } from 'vue-router'
 
 const { t } = useI18n() // 国际化
+
+const { query } = useRoute()
+
+let jobId = ''
+jobId = query ? query.id : ''
+if (jobId) {
+  allSchemas.searchSchema[0].itemRender.defaultValue = jobId
+} else {
+  allSchemas.searchSchema[0].itemRender.defaultValue = ''
+}
 // 列表相关的变量
 const [registerTable, { exportList }] = useXTable({
   allSchemas: allSchemas,
   getListApi: JobLogApi.getJobLogPageApi,
   exportListApi: JobLogApi.exportJobLogApi
 })
+
 // ========== CRUD 相关 ==========
 const dialogVisible = ref(false) // 是否显示弹出层
 const dialogTitle = ref('') // 弹出层标题
diff --git a/src/views/infra/job/job.data.ts b/src/views/infra/job/job.data.ts
index 1ca4a564..38761cd7 100644
--- a/src/views/infra/job/job.data.ts
+++ b/src/views/infra/job/job.data.ts
@@ -1,7 +1,6 @@
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 const { t } = useI18n() // 国际化
 // 表单校验
-
 export const rules = reactive({
   name: [required],
   handlerName: [required],
diff --git a/src/views/infra/job/jobLog.data.ts b/src/views/infra/job/jobLog.data.ts
index 563c097c..ae1b97a6 100644
--- a/src/views/infra/job/jobLog.data.ts
+++ b/src/views/infra/job/jobLog.data.ts
@@ -1,6 +1,5 @@
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 // 国际化
-
 const { t } = useI18n()
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
@@ -12,7 +11,14 @@ const crudSchemas = reactive<VxeCrudSchema>({
     {
       title: '任务编号',
       field: 'jobId',
-      isSearch: true
+      search: {
+        show: true,
+        itemRender: {
+          name: 'input',
+          defaultValue: ''
+        }
+      },
+      isForm: true
     },
     {
       title: '处理器的名字',