master
张同海 10 months ago
parent bfd4793bd5
commit 867d62cef1

@ -15,7 +15,7 @@ import { configVisualizerConfig } from './visualizer'
import { configThemePlugin } from './theme'
import { configImageminPlugin } from './imagemin'
import { configSvgIconsPlugin } from './svgSprite'
import topLevelAwait from 'vite-plugin-top-level-await'
export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
const {
VITE_USE_IMAGEMIN,
@ -35,6 +35,12 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
VitePluginCertificate({
source: 'coding',
}),
topLevelAwait({
// The export name of top-level await promise for each chunk module
promiseExportName: '__tla',
// The function to generate import names of top-level await promise in each chunk module
promiseImportName: i => `__tla_${i}`
})
]
// vite-plugin-windicss

@ -80,12 +80,12 @@
"devDependencies": {
"@commitlint/cli": "^16.2.3",
"@commitlint/config-conventional": "^16.2.1",
"@iconify/json": "^2.1.30",
"@iconify-json/ep": "^1.1.12",
"@types/file-saver": "^2.0.5",
"@iconify/json": "^2.1.30",
"@purge-icons/generated": "^0.8.1",
"@types/codemirror": "^5.60.5",
"@types/crypto-js": "^4.1.1",
"@types/file-saver": "^2.0.5",
"@types/fs-extra": "^9.0.13",
"@types/inquirer": "^8.2.1",
"@types/intro.js": "^3.0.2",
@ -150,10 +150,11 @@
"vite-plugin-style-import": "^2.0.0",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-theme": "^0.8.6",
"vite-plugin-top-level-await": "^1.4.1",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vite-plugin-windicss": "^1.8.4",
"vue-eslint-parser": "^8.3.0",
"vite-ssg": "^0.23.1",
"vue-eslint-parser": "^8.3.0",
"vue-tsc": "^1.8.11"
},
"resolutions": {

@ -11,7 +11,7 @@
</BasicModal>
</template>
<script lang="ts" setup>
import { feeTypecolumns } from '/@/views/baseinfo/goodsaudit/columns'
// import { feeTypecolumns } from '/@/views/baseinfo/goodsaudit/columns'
const emit = defineEmits(['success', 'register'])
import { BasicModal, useModalInner } from '/@/components/Modal'
@ -62,7 +62,7 @@
// console.log(postParam);
return postParam
},
columns: feeTypecolumns,
// columns: feeTypecolumns,
formConfig: {
labelWidth: 120,
schemas: [

@ -27,7 +27,6 @@
watch(
() => props.ApiData,
() => {
console.log('watch watchwatchwatchwatchwatchwatchwatchwatchwatchwatch')
localStorage.setItem('previousId', props.ApiData.previousId)
initData()
},

@ -8,7 +8,7 @@
useFormSize,
} from 'element-plus'
import { FlowNode, ErrorInfo } from './index'
import { type Component, computed, inject, nextTick, ref } from 'vue'
import { type Component, computed, inject, nextTick, ref, onUnmounted } from 'vue'
import {
List,
Stamp,
@ -63,7 +63,6 @@
delNode: (node: FlowNode) => void
openPenal: (node: FlowNode) => void
}>('nodeHooks')!
const previousId = localStorage.getItem('previousId')
const onOpenPenal = () => {
if ($props.readOnly) return
openPenal(node.value)
@ -81,7 +80,7 @@
}
}
const tooltiptext = ref('')
const disabled = ref(true)
const visible = ref(false)
const Rdata = (taged) => {
let data = ''
switch (taged) {
@ -106,34 +105,46 @@
}
return data
}
if (previousId == node.value.id) {
console.log(node.value, 11111)
disabled.value = false
node.value.setInfo
tooltiptext.value = `
onUnmounted(() => {
localStorage.setItem('previousId', '')
})
const previousId = ref('')
setTimeout(() => {
previousId.value = localStorage.getItem('previousId')
if (previousId.value == node.value.id) {
visible.value = true
tooltiptext.value = `
<p>处理人${node.value.setInfo.userName}</p>
<p>结果${Rdata(node.value.setInfo.taged)}</p>
<p>处理时间${node.value.setInfo.tagedTime}</p>
<p>备注${node.value.setInfo.description}</p>
`
}
}
}, 500)
</script>
<template>
<div class="node-box">
<!-- @click="onOpenPenal()" -->
<el-tooltip
class="item"
effect="dark"
:content="tooltiptext"
placement="right"
:disabled="disabled"
:visible="visible"
raw-content
>
<el-card
shadow="always"
@click="onOpenPenal()"
:class="['node', { 'error-node': $props.errorInfo.showError }]"
:class="[
'node',
{ 'error-node': $props.errorInfo.showError },
previousId == node.id ? 'CurrentType' : '',
]"
>
<el-tooltip placement="top-start">
<template #content>
@ -246,9 +257,9 @@
}
&:hover {
&:not(.error-node) {
box-shadow: 0 0 5px 0 var(--el-color-primary);
}
// &:not(.error-node) {
// box-shadow: 0 0 5px 0 var(--el-color-primary);
// }
.node-close {
display: block;
@ -275,7 +286,9 @@
}
}
}
.CurrentType {
box-shadow: 0 0 5px 0 var(--el-color-primary);
}
.arrow {
/* &:before{
content: '';

@ -38,7 +38,13 @@
</script>
<template>
<el-drawer v-model="visible" size="35%">
<el-drawer
v-model="visible"
size="35%"
:append-to-body="true"
:modal-append-to-body="false"
z-index="2003"
>
<template #header="{ titleId, titleClass }">
<span :id="titleId" :class="titleClass">
<el-input

@ -7,6 +7,7 @@
width="80%"
:minHeight="500"
@cancel="BasicModalCancel"
destroy-on-close
>
<!-- @ok="handleSave" -->
<!-- <div class="step-form-form">

Loading…
Cancel
Save