gi-component 0.0.20 → 0.0.22

package/README.md

@@ -35,8 +35,6 @@ pnpm install gi-component
 pnpm whoami 
 
 npm login
-#或
-npm login --registry=https://nexusx.cyberwing.cn/repository/judp-npm-test/
 
 npm version patch
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gi-component",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Vue3中基于Element Plus二次封装基础组件库",
   "author": "lin",
   "license": "MIT",

package/packages/components/dot/src/dot.vue

@@ -10,7 +10,7 @@ import { useBemClass } from '../../../hooks'
 
 const props = withDefaults(defineProps<DotProps>(), {
   type: 'circle',
-  size: 7,
+  size: 6,
   color: 'primary'
 })
 

package/packages/components/form/src/form.vue

@@ -94,7 +94,6 @@ import {
   watch
 } from 'vue'
 import { useBemClass } from '../../../hooks'
-import GiCard from '../../card'
 import { Grid, GridItem } from '../../grid'
 import InputSearch from '../../input-search'
 
@@ -338,14 +337,16 @@ function updateModelValue(value: any, item: FormColumnItem) {
   )
 }
 
-watch(
-  () => props.modelValue,
-  () => {
-    // eslint-disable-next-line no-console
-    console.log('form', toRaw(props.modelValue))
-  },
-  { deep: true }
-)
+if (import.meta.env.DEV) {
+  watch(
+    () => props.modelValue,
+    () => {
+      // eslint-disable-next-line no-console
+      console.log('form', toRaw(props.modelValue))
+    },
+    { deep: true }
+  )
+}
 
 defineExpose({ formRef })
 </script>

package/packages/components/form/src/type.ts

@@ -57,7 +57,7 @@ export interface FormColumnItem<F = any> {
   labelRender?: () => VNode
   field: string
   fieldName?: string
-  span?: number
+  span?: number | GridItemProps['span']
   props?: FormColumnProps
   formItemProps?: El.FormItemProps
   gridItemProps?: any

package/packages/components/tree-transfer/src/tree-transfer.vue

@@ -59,7 +59,6 @@ import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
 import { ElButton, ElCheckbox, ElCheckboxGroup, ElEmpty, ElIcon, ElScrollbar, ElSpace, ElTree } from 'element-plus'
 import { computed, onMounted, reactive, ref } from 'vue'
 import pkg from 'xe-utils'
-import { filterTree } from './utils'
 
 // 右边的列表keys
 const selectedKeys = defineModel('selectedKeys', { type: Array as PropType<string[]>, default: () => [] })
@@ -168,7 +167,6 @@ const leftTreeData = computed(() => {
 })
 
 const handleCheck = (data: any, obj: any) => {
-  console.log(data, obj)
   leftObj.checkedKeys = obj.checkedNodes.filter((i: any) => i?.children === undefined).map((j: any) => j[nodeKey.value])
   leftObj.options = obj.checkedNodes.filter((i: any) => i?.children === undefined).map((j: any) => ({ label: j.label, value: j[nodeKey.value] }))
   // leftObj.checkedKeys = obj.checkedNodes.map((i: any) => i[nodeKey.value])

package/packages/hooks/useTable.ts

@@ -3,6 +3,7 @@ import { reactive, ref } from 'vue'
 
 interface Options<T, U> {
   onSuccess?: () => void
+  onError?: (error: Error) => void
   immediate?: boolean
   rowKey?: keyof T
 }
@@ -26,7 +27,7 @@ export interface UseTableApi<T> {
 }
 
 export function useTable<T extends U, U = T>(api: UseTableApi<T>, options: Options<T, U>) {
-  const { onSuccess, immediate = true, rowKey = 'id' } = options || {}
+  const { onSuccess, onError, immediate = true, rowKey = 'id' } = options || {}
 
   // const instance = getCurrentInstance();
   // const globalConfig = instance?.appContext.config.globalProperties?.$config || {};
@@ -63,6 +64,8 @@ export function useTable<T extends U, U = T>(api: UseTableApi<T>, options: Optio
       const total = !Array.isArray(res.data) ? res.data.total : data.length
       setTotal(total)
       onSuccess?.()
+    } catch (error) {
+      onError?.(error as Error)
     } finally {
       loading.value = false
     }

package/packages/index.ts

@@ -70,13 +70,20 @@ function capitalizeWord(word: string) {
   return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
 }
 
+// 定义字典数据类型
+export interface DictItem {
+  label: string
+  value: string | number
+  [key: string]: any // 允许扩展其他属性
+}
+
 // 全局默认配置
 export interface Config {
   prefix?: string // 组件前缀
   /** 输入框是否可清除 */
   clearable?: boolean
   /** 字典请求方法 */
-  dictRequest?: () => Promise<any>
+  dictRequest?: (code: string) => Promise<DictItem[]>
   /** 格式化响应数据, 用于useTable */
   // formatResponse?: (data: any) => any;
 }

package/packages/styles/el.scss

@@ -0,0 +1,82 @@
+@use './var.scss' as a;
+
+.el-dialog {
+  padding: 0 !important;
+
+  &.is-fullscreen {
+    overflow: hidden;
+    display: inline-flex;
+    flex-direction: column;
+
+    .el-dialog__body {
+      flex: 1;
+      overflow-y: auto;
+    }
+  }
+
+  .el-dialog__header {
+    height: 48px;
+    padding-left: var(--el-dialog-padding-primary);
+    padding-bottom: 0;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid var(--el-border-color);
+
+    .el-dialog__headerbtn {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .el-dialog__body {
+    padding: var(--el-dialog-padding-primary);
+  }
+
+  .el-dialog__footer {
+    padding: 12px var(--el-dialog-padding-primary);
+    border-top: 1px solid var(--el-border-color);
+  }
+}
+
+.el-dialog.#{a.$prefix}-dialog--simple {
+  .el-dialog__header {
+    border-bottom: none;
+  }
+
+  .el-dialog__body {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .el-dialog__footer {
+    border-top: none;
+  }
+}
+
+.el-drawer[role=dialog] {
+  --el-drawer-padding-primary: 16px;
+}
+
+.el-drawer {
+  .el-drawer__header {
+    height: 48px;
+    margin-bottom: 0;
+    padding-top: 0;
+    border-bottom: 1px solid var(--el-border-color);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+  }
+
+  .el-drawer__body {
+    font-size: 14px;
+  }
+
+  .el-drawer__footer {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    border-top: 1px solid var(--el-border-color);
+  }
+}

package/packages/styles/index.scss

@@ -1,4 +1,5 @@
 @use './var.scss' as a;
+@use './el.scss';
 
 body {
   --padding: 14px;
@@ -9,21 +10,6 @@ body {
   --padding-y-small: 8px;
 }
 
-.el-table__body-wrapper tr td.el-table-fixed-column--left,
-.el-table__body-wrapper tr td.el-table-fixed-column--right,
-.el-table__body-wrapper tr th.el-table-fixed-column--left,
-.el-table__body-wrapper tr th.el-table-fixed-column--right,
-.el-table__footer-wrapper tr td.el-table-fixed-column--left,
-.el-table__footer-wrapper tr td.el-table-fixed-column--right,
-.el-table__footer-wrapper tr th.el-table-fixed-column--left,
-.el-table__footer-wrapper tr th.el-table-fixed-column--right,
-.el-table__header-wrapper tr td.el-table-fixed-column--left,
-.el-table__header-wrapper tr td.el-table-fixed-column--right,
-.el-table__header-wrapper tr th.el-table-fixed-column--left,
-.el-table__header-wrapper tr th.el-table-fixed-column--right {
-  background: var(--el-bg-color);
-}
-
 .gi-table .el-table {
   --el-table-header-bg-color: var(--el-fill-color-lighter);
 }
@@ -156,77 +142,6 @@ body {
   padding: 0 !important;
 }
 
-.el-dialog {
-  padding: 0 !important;
-
-  &.is-fullscreen {
-    overflow: hidden;
-    display: inline-flex;
-    flex-direction: column;
-
-    .el-dialog__body {
-      flex: 1;
-      overflow-y: auto;
-    }
-  }
-
-  .el-dialog__header {
-    height: 48px;
-    padding-left: var(--el-dialog-padding-primary);
-    padding-bottom: 0;
-    display: flex;
-    align-items: center;
-    border-bottom: 1px solid var(--el-border-color);
-  }
-
-  .el-dialog__body {
-    padding: var(--el-dialog-padding-primary);
-  }
-
-  .el-dialog__footer {
-    padding: 12px var(--el-dialog-padding-primary);
-    border-top: 1px solid var(--el-border-color);
-  }
-}
-
-.el-dialog.#{a.$prefix}-dialog--simple {
-  .el-dialog__header {
-    border-bottom: none;
-  }
-
-  .el-dialog__body {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-  .el-dialog__footer {
-    border-top: none;
-  }
-}
-
-.el-drawer[role=dialog] {
-  --el-drawer-padding-primary: 16px;
-}
-
-.el-drawer {
-  .el-drawer__header {
-    height: 48px;
-    margin-bottom: 0;
-    padding-top: 0;
-    border-bottom: 1px solid var(--el-border-color);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    box-sizing: border-box;
-  }
-
-  .el-drawer__body {
-    font-size: 14px;
-  }
-
-  .el-drawer__footer {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    border-top: 1px solid var(--el-border-color);
-  }
+.gi-flex-column {
+  flex-direction: column;
 }

package/packages/types/global.d.ts

@@ -0,0 +1,7 @@
+import type { Config } from '../index'
+
+declare module '@vue/runtime-core' {
+  interface ComponentCustomProperties {
+    $config?: Config
+  }
+}