diff --git a/src/components/earthMap/components/Window.vue b/src/components/earthMap/components/Window.vue index 9bdb006..5542627 100644 --- a/src/components/earthMap/components/Window.vue +++ b/src/components/earthMap/components/Window.vue @@ -46,7 +46,7 @@ export default defineComponent({ type: Boolean, default: true, }, - showcloseButton:{ + showcloseButton: { type: Boolean, default: true, }, @@ -90,8 +90,15 @@ export default defineComponent({ type: Function, default: null, }, + /** + * @description 是否展开 + */ + expand: { + type: Boolean, + default: true + } }, - emits:['cancel','ok','contextMenu','showclick'], + emits: ['cancel', 'ok', 'contextMenu', 'showclick'], setup(props, ctx) { const { proxy }: any = getCurrentInstance(); let langs = ref({ @@ -104,7 +111,8 @@ export default defineComponent({ cancel: "Cancel" } }) - let collapsed = ref(false); + // let collapsed = ref(false); + let collapsed = ref(!props.expand); //初始化展开状态 let width_ = ref(0); let height_ = ref(0); let left_ = ref(0); @@ -128,8 +136,19 @@ export default defineComponent({ return props.confirmtext; }); + watch( + () => props.expand, + (value) => { + // 监听父组件展开状态 + // console.log(value); + collapsed.value = !value; + } + ); + + onMounted(() => { + // console.log("props",props) // console.log(earth.czm.viewer.container) // console.log("window.$uia", window.$uia); // console.log("window.", window); @@ -278,7 +297,7 @@ export default defineComponent({ } // console.log('w',w); // console.log('h',h); - + updateStyle(); } @@ -299,7 +318,7 @@ export default defineComponent({ document.addEventListener("mouseup", up); } - + return { contextMenu, updateStyle, diff --git a/src/components/earthMap/toolbar/AddModelWin.vue b/src/components/earthMap/toolbar/AddModelWin.vue index ff825dd..c658121 100644 --- a/src/components/earthMap/toolbar/AddModelWin.vue +++ b/src/components/earthMap/toolbar/AddModelWin.vue @@ -1,7 +1,7 @@