Merge branch 'develop' into release-v4.9.0

Author: feynmx

apps/daas/src/views/login/Login.vue

@@ -138,7 +138,7 @@ export default {
             show-icon
             :closable="false"
           />
-          <form class="rounded-lg">
+          <form class="rounded-xl">
             <input
               v-model="form.email"
               class="input"

packages/api/src/core/metadata-instances.ts

@@ -1,4 +1,3 @@
-import { isPlainObj } from '@tap/shared'
 import { requestClient, type PageFetchResult } from '../request'
 
 const BASE_URL = '/api/MetadataInstances'
@@ -89,17 +88,11 @@ export function getOriginalData(qualified_name: string, target?: string) {
   }
 }
 
-export function fetchMetadataInstances(params: any = {}, filter?: any) {
-  if (Array.isArray(params)) {
-    filter = typeof filter === 'object' ? JSON.stringify(filter) : filter
-    const qs = filter ? `?filter=${encodeURIComponent(filter)}` : ''
-    return requestClient.get(`${BASE_URL}/${params.join('/')}${qs}`)
-  }
-  const config = { params }
-  if (isPlainObj(filter)) {
-    Object.assign(config, filter)
-  }
-  return requestClient.get(BASE_URL, config)
+export function fetchMetadataInstances(filter?: object, config?: any) {
+  return requestClient.get(BASE_URL, {
+    params: { filter: filter ? JSON.stringify(filter) : undefined },
+    ...config,
+  })
 }
 
 export function getTables(connectionId: string) {

packages/business/src/components/SchemaProgress.vue

@@ -3,10 +3,8 @@ import {
   CircleCheckFilled,
   CircleCloseFilled,
   Loading,
-  WarningFilled,
 } from '@element-plus/icons-vue'
 import dayjs from 'dayjs'
-import { h } from 'vue'
 import { ErrorMessage } from './error-message'
 
 export default {
@@ -87,7 +85,8 @@ export default {
       <ElButton
         v-if="
           data.loadFieldsStatus !== 'finished' &&
-          data.loadFieldsStatus !== 'loading'
+          data.loadFieldsStatus !== 'loading' &&
+          data.loadFieldErrMsg
         "
         text
         type="primary"

packages/business/src/views/api-application/ListSelect.vue

@@ -1,89 +1,83 @@
-<script>
+<script setup lang="ts">
 import { fetchApps } from '@tap/api'
 import AsyncSelect from '@tap/form/src/components/infinite-select/InfiniteSelect.vue'
+import { reactive, watch } from 'vue'
 
-export default {
-  name: 'ListSelect',
-  components: { AsyncSelect },
-  props: {
-    value: {
-      type: [String, Number],
-    },
-    label: {
-      type: String,
-    },
-    params: {
-      type: Object,
-      default: () => {
-        return {}
-      },
-    },
-    format: {
-      type: Function,
-    },
-  },
-  emits: ['change', 'update:label', 'update:value'],
-  data() {
-    return {
-      form: {
-        label: '',
-        value: '',
-      },
-    }
-  },
-  watch: {
-    value: {
-      handler(v) {
-        this.form.value = v
-        this.form.label = this.label
-      },
-      immediate: true,
-    },
-  },
-  methods: {
-    handleChange(opt) {
-      const { label } = opt
-      this.form.label = label
-      this.$emit('update:value', this.form.value)
-      this.$emit('update:label', this.form.label)
-      this.$emit('change', this.form.value, opt)
-    },
+interface Props {
+  value?: string | number
+  label?: string
+  params?: Record<string, any>
+  format?: (items: any[]) => any[]
+}
 
-    async getData(filter = {}) {
-      const { page, size } = filter
-      const params = {
-        where: {
-          item_type: 'app',
-        },
-        order: 'createTime DESC',
-        limit: size,
-        skip: (page - 1) * size,
-      }
+const props = withDefaults(defineProps<Props>(), {
+  params: () => ({}),
+})
 
-      const { label } = filter.where || {}
-      if (label) {
-        Object.assign(params.where, {
-          value: label,
-        })
-      }
+const emit = defineEmits<{
+  (e: 'change', value: string | number | undefined, opt: any): void
+  (e: 'update:label', label: string): void
+  (e: 'update:value', value: string | number | undefined): void
+}>()
 
-      const res = await fetchApps(Object.assign(params, this.params))
+const form = reactive({
+  label: '',
+  value: '' as string | number | undefined,
+})
 
-      res.items = res.items.map((t) => {
-        return {
-          label: t.value,
-          value: t.id,
-          data: t,
-        }
-      })
+watch(
+  () => props.value,
+  (v) => {
+    form.value = v
+    form.label = props.label || ''
+  },
+  { immediate: true },
+)
 
-      if (this.format) {
-        res.items = this.format(res.items)
-      }
+const handleChange = (opt: any) => {
+  const { label } = opt
+  form.label = label
+  emit('update:value', form.value)
+  emit('update:label', form.label)
+  emit('change', form.value, opt)
+}
 
-      return res
+const getData = async (filter: any = {}) => {
+  const { page, size } = filter
+  const params = {
+    where: {
+      item_type: 'app',
     },
-  },
+    order: 'createTime DESC',
+    limit: size,
+    skip: (page - 1) * size,
+  }
+
+  const { label } = filter.where || {}
+  if (label) {
+    Object.assign(params.where, {
+      value: label,
+    })
+  }
+
+  const res = await fetchApps(Object.assign(params, props.params))
+
+  let items = res.items.map((t: any) => {
+    return {
+      label: t.value,
+      value: t.id,
+      data: t,
+    }
+  })
+
+  if (props.format) {
+    items = props.format(items)
+  }
+
+  return {
+    ...res,
+    items,
+  }
 }
 </script>