-
);
diff --git a/packages/devui-vue/devui/transfer/src/composables/use-transfer-body.ts b/packages/devui-vue/devui/transfer/src/composables/use-transfer-body.ts
index d635e9533a..0bbbf48f42 100644
--- a/packages/devui-vue/devui/transfer/src/composables/use-transfer-body.ts
+++ b/packages/devui-vue/devui/transfer/src/composables/use-transfer-body.ts
@@ -191,7 +191,7 @@ export const transferBodyState = (props: TTransferBodyProps, ctx: SetupContext)
if (props.drop && typeof props.drop === 'function') {
props.drop(event, item);
}
- ctx.emit('updateDataPosition', dragHighlight.value, item.value);
+ ctx.emit('updateDataPosition', dragHighlight.value, item.value, dropPosition.value);
};
/**
* dragendHandle: 拖拽完成事件处理函数
diff --git a/packages/devui-vue/devui/transfer/src/composables/use-transfer-panel.ts b/packages/devui-vue/devui/transfer/src/composables/use-transfer-panel.ts
index 28ed92901b..86796f157a 100644
--- a/packages/devui-vue/devui/transfer/src/composables/use-transfer-panel.ts
+++ b/packages/devui-vue/devui/transfer/src/composables/use-transfer-panel.ts
@@ -148,8 +148,8 @@ export const transferPanelState = (props: TTransferPanelProps, ctx: SetupContext
* @param startValue 交换item的值
* @param endValue 目标交换item的值
*/
- const updateDataHandle = (startValue: TKey, endValue: TKey) => {
- ctx.emit(`updateData`, startValue, endValue);
+ const updateDataHandle = (startValue: TKey, endValue: TKey, position: number) => {
+ ctx.emit(`updateData`, startValue, endValue, position);
};
watchEffect(() => {
diff --git a/packages/devui-vue/devui/transfer/src/composables/use-transfer.ts b/packages/devui-vue/devui/transfer/src/composables/use-transfer.ts
index 44f4888128..2b7d8fdd12 100644
--- a/packages/devui-vue/devui/transfer/src/composables/use-transfer.ts
+++ b/packages/devui-vue/devui/transfer/src/composables/use-transfer.ts
@@ -141,20 +141,40 @@ export const transferState = (props: TTransferProps, ctx: SetupContext) => {
* @param startValue 当前拖拽item的值
* @param endValue 放开item的值
*/
- const updateSourceDataHandle = (startValue: TKey, endValue: TKey) => {
- const { startIndex, endIndex, dragItem, dropItem } = getDargItemAndDropItem(startValue, endValue, 'source');
- sourceData.value.splice(endIndex, 1, dragItem);
- sourceData.value.splice(startIndex, 1, dropItem);
+ const updateSourceDataHandle = (startValue: TKey, endValue: TKey, position: number) => {
+ const { startIndex, endIndex, dragItem } = getDargItemAndDropItem(startValue, endValue, 'source');
+ let end = endIndex;
+ if (position === 1) {
+ end = endIndex + 1;
+ }
+ if (startIndex < end) {
+ sourceData.value.splice(end, 0, dragItem);
+ sourceData.value.splice(startIndex, 1);
+ } else {
+ sourceData.value.splice(startIndex, 1);
+ sourceData.value.splice(end, 0, dragItem);
+ }
+ ctx.emit('sourceDragEnd', [...sourceData.value]);
};
/**
* updateTargetDataHandle: 更新target数据
* @param startValue 当前拖拽item的值
* @param endValue 放开item的值
*/
- const updateTargetDataHandle = (startValue: TKey, endValue: TKey) => {
- const { startIndex, endIndex, dragItem, dropItem } = getDargItemAndDropItem(startValue, endValue, 'target');
- targetData.value.splice(endIndex, 1, dragItem);
- targetData.value.splice(startIndex, 1, dropItem);
+ const updateTargetDataHandle = (startValue: TKey, endValue: TKey, position: number) => {
+ const { startIndex, endIndex, dragItem } = getDargItemAndDropItem(startValue, endValue, 'target');
+ let end = endIndex;
+ if (position === 1) {
+ end = endIndex + 1;
+ }
+ if (startIndex < end) {
+ targetData.value.splice(end, 0, dragItem);
+ targetData.value.splice(startIndex, 1);
+ } else {
+ targetData.value.splice(startIndex, 1);
+ targetData.value.splice(end, 0, dragItem);
+ }
+ ctx.emit('targetDragEnd', [...targetData.value]);
};
onMounted(() => {
diff --git a/packages/devui-vue/devui/transfer/src/transfer.scss b/packages/devui-vue/devui/transfer/src/transfer.scss
index 837b1b80ec..e45c728a26 100644
--- a/packages/devui-vue/devui/transfer/src/transfer.scss
+++ b/packages/devui-vue/devui/transfer/src/transfer.scss
@@ -1,4 +1,4 @@
-@import '../../styles-var/devui-var.scss';
+@import '@devui/theme/styles-var/devui-var.scss';
$devui-transfer-header-height: 40px;
$devui-transfer-body-list-item-height: 32px;
@@ -154,10 +154,6 @@ $devui-transfer-body-list-item-height: 32px;
background-color: $devui-brand-foil;
}
- &-drag-over {
- background-color: $devui-brand-hover;
- }
-
.transfer-checkbox {
height: 36px;
line-height: 36px;
diff --git a/packages/devui-vue/devui/transfer/src/transfer.tsx b/packages/devui-vue/devui/transfer/src/transfer.tsx
index 1aece62fa8..e317fa7fdb 100644
--- a/packages/devui-vue/devui/transfer/src/transfer.tsx
+++ b/packages/devui-vue/devui/transfer/src/transfer.tsx
@@ -5,7 +5,7 @@ import transferOperate from './components/transfer-operate';
import { transferProps, TTransferProps, TKey, IItem } from './transfer-types';
import { transferState } from './composables/use-transfer';
import './transfer.scss';
-import { useNamespace } from '../../shared/hooks/use-namespace';
+import { useNamespace } from '@devui/shared/utils';
import { createI18nTranslate } from '../../locale/create';
export default defineComponent({
@@ -15,7 +15,7 @@ export default defineComponent({
transferOperate,
},
props: transferProps,
- emits: ['update:modelValue', 'change'],
+ emits: ['update:modelValue', 'change', 'sourceDragEnd', 'targetDragEnd'],
setup(props: TTransferProps, ctx: SetupContext) {
const app = getCurrentInstance();
const t = createI18nTranslate('DTransfer', app);
@@ -72,8 +72,8 @@ export default defineComponent({
onChangeChecked={(value: IItem[]) => {
updateSourceCheckedHandle(value);
}}
- onUpdateData={(startValue: TKey, endValue: TKey) => {
- updateSourceDataHandle(startValue, endValue);
+ onUpdateData={(startValue: TKey, endValue: TKey, position: number) => {
+ updateSourceDataHandle(startValue, endValue, position);
}}>
{
updateTargetCheckedHandle(value);
}}
- onUpdateData={(startValue: TKey, endValue: TKey) => {
- updateTargetDataHandle(startValue, endValue);
+ onUpdateData={(startValue: TKey, endValue: TKey, position: number) => {
+ updateTargetDataHandle(startValue, endValue, position);
}}>
);
diff --git a/packages/devui-vue/devui/tree-select/src/tree-select.scss b/packages/devui-vue/devui/tree-select/src/tree-select.scss
index c47b866d9f..c1ea171f80 100644
--- a/packages/devui-vue/devui/tree-select/src/tree-select.scss
+++ b/packages/devui-vue/devui/tree-select/src/tree-select.scss
@@ -1,4 +1,4 @@
-@import '../../styles-var/devui-var.scss';
+@import '@devui/theme/styles-var/devui-var.scss';
$tree-select-input-height: 28px;
$tree-select-dropdown-max-height: 300px;
diff --git a/packages/devui-vue/devui/tree/src/tree.scss b/packages/devui-vue/devui/tree/src/tree.scss
index 942c31d6e8..73a4f87e01 100644
--- a/packages/devui-vue/devui/tree/src/tree.scss
+++ b/packages/devui-vue/devui/tree/src/tree.scss
@@ -1,4 +1,4 @@
-@import '../../styles-var/devui-var.scss';
+@import '@devui/theme/styles-var/devui-var.scss';
$keyframe-blue: #5e7ce0;
diff --git a/packages/devui-vue/devui/upload/src/upload.scss b/packages/devui-vue/devui/upload/src/upload.scss
index 6837f4604c..f2426ff4cf 100644
--- a/packages/devui-vue/devui/upload/src/upload.scss
+++ b/packages/devui-vue/devui/upload/src/upload.scss
@@ -1,4 +1,4 @@
-@import '../../styles-var/devui-var.scss';
+@import '@devui/theme/styles-var/devui-var.scss';
.#{$devui-prefix}-input-group {
position: relative;
diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageContributorConfig.ts b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageContributorConfig.ts
index 5740a132c2..aa13ab5cec 100644
--- a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageContributorConfig.ts
+++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageContributorConfig.ts
@@ -32,16 +32,6 @@ export const CONTRIBUTORS_MAP: IContributingMap = {
homepage: 'https://github.com/qinwencheng'
},
],
- dragdrop: [
- {
- avatar: 'https://avatars.githubusercontent.com/u/61737780?v=4',
- homepage: 'https://github.com/asdlml6'
- },
- {
- avatar: 'https://avatars.githubusercontent.com/u/9566362?v=4',
- homepage: 'https://github.com/kagol'
- },
- ],
fullscreen: [
{
avatar: 'https://avatars.githubusercontent.com/u/20532893?v=4',
diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss
index fd7d31c925..03b4aa4bce 100644
--- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss
+++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss
@@ -1,4 +1,4 @@
-@import '@devui/styles-var/devui-var.scss';
+@import '@devui/theme/styles-var/devui-var.scss';
.demo-block {
border: solid 1px $devui-dividing-line !important;
diff --git a/packages/devui-vue/docs/.vitepress/theme/index.ts b/packages/devui-vue/docs/.vitepress/theme/index.ts
index 7de2d9a71d..d77decc5af 100644
--- a/packages/devui-vue/docs/.vitepress/theme/index.ts
+++ b/packages/devui-vue/docs/.vitepress/theme/index.ts
@@ -1,15 +1,40 @@
-import DevUI from '../../../devui/vue-devui'
-import Locale from '../../../devui/locale'
-import Theme from '../devui-theme'
-import 'vitepress-theme-demoblock/theme/styles/index.css'
-import { registerComponents } from './register-components.js'
-import { insertBaiduScript } from './insert-baidu-script'
+import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
+import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
+import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker';
+import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker';
+import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker';
+import DevUI from '../../../devui/vue-devui';
+import Locale from '../../../devui/locale';
+import Theme from '../devui-theme';
+import 'vitepress-theme-demoblock/theme/styles/index.css';
+import { registerComponents } from './register-components.js';
+import { insertBaiduScript } from './insert-baidu-script';
+
+if (typeof window !== 'undefined') {
+ self.MonacoEnvironment = {
+ getWorker(_, label) {
+ if (label === 'json') {
+ return new jsonWorker();
+ }
+ if (label === 'css' || label === 'scss' || label === 'less') {
+ return new cssWorker();
+ }
+ if (label === 'html' || label === 'handlebars' || label === 'razor') {
+ return new htmlWorker();
+ }
+ if (label === 'typescript' || label === 'javascript') {
+ return new tsWorker();
+ }
+ return editorWorker();
+ },
+ };
+}
export default {
...Theme,
enhanceApp({ app }) {
- app.use(Locale).use(DevUI)
- registerComponents(app)
- insertBaiduScript()
- }
-}
\ No newline at end of file
+ app.use(Locale).use(DevUI);
+ registerComponents(app);
+ insertBaiduScript();
+ },
+};
diff --git a/packages/devui-vue/docs/components/alert/index.md b/packages/devui-vue/docs/components/alert/index.md
index 6c87c2f62e..048381f8e5 100644
--- a/packages/devui-vue/docs/components/alert/index.md
+++ b/packages/devui-vue/docs/components/alert/index.md
@@ -14,14 +14,19 @@
```vue