fix: 打包问题

This commit is contained in:
wangjiahao 2023-11-13 16:08:09 +08:00
parent e636ead79f
commit 9c452d1cd2
2 changed files with 38 additions and 23 deletions

View File

@ -64,13 +64,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { showTemplateList } from '@/api/template' import { showTemplateList } from '@/api/template'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { computed, reactive, ref } from 'vue' import { computed, reactive, ref, watch } from 'vue'
import { imgUrlTrans } from '@/utils/imgUtils' import { imgUrlTrans } from '@/utils/imgUtils'
import { watch } from 'vue/dist/vue'
import { ElMessage } from 'element-plus-secondary' import { ElMessage } from 'element-plus-secondary'
import { decompression } from '@/api/visualization/dataVisualization' import { decompression } from '@/api/visualization/dataVisualization'
import { deepCopy } from '@/utils/utils'
const { t } = useI18n() const { t } = useI18n()
const emits = defineEmits(['closeEditPanelDialog']) const emits = defineEmits(['finish'])
const files = ref(null) const files = ref(null)
const props = defineProps({ const props = defineProps({
editPanelOut: { editPanelOut: {
@ -92,6 +92,7 @@ const state = reactive({
snapshot: '' snapshot: ''
}, },
dvCreateInfo: { dvCreateInfo: {
pid: -1,
name: null, name: null,
canvasStyleData: null, canvasStyleData: null,
componentData: null, componentData: null,
@ -119,6 +120,11 @@ const classBackground = computed(() => {
watch( watch(
() => state.inputType, () => state.inputType,
val => { val => {
createInit()
}
)
const createInit = () => {
state.templateSelected = false state.templateSelected = false
state.dvCreateInfo.name = null state.dvCreateInfo.name = null
state.dvCreateInfo.canvasStyleData = null state.dvCreateInfo.canvasStyleData = null
@ -126,7 +132,6 @@ watch(
state.importTemplateInfo.snapshot = null state.importTemplateInfo.snapshot = null
state.dvCreateInfo.templateId = null state.dvCreateInfo.templateId = null
} }
)
const showCurrentTemplateInfo = data => { const showCurrentTemplateInfo = data => {
state.dvCreateInfo.templateId = data.id state.dvCreateInfo.templateId = data.id
@ -154,7 +159,7 @@ const getTree = () => {
} }
const cancel = () => { const cancel = () => {
emits('closeEditPanelDialog') emits('finish')
} }
const save = () => { const save = () => {
@ -168,10 +173,7 @@ const save = () => {
return false return false
} }
if ( if (!state.dvCreateInfo.templateId && state.inputType === 'new_inner_template') {
!state.dvCreateInfo.templateId &&
state.inputType === 'new_inner_template'
) {
ElMessage.warning('chart.template_can_not_empty') ElMessage.warning('chart.template_can_not_empty')
return false return false
} }
@ -180,7 +182,7 @@ const save = () => {
decompression(state.dvCreateInfo) decompression(state.dvCreateInfo)
.then(response => { .then(response => {
state.loading = false state.loading = false
emits('closeEditPanelDialog', response.data) emits('finish', response.data)
}) })
.catch(() => { .catch(() => {
state.loading = false state.loading = false
@ -205,11 +207,12 @@ const goFile = () => {
files.value.files.click() files.value.files.click()
} }
const close = () ={ const close = () => {
// do close state.dialogShow = false
} }
const optInit = () =>{ const optInit = param => {
state.dialogShow = true
createInit()
} }
defineExpose({ defineExpose({
@ -217,7 +220,7 @@ defineExpose({
}) })
</script> </script>
<style scoped> <style scoped lang="less">
.root-class { .root-class {
margin: 15px 0px 5px; margin: 15px 0px 5px;
text-align: center; text-align: center;

View File

@ -14,6 +14,7 @@ const interactiveStore = interactiveStoreWithOut()
import router from '@/router' import router from '@/router'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import _ from 'lodash' import _ from 'lodash'
import DeResourceCreateOpt from '@/views/common/DeResourceCreateOpt.vue'
const dvMainStore = dvMainStoreWithOut() const dvMainStore = dvMainStoreWithOut()
const { dvInfo } = storeToRefs(dvMainStore) const { dvInfo } = storeToRefs(dvMainStore)
@ -44,6 +45,7 @@ const filterText = ref(null)
const expandedArray = ref([]) const expandedArray = ref([])
const resourceListTree = ref() const resourceListTree = ref()
const resourceGroupOpt = ref() const resourceGroupOpt = ref()
const resourceCreateOpt = ref()
const returnMounted = ref(false) const returnMounted = ref(false)
const state = reactive({ const state = reactive({
resourceTree: [] as BusiTreeNode[], resourceTree: [] as BusiTreeNode[],
@ -243,7 +245,7 @@ const addOperation = (
} }
} else if (cmd === 'newFromTemplate') { } else if (cmd === 'newFromTemplate') {
// newFromTemplate // newFromTemplate
resourceCreateOpt.value.optInit()
} else { } else {
resourceGroupOpt.value.optInit(nodeType, data || {}, cmd, parentSelect) resourceGroupOpt.value.optInit(nodeType, data || {}, cmd, parentSelect)
} }
@ -262,6 +264,10 @@ const resourceOptFinish = () => {
getTree() getTree()
} }
const resourceCreateFinish = () => {
// do create
}
const getParentKeys = (tree, targetKey, parentKeys = []) => { const getParentKeys = (tree, targetKey, parentKeys = []) => {
for (const node of tree) { for (const node of tree) {
if (node.id === targetKey) { if (node.id === targetKey) {
@ -402,6 +408,12 @@ defineExpose({
@finish="resourceOptFinish" @finish="resourceOptFinish"
ref="resourceGroupOpt" ref="resourceGroupOpt"
/> />
<de-resource-create-opt
:cur-canvas-type="curCanvasType"
ref="resourceCreateOpt"
@finish="resourceCreateFinish"
>
</de-resource-create-opt>
</el-scrollbar> </el-scrollbar>
</div> </div>
</template> </template>