From d030d84a308cc11217c844bec9cac0aaea95a3c6 Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Fri, 16 Aug 2024 18:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MultiItemBox/index.vue              | 10 +++++-----
 .../src/online/components/OnlineCustomWidget.vue       |  6 +-----
 .../src/pages/workflow/flowEntry/formEditFlowEntry.vue |  1 +
 .../workflow/flowEntry/formPublishedFlowEntry.vue      |  7 ++-----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/OrangeFormsOpen-VUE3/src/components/MultiItemBox/index.vue b/OrangeFormsOpen-VUE3/src/components/MultiItemBox/index.vue
index 20179a73..bcc50600 100644
--- a/OrangeFormsOpen-VUE3/src/components/MultiItemBox/index.vue
+++ b/OrangeFormsOpen-VUE3/src/components/MultiItemBox/index.vue
@@ -23,7 +23,7 @@
             </el-link>
             <div class="right">
               <slot name="right" :data="item" />
-              <el-icon><Close /></el-icon>
+              <el-icon @click="onDeleteItem(item)" style="cursor: pointer"><Close /></el-icon>
             </div>
           </el-row>
         </template>
@@ -138,10 +138,10 @@ const onEditItem = (item: ANY_OBJECT | null) => {
     emit('edit', item);
   }
 };
-// const onDeleteItem = (item: ANY_OBJECT) => {
-//   if (props.disabled) return;
-//   emit('delete', item);
-// };
+const onDeleteItem = (item: ANY_OBJECT) => {
+  if (props.disabled) return;
+  emit('delete', item);
+};
 </script>
 
 <style scoped>
diff --git a/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue b/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue
index bbbc8301..7ba70b5f 100644
--- a/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue
+++ b/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue
@@ -12,7 +12,7 @@
     :change="onValueChange"
     @widgetClick="onWidgetClick"
   >
-    <template v-if="form().mode === 'pc'" v-slot="scope">
+    <template v-if="form().mode === 'pc' && widget.widgetType !== SysCustomWidgetType.Cascader" v-slot="scope">
       <template v-if="widget.widgetType === SysCustomWidgetType.Radio">
         <el-radio v-for="item in getAllDropdownData" :key="item.id" :value="item.id">
           {{ item.name }}
@@ -98,10 +98,7 @@ interface IProps extends WidgetProps {
 }
 const pps = withDefaults(defineProps<IProps>(), {});
 
-console.log('widget pps', pps);
-
 const form = inject('form', () => {
-  console.error('OnlineCustomWidget: form not injected');
   return { isEdit: false } as ANY_OBJECT;
 });
 const parentWidget = inject<ANY_OBJECT | null>('parentWidget', null);
@@ -430,7 +427,6 @@ const onValueChange = (
     dictData: dictData,
     selectRow: selectRow,
   });
-  onValueInput(tempVal);
 };
 
 const loadDropdownData = () => {
diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formEditFlowEntry.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formEditFlowEntry.vue
index c5febb38..49a51957 100644
--- a/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formEditFlowEntry.vue
+++ b/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formEditFlowEntry.vue
@@ -899,6 +899,7 @@ const onBindFormTypeChange = () => {
 // 流程绑定表单页面改变
 const onEntryPageChange = () => {
   formFlowEntryData.value.defaultFormId = undefined;
+  defaultFormIdWidget.setDirty(true);
   entryDatasource = null;
 };
 const getFormShareInfo = (form: ANY_OBJECT) => {
diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formPublishedFlowEntry.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formPublishedFlowEntry.vue
index 543b36f7..3137d3a9 100644
--- a/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formPublishedFlowEntry.vue
+++ b/OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formPublishedFlowEntry.vue
@@ -130,19 +130,16 @@ interface IProps extends ThirdProps {
   dialog?: DialogProp<ANY_OBJECT>;
 }
 const props = withDefaults(defineProps<IProps>(), {
-  flowEntry: () => {
-    return {};
-  },
+  flowEntry: undefined,
 });
 const { thirdParams } = useThirdParty(props);
 const formItemSize = computed(() => {
   return layoutStore.defaultFormItemSize || thirdParams.value.defaultFormItemSize?.value;
 });
-
 const entryXml = ref<string>();
 const dialogParams = computed(() => {
   return {
-    flowEntry: props.flowEntry || thirdParams.value.flowEntry,
+    flowEntry: props.flowEntry || thirdParams.value.flowEntry || {},
   };
 });
 /**