From bca13b1961dedbbf6d37fc3aeda6fb4d1e3e010b Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Fri, 4 Nov 2022 18:01:46 +0800
Subject: [PATCH] feat: xbutton

---
 yudao-ui-admin-vue3/src/components/XButton/index.ts        |  3 +++
 yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue | 41 +++++++++++++++++++++++++++++++++++++++++
 yudao-ui-admin-vue3/src/components/XModal/src/XModal.vue   | 22 +---------------------
 yudao-ui-admin-vue3/src/components/index.ts                |  2 ++
 yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts     |  1 +
 yudao-ui-admin-vue3/src/views/system/post/index.vue        | 49 +++++++++++++++++++++++++++----------------------
 6 files changed, 75 insertions(+), 43 deletions(-)
 create mode 100644 yudao-ui-admin-vue3/src/components/XButton/index.ts
 create mode 100644 yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue

diff --git a/yudao-ui-admin-vue3/src/components/XButton/index.ts b/yudao-ui-admin-vue3/src/components/XButton/index.ts
new file mode 100644
index 0000000..7b13b60
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/XButton/index.ts
@@ -0,0 +1,3 @@
+import XButton from './src/XButton.vue'
+
+export { XButton }
diff --git a/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue b/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue
new file mode 100644
index 0000000..6190aac
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import { propTypes } from '@/utils/propTypes'
+import { computed, useAttrs, PropType } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+
+const { t } = useI18n() // 国际化
+
+const props = defineProps({
+  modelValue: propTypes.bool.def(false),
+  loading: propTypes.bool.def(false),
+  preIcon: propTypes.string.def(''),
+  postIcon: propTypes.string.def(''),
+  iTitle: propTypes.string.def(''),
+  title: propTypes.string.def('按钮'),
+  type: propTypes.oneOf(['primary', 'success', 'warning', 'danger', 'info']).def('primary'),
+  link: propTypes.bool.def(false),
+  circle: propTypes.bool.def(false),
+  round: propTypes.bool.def(false),
+  plain: propTypes.bool.def(false),
+  onClick: { type: Function as PropType<(...args) => any>, default: null }
+})
+const getBindValue = computed(() => {
+  const delArr: string[] = ['title', 'preIcon', 'postIcon', 'onClick']
+  const attrs = useAttrs()
+  const obj = { ...attrs, ...props }
+  for (const key in obj) {
+    if (delArr.indexOf(key) !== -1) {
+      delete obj[key]
+    }
+  }
+  return obj
+})
+</script>
+
+<template>
+  <el-button v-bind="getBindValue" @click="onClick">
+    <Icon :icon="preIcon" v-if="preIcon" class="mr-1px" />
+    {{ iTitle ? t(iTitle) : title }}
+    <Icon :icon="postIcon" v-if="postIcon" class="mr-1px" />
+  </el-button>
+</template>
diff --git a/yudao-ui-admin-vue3/src/components/XModal/src/XModal.vue b/yudao-ui-admin-vue3/src/components/XModal/src/XModal.vue
index 3058c51..4ca44f9 100644
--- a/yudao-ui-admin-vue3/src/components/XModal/src/XModal.vue
+++ b/yudao-ui-admin-vue3/src/components/XModal/src/XModal.vue
@@ -18,34 +18,14 @@ const props = defineProps({
 })
 
 const getBindValue = computed(() => {
-  const delArr: string[] = ['title']
   const attrs = useAttrs()
   const obj = { ...attrs, ...props }
-  for (const key in obj) {
-    if (delArr.indexOf(key) !== -1) {
-      delete obj[key]
-    }
-  }
   return obj
 })
 </script>
 
 <template>
-  <vxe-modal
-    v-bind="getBindValue"
-    :width="width"
-    :height="height"
-    :title="title"
-    min-width="460"
-    min-height="320"
-    :loading="loading"
-    :fullscreen="fullscreen"
-    destroy-on-close
-    show-zoom
-    resize
-    transfer
-    :show-footer="showFooter"
-  >
+  <vxe-modal v-bind="getBindValue" destroy-on-close show-zoom resize transfer>
     <template v-if="slots.header" #header>
       <slot name="header"></slot>
     </template>
diff --git a/yudao-ui-admin-vue3/src/components/index.ts b/yudao-ui-admin-vue3/src/components/index.ts
index b3dfd94..7775982 100644
--- a/yudao-ui-admin-vue3/src/components/index.ts
+++ b/yudao-ui-admin-vue3/src/components/index.ts
@@ -5,6 +5,7 @@ import { Table } from '@/components/Table'
 import { Search } from '@/components/Search'
 import { Dialog } from '@/components/Dialog'
 import { XModal } from '@/components/XModal'
+import { XButton } from '@/components/XButton'
 import { DictTag } from '@/components/DictTag'
 import { ContentWrap } from '@/components/ContentWrap'
 import { Descriptions } from '@/components/Descriptions'
@@ -16,6 +17,7 @@ export const setupGlobCom = (app: App<Element>): void => {
   app.component('Search', Search)
   app.component('Dialog', Dialog)
   app.component('XModal', XModal)
+  app.component('XButton', XButton)
   app.component('DictTag', DictTag)
   app.component('ContentWrap', ContentWrap)
   app.component('Descriptions', Descriptions)
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
index 94b8750..b701407 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
@@ -189,6 +189,7 @@ const filterFormSchema = (crudSchema: VxeCrudSchema[]): VxeFormItemProps[] => {
         // 默认为 input
         itemRender: itemRender,
         ...schemaItem.form,
+        span: schemaItem.form?.span || 12,
         field: schemaItem.field,
         title: schemaItem.form?.title || schemaItem.title
       }
diff --git a/yudao-ui-admin-vue3/src/views/system/post/index.vue b/yudao-ui-admin-vue3/src/views/system/post/index.vue
index e518b1c..572871a 100644
--- a/yudao-ui-admin-vue3/src/views/system/post/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue
@@ -2,38 +2,38 @@
   <ContentWrap>
     <vxe-grid ref="xGrid" v-bind="gridOptions" class="xtable-scrollbar">
       <template #toolbar_buttons>
-        <el-button type="primary" v-hasPermi="['system:post:create']" @click="handleCreate">
-          <Icon icon="ep:zoom-in" class="mr-5px" /> {{ t('action.add') }}
-        </el-button>
+        <XButton
+          preIcon="ep:zoom-in"
+          iTitle="action.add"
+          v-hasPermi="['system:post:create']"
+          @click="handleCreate()"
+        />
       </template>
       <template #status_default="{ row }">
         <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
       </template>
       <template #action_default="{ row }">
-        <el-button
+        <XButton
           link
-          type="primary"
+          preIcon="ep:edit"
+          iTitle="action.edit"
           v-hasPermi="['system:post:update']"
           @click="handleUpdate(row.id)"
-        >
-          <Icon icon="ep:edit" class="mr-1px" /> {{ t('action.edit') }}
-        </el-button>
-        <el-button
+        />
+        <XButton
           link
-          type="primary"
+          preIcon="ep:view"
+          iTitle="action.detail"
           v-hasPermi="['system:post:update']"
           @click="handleDetail(row)"
-        >
-          <Icon icon="ep:view" class="mr-1px" /> {{ t('action.detail') }}
-        </el-button>
-        <el-button
+        />
+        <XButton
           link
-          type="primary"
+          preIcon="ep:delete"
+          iTitle="action.del"
           v-hasPermi="['system:post:delete']"
           @click="handleDelete(row.id)"
-        >
-          <Icon icon="ep:delete" class="mr-1px" /> {{ t('action.del') }}
-        </el-button>
+        />
       </template>
     </vxe-grid>
   </ContentWrap>
@@ -61,13 +61,18 @@
       </Descriptions>
     </template>
     <template #footer>
-      <vxe-button
+      <XButton
         v-if="['create', 'update'].includes(actionType)"
-        status="primary"
+        :loading="actionLoading"
+        iTitle="action.save"
         @click="submitForm"
-        :content="t('action.save')"
       />
-      <vxe-button @click="dialogVisible = false" :content="t('dialog.close')" />
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        :loading="actionLoading"
+        iTitle="dialog.close"
+        @click="dialogVisible = false"
+      />
     </template>
   </XModal>
 </template>
--
libgit2 0.21.4