Merge branch 'master' of https://gitee.com/meibe/yudao-ui-admin-vue3

src/components/XTable/src/XTable.vue

@@ -13,7 +13,6 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { XTableProps } from './type'
 import { isBoolean, isFunction } from '@/utils/is'
 import styleCss from './style/dark.scss'
-
 import download from '@/utils/download'
 
 const { t } = useI18n()
@@ -26,14 +25,13 @@ const prefixCls = getPrefixCls('x-vxe-table')
 
 const attrs = useAttrs()
 const emit = defineEmits(['register'])
-
 const removeStyles = () => {
-  var filename = 'cssTheme'
+  const filename = 'cssTheme'
   //移除引入的文件名
-  var targetelement = 'style'
-  var targetattr = 'id'
-  var allsuspects = document.getElementsByTagName(targetelement)
-  for (var i = allsuspects.length; i >= 0; i--) {
+  const targetelement = 'style'
+  const targetattr = 'id'
+  let allsuspects = document.getElementsByTagName(targetelement)
+  for (let i = allsuspects.length; i >= 0; i--) {
     if (
       allsuspects[i] &&
       allsuspects[i].getAttribute(targetattr) != null &&
@@ -45,13 +43,12 @@ const removeStyles = () => {
   }
 }
 const reImport = () => {
-  var head = document.getElementsByTagName('head')[0]
-  var style = document.createElement('style')
+  let head = document.getElementsByTagName('head')[0]
+  let style = document.createElement('style')
   style.innerText = styleCss
   style.id = 'cssTheme'
   head.appendChild(style)
 }
-
 watch(
   () => appStore.getIsDark,
   () => {

src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue

@@ -80,7 +80,8 @@ const resetFlowCondition = () => {
   if (
     bpmnElementSourceRef.value &&
     bpmnElementSourceRef.value.default &&
-    bpmnElementSourceRef.value.default.id === bpmnElement.value.id
+    bpmnElementSourceRef.value.default.id === bpmnElement.value.id &&
+    flowConditionForm.value.type == 'default'
   ) {
     // 默认
     flowConditionForm.value = { type: 'default' }
@@ -176,11 +177,13 @@ onBeforeUnmount(() => {
 watch(
   () => props.businessObject,
   (val) => {
-    if (val) {
-      nextTick(() => {
-        resetFlowCondition()
-      })
-    }
+    console.log(val, 'val')
+    nextTick(() => {
+      resetFlowCondition()
+    })
+  },
+  {
+    immediate: true
   }
 )
 </script>