@dt-frames/ui 1.0.10 → 1.0.11

package/es/style/components/table/index.less

@@ -171,3 +171,9 @@
         color: #333;
     }
 }
+
+.edit-cell-rule-popover .ant-popover-inner-content{
+    padding: 4px 8px;
+    color: #ed6f6f;
+    border-radius: 2px;
+}

package/es/style/theme/header/index.less

@@ -417,7 +417,7 @@
     margin-bottom: 20px;
 
     .select-item{
-        width: 130px;
+        width: 130px !important;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"keywords": [
 		"ui",
 		"dt-ui"

package/src/components/curd/src/components/dialog.vue

@@ -26,7 +26,7 @@
         }
     } )
 
-    const [registerDialog] = useModal({
+    const [registerDialog, { closeModal }] = useModal({
         ...omit(toRaw(props), [
             'actions',
             'curd',
@@ -63,9 +63,11 @@
                 getFormValues()
             )
             
-            obj.id 
+            let pro = obj.id 
                 ? props.curd.onUpdate( obj )
                 : props.curd.onAdd( obj )
+
+            pro.then( rsp => closeModal() )
         }
     }
 </script>

package/src/components/modal/src/hooks/useModal.ts

@@ -155,10 +155,11 @@ export function useModal(props?: Partial<ModalProps>,callbackFn?: Function): Use
         getVisible: computed(() => visibleData[~~unref(uidRef)]),
 
         // 关闭弹框进行回调
-        closeModal: (rsp: Recordable) => {
-            cbTransfer[unref(uidRef)](rsp)
-            getInstance()?.setModalProps({ visible: false });
+        closeModal: (rsp?: Recordable) => {
+            if(cbTransfer[unref(uidRef)]) cbTransfer[unref(uidRef)](rsp)
+            getInstance()?.setModalProps({ visible: false })
         },
+
         openModal: <T = any>(visable = true, data?: T, openOnSet = true) => {
             getInstance()?.setModalProps({
                 visible: visable
@@ -178,6 +179,7 @@ export function useModal(props?: Partial<ModalProps>,callbackFn?: Function): Use
                 dataTransfer[id] = toRaw(data);
             }
         },
+        
         setModalProps: (props: Partial<ModalProps>) => {
             getInstance()?.setModalProps(props);
         },

package/src/components/modal/src/index.vue

@@ -148,7 +148,7 @@
     // 弹框保存
     function handleSave() {
         emits('save')
-        handleCancel()
+        // handleCancel()
     }
 
     // 弹框关闭

package/src/components/modal/src/types/modal.type.ts

@@ -15,7 +15,7 @@ export interface ReturnMethods extends ModalMethods{
 
 export interface ReturnInnerMethods extends ModalMethods {
     openModal: <T = any>(props?: boolean, data?: T, openOnSet?: boolean) => void
-    closeModal: (rsp: Recordable) => void
+    closeModal: (rsp?: Recordable) => void
     changeLoading: (loading: boolean) => void
     getVisible?: ComputedRef<boolean>
     redoModalHeight: () => void

package/src/components/source/src/hooks/useFetch.ts

@@ -1,12 +1,12 @@
-import { http, isString, JsonResult, Recordable, ApiType } from "@dt-frames/core";
+import { http, isString, JsonResult, Recordable, ApiType, isObject } from "@dt-frames/core";
 
 export function useFetch(api: string | ApiType, baseUrl: string = '') {
     /**
      * 发送请求
      * handleParams 记录返回的值
      */
-    function fetch(params: Recordable = { }) {
-        let type, header = { }, model = {}, _api = ''
+    function fetch(params: any) {
+        let type, header = { }, model = {}
         if(isString( api )) {
             api = baseUrl + api
         } else {
@@ -19,7 +19,9 @@ export function useFetch(api: string | ApiType, baseUrl: string = '') {
         }
 
         return new Promise(( resolve, reject ) => {
-            http[type || 'post']( api, Object.assign({}, model, params), {
+            let param = isObject(params) ? Object.assign({}, model, params) : params
+
+            http[type || 'post']( api, param, {
                 ...header,
                 ...{ onlyData: false }
             }).then(

package/src/components/source/src/hooks/useSource.ts

@@ -134,7 +134,7 @@ export function useSource(opt: SourceType) {
     function onAdd(model: Recordable) {
         const { fetch } = useFetch(add, baseUrl)
 
-        fetch(model).then( (rsp: any) => {
+        return fetch(model).then( (rsp: any) => {
             message.success('新增成功')
             search()
         } )
@@ -151,7 +151,7 @@ export function useSource(opt: SourceType) {
     // 修改
     function onUpdate(model: Recordable) {
         const { fetch } = useFetch(update, baseUrl)
-        fetch(model).then( (rsp: any) => {
+        return fetch(model).then( (rsp: any) => {
             message.success('更新数据成功')
             search()
         } )
@@ -162,7 +162,8 @@ export function useSource(opt: SourceType) {
     function onDeletes(ids: any) {
         const { fetch } = useFetch(deletes, baseUrl)
         
-        fetch(ids).then( (rsp: any) => {
+        fetch(toRaw(ids)).then( (rsp: any) => {
+            message.success(`${ ids.length > 1 ? '批量' : '' } 删除成功！`)
             search()
         } )
     }

package/src/components/table/index.less

@@ -171,3 +171,9 @@
         color: #333;
     }
 }
+
+.edit-cell-rule-popover .ant-popover-inner-content{
+    padding: 4px 8px;
+    color: #ed6f6f;
+    border-radius: 2px;
+}

package/src/components/table/src/components/TableHeader.vue

@@ -9,7 +9,7 @@
                 <slot name="toolbar"></slot>
             </div>
 
-            <div class="dt-table-header-actions__right">
+            <div class="dt-table-header-actions__right" v-if="tableTools">
                 <TableSettinCom
                     :setting="tableTools"
                     @columns-change="handleColumnChange"
@@ -42,7 +42,7 @@
         },
         props: {
             tableTools: {
-                type: Object as PropType<TableSetting>
+                type: Object as PropType<TableSetting | boolean>
             },
             toolbar: {
                 type: Array as PropType<BtnsType[]>,

package/src/components/table/src/components/editable/CellComponent.ts

@@ -0,0 +1,57 @@
+import { Recordable } from "@dt-frames/core"
+import { Popover } from "ant-design-vue"
+import { DefineComponent, FunctionalComponent, h, Ref } from "vue"
+import { ComponentType } from "../../types/table.type"
+import { componentMap } from "./componentMap"
+
+
+type ComponentProps = {
+    component: ComponentType
+    rule: boolean
+    popoverVisible: boolean
+    ruleMessage: string
+    getPopupContainer?: any
+}
+
+export type EditRecordRow<T = Recordable> = Partial<
+  {
+    onEdit: (editable: boolean, submit?: boolean) => Promise<boolean>;
+    onValid: () => Promise<boolean>;
+    editable: boolean;
+    onCancel: Function;
+    onSubmit: Function;
+    submitCbs: Function[];
+    cancelCbs: Function[];
+    validCbs: Function[];
+    editValueRefs: Recordable<Ref>;
+  } & T
+>
+
+export const CellComponent: FunctionalComponent = ({
+    component = 'Input',
+    rule = true,
+    ruleMessage,
+    popoverVisible,
+    getPopupContainer
+}: ComponentProps,
+    { attrs }
+) => {
+    const Comp = componentMap.get(component) as DefineComponent
+    
+    const DefaultComp = h(Comp, attrs)
+
+    if (!rule) return DefaultComp
+
+    return h(
+        Popover,
+        {
+            overlayClassName: 'edit-cell-rule-popover',
+            visible: !!popoverVisible,
+            ...(getPopupContainer ? { getPopupContainer } : {}),
+        },
+        {
+            default: () => DefaultComp,
+            content: () => ruleMessage,
+        },
+    )
+}

package/src/components/table/src/components/editable/EditTableCell.vue

@@ -0,0 +1,181 @@
+<template>
+    <div class="editable-cell">
+        <CellComponent
+            ref="elRef"
+            v-bind="getComponentProps"
+            :component = "column?.editComponent"
+            :popoverVisible = "getRuleVisible"
+            :rule = "editRule"
+            :ruleMessage = "ruleMessage"
+            :class = "getWrapperClass"
+            :onChange = "handleChange"
+            :onOptionsChange = "handleOptionsChange"
+        >
+        </CellComponent>
+    </div>
+</template>
+
+<script lang="tsx">
+    import { DtEvent, isBoolean, isNumber, isString, Recordable } from "@dt-frames/core"
+    import { isFunction } from "@vueuse/core"
+    import { omit } from 'lodash-es'
+    import { Spin } from "ant-design-vue"
+    import { defineComponent, PropType, ref, unref, computed, toRaw } from "vue"
+    import { BasicColumn, ComponentType, LableValOptions } from "../../types/table.type"
+    import { CellComponent, EditRecordRow } from "./CellComponent"
+    import { getTableInstance } from "../../hooks/useTableInstance"
+
+
+    export default defineComponent({
+        name: 'EditableCell',
+        components: {
+            Spin,
+            CellComponent
+        },
+        props: {
+            value: {
+                type: [String, Number, Boolean, Object] as PropType<string | number | boolean | Recordable>,
+                default: ''
+            },
+            record: {
+                type: Object as PropType<EditRecordRow>,
+            },
+            column: {
+                type: Object as PropType<BasicColumn>,
+                default: ():BasicColumn => ({}),
+            },
+            index: Number
+        },
+        setup(props) {
+            const table = getTableInstance()
+            const elRef = ref()
+
+            const { editRule, align = 'left' } = props.column
+
+            const ruleMessage = ref('')
+            const ruleVisible = ref(false)
+
+            const optionsRef = ref<LableValOptions>([])
+            const currentValueRef = ref<any>(props.value)
+
+            const getComponent = computed(() => props.column?.editComponent || 'Input')
+            
+            // 提示信息是否可见
+            const getRuleVisible = computed(() => {
+                return unref( ruleMessage ) && unref( ruleVisible )
+            })
+
+            const getWrapperClass = computed(() => {
+                return `edit-cell-align-${align}`
+            })
+
+            const getIsCheckComp = computed(() => {
+                const component = unref(getComponent);
+                return ['Checkbox', 'Switch'].includes(component);
+            })
+
+            const createPlaceholderMessage = ( component: ComponentType ) => {
+                if( component.includes('Input') ) {
+                    return '请输入'
+                }
+
+                return '请选择'
+            }
+
+            // 设置表格属性
+            const getComponentProps = computed(() => {
+                const isCheckValue = unref(getIsCheckComp)
+                const valueField = isCheckValue ? 'checked' : 'value'
+
+                const val = unref(currentValueRef)
+                const value = isCheckValue ? (isNumber(val) && isBoolean(val) ? val : !!val) : val
+
+                let compProps = props.column?.editComponentProps ?? {}
+                
+                const { record, column, index } = props
+                if (isFunction(compProps)) {
+                    compProps = compProps({ text: val, record, column, index }) ?? {}
+                }
+
+                return {
+                    size: 'small',
+                    getPopupContainer: () => document.body,
+                    placeholder: createPlaceholderMessage(unref(getComponent)),
+                    ...omit(compProps, 'onChange'),
+                    [valueField]: value
+                }
+            })
+
+
+            async function handleChange( e: any ) {
+                const component = unref(getComponent)
+
+                if( !e ) {
+                    currentValueRef.value = e
+                } else if (component === 'Checkbox') {
+                    currentValueRef.value = (e as DtEvent).target.checked
+                } else if (component === 'Switch') {
+                    currentValueRef.value = e
+                } else if (e?.target && Reflect.has(e.target, 'value')) {
+                    currentValueRef.value = (e as DtEvent).target.value
+                } else if (isString(e) || isBoolean(e) || isNumber(e)) {
+                    currentValueRef.value = e
+                }
+                const onChange = unref(getComponentProps)?.onChange
+                if (onChange && isFunction(onChange)) onChange(...arguments)
+
+                table.emit?.('edit-change', {
+                    column: props.column,
+                    value: unref(currentValueRef),
+                    record: toRaw(props.record),
+                })
+
+                handleSubmitRule()
+            }
+
+
+            async function handleSubmitRule() {
+                const { column, record } = props
+                const { editRule } = column
+                const currentValue = unref(currentValueRef)
+
+                if ( editRule ) {
+                    if( isBoolean(editRule) && !currentValue && !isNumber(currentValue) ) {
+                        ruleVisible.value = true
+                        const component = unref(getComponent)
+                        ruleMessage.value = createPlaceholderMessage(component)
+                        return false
+                    }
+
+                    if( isFunction(editRule) ) {
+                        const res = await editRule(currentValue, record as Recordable)
+
+                        if (!!res) {
+                            ruleMessage.value = res;
+                            ruleVisible.value = true;
+                            return false;
+                        }
+                    }
+                }
+
+                ruleMessage.value = ''
+                return true
+            }
+
+            function handleOptionsChange(options: LableValOptions) {
+                optionsRef.value = options
+            }
+
+            return {
+                props,
+                getComponentProps,
+                getRuleVisible,
+                editRule,
+                ruleMessage,
+                getWrapperClass,
+                handleChange,
+                handleOptionsChange
+            }
+        }
+    })
+</script>

package/src/components/table/src/components/editable/componentMap.ts

@@ -0,0 +1,18 @@
+import { Input, Select, Checkbox, DatePicker, InputNumber, Switch, TimePicker, TreeSelect } from 'ant-design-vue'
+import { Component } from 'vue'
+import { ComponentType } from '../../types/table.type'
+
+const componentMap = new Map<ComponentType, Component>()
+
+componentMap.set('Input', Input)
+componentMap.set('InputNumber', InputNumber)
+componentMap.set('Select', Select)
+componentMap.set('TreeSelect', TreeSelect)
+componentMap.set('Switch', Switch)
+componentMap.set('Checkbox', Checkbox)
+componentMap.set('DatePicker', DatePicker)
+componentMap.set('TimePicker', TimePicker)
+
+export { 
+    componentMap 
+}

package/src/components/table/src/components/editable/index.ts

@@ -0,0 +1,58 @@
+import { isArray } from '@dt-frames/core'
+import { h } from 'vue'
+import { BasicColumn } from "../../types/table.type"
+import EditableCell from './EditTableCell.vue'
+
+function renderEditCell(column: BasicColumn) {
+    return ({text: value, record, index}) => {
+        // 触发校验
+        record.onValid = async () => {
+            if ( isArray( record?.validCbs ) ) {
+                const validFns = (record?.validCbs || []).map((fn) => fn())
+                const res = await Promise.all( validFns )
+                return res.every((item) => !!item)
+            }
+
+            return false
+        }
+
+        // 触发修改
+        record.onEdit = async (edit: boolean, submit = false) => {
+            if (!submit) {
+                record.editable = edit;
+            }
+
+            // 提交
+            if (!edit && submit) {
+                if ( !(await record.onValid()) ) return false
+                
+                const res = await record.onSubmitEdit?.()
+
+                if (res) {
+                    record.editable = false
+                    return true
+                }
+
+                return false
+            }
+
+            // 取消
+            if (!edit && !submit) {
+                record.onCancelEdit?.()
+            }
+
+            return true
+        }
+
+        return h(EditableCell, {
+            value,
+            record,
+            column,
+            index,
+        })
+    }
+}
+
+export {
+    renderEditCell
+}

package/src/components/table/src/hooks/useColumns.ts

@@ -1,9 +1,10 @@
 import type { PaginationProps } from 'ant-design-vue/lib/pagination'
-import { computed, ComputedRef, Ref, ref, unref, toRaw, watch, h } from "vue";
-import { cloneDeep, isEqual } from 'lodash-es'
-import { BasicColumn, BasicTableProps, CellFormat } from "../types/table.type";
-import { SetColumnsParams } from '../types/tableHeader.type';
-import { isArray, isBoolean, isFunction, isObject, isString, Recordable, useAppStore, getDictValueByCode } from '@dt-frames/core';
+import { computed, ComputedRef, Ref, ref, unref, toRaw, watch, h } from "vue"
+import { cloneDeep, isEqual, omit } from 'lodash-es'
+import { renderEditCell } from '../components/editable'
+import { BasicColumn, BasicTableProps } from "../types/table.type"
+import { SetColumnsParams } from '../types/tableHeader.type'
+import { isArray, isBoolean, isFunction, isObject, isString, Recordable, useAppStore, getDictValueByCode } from '@dt-frames/core'
 import TableAction from '../components/TableActions.vue'
 
 // 索引列及操作列标识
@@ -157,12 +158,11 @@ function handleActionColumn(propsRef: ComputedRef<BasicTableProps>, columns: Bas
             customRender: ({ record, index}) => {
                 return h(
                     TableAction as any,
-                    {
+                    omit({
                         ...columnObj,
                         record,
-                        align: null,
                         index
-                    }
+                    }, 'align')
                 )
             }
         })
@@ -211,6 +211,13 @@ export function useColumns(
 
         return columns
             .filter( column => isIfShow(column) )
+            .map(column => {
+                if( column.edit ) {
+                    column.customRender = renderEditCell(column)
+                }
+
+                return column
+            })
 
     })
 

package/src/components/table/src/hooks/useTableHeader.ts

@@ -9,10 +9,10 @@ export function useTableHeader(
     handlers: { onColumnsChange: (data: ColumnChangeParam[]) => void }
 ) {
     const getHeaderProps = computed((): Recordable => {
-        const { tableSetting, toolbar } = unref(propsRef)
+        const { tableSetting, toolbar = [] } = unref(propsRef)
 
         const { getSlot } = useSlots()
-        const hideTitle = !slots.toolbar && !slots.headerTop && !tableSetting
+        const hideTitle = !toolbar.length && !slots.toolbar && !slots.headerTop && !tableSetting
 
         return {
             title: hideTitle 

package/src/components/table/src/index.vue

@@ -49,7 +49,11 @@
         emits: [
             'register',
             'columns-change',
-            'selection-change'
+            'selection-change',
+            'row-click',
+            'row-dbClick',
+            'expanded-rows-change',
+            'edit-change'
         ],
         setup(props, { emit, attrs, slots }) {
             // table实例
@@ -116,6 +120,7 @@
                 getCacheColumns,
                 getSelectRows,
                 getSelectRowKeys,
+                emit,
                 getSize: () => {
                     return unref(getBind).size as SizeType;
                 }

package/src/components/table/src/props.ts

@@ -12,7 +12,7 @@ export const TableProps = {
     clickRowSelect: { type: Boolean, default: false },
 
     // 表格设置
-    tableSetting: {type: Object as PropType<TableSetting>, default: () => ({})},
+    tableSetting: {type: Object as PropType<TableSetting | boolean>, default: () => ({})},
 
     // 是否显示斑马条纹
     striped: { type: Boolean, default: true },

package/src/components/table/src/types/table.type.ts

@@ -88,6 +88,22 @@ export type ActionType = {
     btns?: BtnsType[]
 }
 
+export type ComponentType =
+  | 'Input'
+  | 'InputNumber'
+  | 'Select'
+  | 'TreeSelect'
+  | 'Checkbox'
+  | 'Switch'
+  | 'DatePicker'
+  | 'TimePicker'
+
+export type LableValOptions = {
+    label: string;
+    value: any;
+    [key: string]: string | number | boolean
+}[]
+
 
 export interface BasicColumn extends ColumnProps {
     // 子元素
@@ -107,7 +123,17 @@ export interface BasicColumn extends ColumnProps {
 
     edit?: boolean
     editRow?: boolean
-    // editable?: boolean
+    editable?: boolean
+    editComponent?: ComponentType
+    editComponentProps?:
+    | ((opt: {
+        text: string | number | boolean | Recordable;
+        record: Recordable;
+        column: BasicColumn;
+        index: number;
+      }) => Recordable)
+    | Recordable
+    editRule?: boolean | ((text: string, record: Recordable) => Promise<string>)
 
     // 是否显示序号列
     showIndexColumn?: boolean
@@ -130,4 +156,5 @@ export type TableActionType = {
     setCacheColumnsByField?: (dataIndex: string | undefined, value: BasicColumn) => void
     getSelectRows: ( ) => void
     getSelectRowKeys: ( ) => void
+    emit?: any
 }

package/src/theme/header/index.less

@@ -417,7 +417,7 @@
     margin-bottom: 20px;
 
     .select-item{
-        width: 130px;
+        width: 130px !important;
     }
 }