diff --git a/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx b/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx index ca98c793739d0191ee9b79e277041b5a78b4c5fc..c16a5c60c125a87a9f13979b4974e50fc12ebed5 100644 --- a/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx +++ b/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx @@ -1,7 +1,7 @@ import { computed, Ref, ref, SetupContext } from 'vue'; +import { UseDataView, UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view'; import { ListViewProps } from '../../list-view.props'; -import { UseDataView, UseGroupData, UseSelection, UseVisualData, VisualData } from '../../../../data-view'; import getSingleItem from '../item/single-item.component'; import getContentItem from '../item/content-item.component'; import getDraggableItem from '../item/draggable-item.component'; diff --git a/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx index 237e0e90390d38f126a28a6e148aad492534cebd..92df9f77f9990bd8a241b4878f09255904a71264 100644 --- a/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx +++ b/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx @@ -1,8 +1,8 @@ import { Ref, SetupContext, ref } from "vue"; -import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types"; -import { ListViewProps } from "../../list-view.props"; import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view'; import { FCheckbox } from '@farris/ui-vue/components/checkbox'; +import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types"; +import { ListViewProps } from "../../list-view.props"; export default function ( props: ListViewProps, diff --git a/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx index 047d8dd5fa7f435f8ab749f289dfe406032bb903..6f6a767b89b19e50fcb032680f04ac37b3d6ae4f 100644 --- a/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx +++ b/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx @@ -1,9 +1,8 @@ import { Ref, SetupContext, computed, ref } from "vue"; -import { debounce, throttle } from 'lodash-es'; import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view'; +import { FCheckbox } from '@farris/ui-vue/components/checkbox'; import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types"; import { ListViewProps } from "../../list-view.props"; -import { FCheckbox } from '@farris/ui-vue/components/checkbox'; // import './draggable-item.css'; export default function ( props: ListViewProps, diff --git a/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx index 01ed882df30b19151296021d932a66a9d74061a9..98c4e503b378705fbcbfeb705f7a4827ae1a3cfc 100644 --- a/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx +++ b/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx @@ -1,6 +1,6 @@ import { Ref, SetupContext, computed, ref } from "vue"; -import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types"; import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view'; +import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types"; import { ListViewProps } from "../../list-view.props"; import './group-item.css'; diff --git a/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx index 3918fa414c9763f1c471e3c0b2cb30f21e8848e9..2d6d61ecb0d82e7fc63d8919e40ed80028cf247d 100644 --- a/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx +++ b/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx @@ -1,9 +1,9 @@ import { Ref, SetupContext, computed, ref } from "vue"; -import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types"; import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view'; -import { ListViewProps } from "../../list-view.props"; import { FCheckbox } from '@farris/ui-vue/components/checkbox'; +import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types"; +import { ListViewProps } from "../../list-view.props"; export default function ( props: ListViewProps, diff --git a/packages/ui-vue/components/list-view/src/composition/use-draggable.ts b/packages/ui-vue/components/list-view/src/composition/use-draggable.ts index 25aa7d44f56baab918d7cea8bf5f637e92ab2a7f..11a5a0d288604f5f37c10317901a878965d04473 100644 --- a/packages/ui-vue/components/list-view/src/composition/use-draggable.ts +++ b/packages/ui-vue/components/list-view/src/composition/use-draggable.ts @@ -1,7 +1,7 @@ import { Ref, SetupContext, ref } from "vue"; import { ListViewProps } from "../list-view.props"; import { UseDraggable, UseHover } from "./types"; -import { UseDataView, VisualData } from '../../../data-view'; +import { UseDataView, VisualData } from '@farris/ui-vue/components/data-view'; export function useDraggable( props: ListViewProps, diff --git a/packages/ui-vue/components/list-view/src/composition/use-item.ts b/packages/ui-vue/components/list-view/src/composition/use-item.ts index f31e507091ca04339a6652503be85fb16c23a072..21f912e0a4115e62800950c3a83c62ec7b5e9511 100644 --- a/packages/ui-vue/components/list-view/src/composition/use-item.ts +++ b/packages/ui-vue/components/list-view/src/composition/use-item.ts @@ -1,7 +1,7 @@ import { Ref, SetupContext, computed, ref } from "vue"; +import { UseRow, UseSelection, VisualData } from '@farris/ui-vue/components/data-view'; import { ListViewProps, MultiSelectMode } from "../list-view.props"; import { UseDraggable, UseHover, UseItem } from "./types"; -import { UseRow, UseSelection, VisualData } from '@farris/ui-vue/components/data-view'; export function useItem( props: ListViewProps, diff --git a/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx b/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx index 11164485378c2b731219399b35b821f381bf0fb4..c3466efd3ced1e553459356a5a68e1fb43863615 100644 --- a/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx +++ b/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx @@ -17,9 +17,8 @@ import { SetupContext, computed, defineComponent, inject, onMounted, ref, watch } from 'vue'; +import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas'; import { ListViewTableProps, listViewTableProps } from '../list-view-table.props'; -import { DesignerItemContext } from '../../../designer-canvas/src/types'; -import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component'; export default defineComponent({ name: 'FListViewTableDesign', diff --git a/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx b/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx index 6d31fbd58b0e8027b94c6d8311ade7cdf753ecd6..6f5d9eef26de7650d6a87fdf6ae4538aef16f43d 100644 --- a/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx +++ b/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { computed, defineComponent, inject, onMounted, ref, SetupContext, TransitionGroup, withModifiers } from 'vue'; -import { ListViewProps, listViewProps } from '../list-view.props'; +import { computed, defineComponent, inject, onMounted, ref, SetupContext } from 'vue'; +import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas'; +import { + DataViewOptions, UseCellEditor, VisualData, useDataView, useEdit, useFilter, useGroupData, useHierarchy, useIdentify, + useRow, useSelection, useVisualData, useVisualDataBound, useVisualDataCell, useVisualDataRow, useVisualGroupRow, useVisualSummaryRow +} from '@farris/ui-vue/components/data-view'; import { useSearch } from '../composition/use-search'; -import { DesignerItemContext } from '../../../designer-canvas/src/types'; -import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component'; -import { DataViewOptions, UseCellEditor, VisualData, useDataView, useEdit, useFilter, useGroupData, useHierarchy, useIdentify, usePagination, useRow, useSelection, useVisualData, useVisualDataBound, useVisualDataCell, useVisualDataRow, useVisualGroupRow, useVisualSummaryRow } from '../../../data-view'; +import { ListViewProps, listViewProps } from '../list-view.props'; import getListArea from '../components/data/data-area.component'; import getContentHeader from '../components/header/content-header.component'; import getSearchHeader from '../components/header/search-header.component'; @@ -56,7 +58,7 @@ export default defineComponent({ return dataView.dataView.value.length; }); const useRowComposition = useRow(props as DataViewOptions, context as SetupContext, useSelectionComposition, useIdentifyComposition); - const useEditComposition = useEdit(props as DataViewOptions, context as SetupContext, useIdentifyComposition, useRowComposition,visibleDatas); + const useEditComposition = useEdit(props as DataViewOptions, context as SetupContext, useIdentifyComposition, useRowComposition, visibleDatas); const useVisualDataBoundComposition = useVisualDataBound(props as DataViewOptions); @@ -129,12 +131,12 @@ export default defineComponent({ const useHoverComposition = useHover(); const useDraggableComposition = useDraggable(props, context, dataView, useHoverComposition); - const useItemCompostion = useItem(props, context, visibleDatas, + const useItemCompostion = useItem(props, context, visibleDatas, useDraggableComposition, useHoverComposition, useSelectionComposition); /** 渲染树状区域 */ - const { renderListArea } = getListArea(props, context, - visibleDatas, dataView, useGroupDataComposition, - useHoverComposition, useSelectionComposition, + const { renderListArea } = getListArea(props, context, + visibleDatas, dataView, useGroupDataComposition, + useHoverComposition, useSelectionComposition, useVisualDataComposition, useItemCompostion, useDraggableComposition); function onClick(payload: MouseEvent) { diff --git a/packages/ui-vue/components/list-view/src/list-view-table.component.tsx b/packages/ui-vue/components/list-view/src/list-view-table.component.tsx index 19f27b32aecc40f117b832e3cab13d8ecabf44dd..29e5b031c6cecdb51ac39084c26bbcf86bec2b18 100644 --- a/packages/ui-vue/components/list-view/src/list-view-table.component.tsx +++ b/packages/ui-vue/components/list-view/src/list-view-table.component.tsx @@ -17,7 +17,7 @@ */ -import { SetupContext, computed, defineComponent, ref, watch } from 'vue'; +import { SetupContext, computed, defineComponent } from 'vue'; import { ListViewProps, listViewProps } from './list-view.props'; export default defineComponent({ diff --git a/packages/ui-vue/components/list-view/src/list-view-table.props.ts b/packages/ui-vue/components/list-view/src/list-view-table.props.ts index e4b2fb4565450dc56da7f04838f20076c43cdb38..5a320e081ab6fde529f226e78cad4f921104aa36 100644 --- a/packages/ui-vue/components/list-view/src/list-view-table.props.ts +++ b/packages/ui-vue/components/list-view/src/list-view-table.props.ts @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver'; +import { ExtractPropTypes } from 'vue'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { schemaMapper } from './schema/schema-mapper'; import { schemaResolver } from './schema/schema-resolver'; import listViewTableSchema from './schema/list-view-table.schema.json'; diff --git a/packages/ui-vue/components/list-view/src/list-view.component.tsx b/packages/ui-vue/components/list-view/src/list-view.component.tsx index 509fc943fa0053b269a49f2c19e70eb406cf71bf..406853a9aaff925f2334aea8700a5a4aa81a538b 100644 --- a/packages/ui-vue/components/list-view/src/list-view.component.tsx +++ b/packages/ui-vue/components/list-view/src/list-view.component.tsx @@ -15,14 +15,14 @@ * limitations under the License. */ import { computed, defineComponent, ref, SetupContext, watch } from 'vue'; -import { ListViewProps, listViewProps } from './list-view.props'; -import { useSearch } from './composition/use-search'; import { getCustomClass } from '@farris/ui-vue/components/common'; import { DataViewOptions, UseCellEditor, VisualData, useDataView, useEdit, useFilter, useGroupData, useHierarchy, useIdentify, useRow, useSelection, useVisualData, useVisualDataBound, useVisualDataCell, useVisualDataRow, useVisualGroupRow, useVisualSummaryRow } from '@farris/ui-vue/components/data-view'; +import { ListViewProps, listViewProps } from './list-view.props'; +import { useSearch } from './composition/use-search'; import getListArea from './components/data/data-area.component'; import getContentHeader from './components/header/content-header.component'; import getSearchHeader from './components/header/search-header.component'; diff --git a/packages/ui-vue/components/list-view/src/list-view.props.ts b/packages/ui-vue/components/list-view/src/list-view.props.ts index c4ad1470ac981c47f55b57b63d431faa5da73457..6e4baa49b7d22da802dc59a77aa5d30e7dc474c7 100644 --- a/packages/ui-vue/components/list-view/src/list-view.props.ts +++ b/packages/ui-vue/components/list-view/src/list-view.props.ts @@ -15,12 +15,12 @@ * limitations under the License. */ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { schemaMapper } from './schema/schema-mapper'; import { schemaResolver } from './schema/schema-resolver'; import listViewSchema from './schema/list-view.schema.json'; import propertyConfig from './property-config/list-view.property-config.json'; -import { DataColumn, SelectionOptions } from '../../data-view'; +import { DataColumn, SelectionOptions } from '@farris/ui-vue/components/data-view'; export type MultiSelectMode = 'OnCheck' | 'OnClick' | 'OnCheckAndClick' | 'OnCheckClearByClick'; diff --git a/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts b/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts b/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/number-spinner/src/composition/use-number.ts b/packages/ui-vue/components/number-spinner/src/composition/use-number.ts index 8e5806092806e549aa5bf4d2e59d6999bdd8d266..249ea0c31e11f1fbb889199037fafc4b8a6191ec 100644 --- a/packages/ui-vue/components/number-spinner/src/composition/use-number.ts +++ b/packages/ui-vue/components/number-spinner/src/composition/use-number.ts @@ -1,6 +1,6 @@ import { SetupContext, computed, ref } from "vue"; -import { NumberSpinnerProps } from "../number-spinner.props"; import BigNumber from "bignumber.js"; +import { NumberSpinnerProps } from "../number-spinner.props"; import { UseNumber } from "./types"; export function useNumber(props: NumberSpinnerProps, context: SetupContext): UseNumber {