@ebiz/designer-components 0.1.110 → 0.1.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.1.110",
+  "version": "0.1.112",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/components/EbizApprovalDetail.vue

@@ -5,12 +5,10 @@
             <!-- 区块详情 -->
             <div class="block-detail">
                 <slot name="block"></slot>
+                <ebiz-s-approval-process ref="approvalprocessRef" :businessKey="businessKey" :type="type"></ebiz-s-approval-process>
             </div>
             <!-- 审批区域 -->
             <div class="approval-area">
-                <ebiz-s-approval-process ref="approvalprocessRef" :businessKey="businessKey"
-                    :type="type"></ebiz-s-approval-process>
-
                 <ebiz-approval-form v-if="isAssignee" :taskId="currTask.id" :businessKey="businessKey"
                     :taskDefinitionKey="currTask.taskDefinitionKey" :approvalDetail="approvalDetail" @pass="refresh"
                     @reject="refresh" @refresh="refresh"></ebiz-approval-form>
@@ -36,6 +34,8 @@ const props = defineProps({
     }
 })
 
+const emit = defineEmits(['loaded'])
+
 // 审批流程组件实例
 const approvalprocessRef = ref(null)
 
@@ -51,9 +51,13 @@ const currTask = ref({})
 // 是否为当前任务的审批人
 const isAssignee = ref(false)
 
+// 加载状态
+const isLoading = ref(false)
+
 // 获取审批详情
 const getApprovalDetail = () => {
     loading(true)
+    isLoading.value = true
     dataService.fetch(
         {
             businessKey: props.businessKey,
@@ -72,8 +76,13 @@ const getApprovalDetail = () => {
             isAssignee.value = false
         }
         loading(false)
+        isLoading.value = false
+        emit('loaded', res)
     }).catch((err) => {
         message.error(err.message)
+        loading(false)
+        isLoading.value = false
+        emit('loaded', err)
     })
 }
 
@@ -96,6 +105,13 @@ const refresh = () => {
 onMounted(() => {
     init()
 })
+
+defineExpose({
+    refresh,
+    currTask,
+    isLoading,
+    isAssignee
+})
 </script>
 
 <style lang='less' scoped>
@@ -118,7 +134,7 @@ onMounted(() => {
 .detail-container {
     position: relative;
     display: flex;
-    width: 1000px;
+    width: 900px;
     padding: 60px 12px;
     background-color: #ffffff;
     border-radius: 4px;

package/src/components/EbizApprovalForm.vue

@@ -29,7 +29,7 @@
               </t-button>
             </t-dropdown>
           </div>
-          <div>
+          <div style="display: flex;">
             <t-button theme="primary" type="submit" content="通过" @click="handlePass">
               <template #icon>
                 <t-icon name="check" size="large" class="component-base-style"></t-icon>

package/src/components/EbizSApprovalProcess.vue

@@ -13,11 +13,6 @@
 
                 <!-- 流程基本信息 -->
                 <div v-if="state.processInfo" class="process-info">
-                    <div class="info-item" v-if="getStartUserInfo().userId">
-                        <span class="label">发起人：</span>
-                        <user-info :userId="getStartUserInfo().userId" :userInfo="getStartUserInfo().userInfo"
-                            avatar-size="small" name-size="small" :show-job-number="true" :show-department="false" />
-                    </div>
                     <div class="info-item">
                         <span class="label">发起时间：</span>
                         <span>{{ state.processInfo.startTimeStr || '--' }}</span>
@@ -166,7 +161,7 @@
                 <div class="card">
                     <div class="card-header">
                         <span class="title">备注 <span v-if="state.remarks.length > 0">({{ state.remarks.length
-                        }})</span></span>
+                                }})</span></span>
                         <div class="card-actions">
                             <t-button variant="text" @click="showAddRemarkDialog">添加备注</t-button>
                         </div>

package/src/components/EbizTreeSelector.vue

@@ -67,7 +67,8 @@
               <span class="selected-label">{{ item.label }}</span>
               <t-icon name="close-circle" class="remove-icon" @click="removePreviewItem(item)" />
             </div>
-            <div v-if="[...selectPreview, ...selectPreviewPost, ...selectPreviewUser].length === 0" class="no-selection">
+            <div v-if="[...selectPreview, ...selectPreviewPost, ...selectPreviewUser].length === 0"
+              class="no-selection">
               <t-icon name="info-circle" />
               <span style="user-select: none">请在左侧选择部门或成员</span>
             </div>
@@ -148,13 +149,18 @@ const postTree = ref()
 const fetchApiData = async () => {
   loading.value = true
   try {
+    // 加载部门
     dataService.fetch(
       { keyWord: activeTab.value === 'organization' ? searchText.value : '' },
       {},
       '/appdata/execute/plugin?key=organizational_structure'
     ).then(res => {
       organizationData.value = res || []
+      checkedNodes.value = props.modelValue.filter(i => i.type === 'DEPT').map((item) => item.bindid);
+      console.log("checkedNodes: {}", checkedNodes)
     })
+
+    // 加载用户
     dataService.fetch(
       { postEnable: true, keyWord: activeTab.value === 'employee' ? searchText.value : '' },
       {},
@@ -165,7 +171,10 @@ const fetchApiData = async () => {
         bindid: i.id,
         type: 'employee'
       }));
+      checkedUserNodes.value = props.modelValue.filter(i => i.type === 'employee').map((item) => item.bindid);
     })
+
+    // 加载岗位
     dataService.fetch({
       apiKey: 'all_active_post',
       queryParams: {
@@ -179,6 +188,7 @@ const fetchApiData = async () => {
         bindid: i.id,
         type: 'GW'
       }))
+      checkedPostNodes.value = props.modelValue.filter(i => i.type === 'GW').map(item => item.bindid);
     })
     console.log(postData.value)
   } catch (error) {
@@ -203,9 +213,9 @@ function showDialog() {
   // 获取API数据
   fetchApiData()
   // 重置选中的节点
-  checkedNodes.value = props.modelValue.filter(i => i.type === 'DEPT').map((item) => item.bindid);
-  checkedUserNodes.value = props.modelValue.filter(i => i.type === 'employee').map((item) => item.bindid);
-  checkedPostNodes.value = props.modelValue.filter(i => i.type === 'GW').map(item => item.bindid);
+  // checkedNodes.value = props.modelValue.filter(i => i.type === 'DEPT').map((item) => item.bindid);
+  // checkedUserNodes.value = props.modelValue.filter(i => i.type === 'employee').map((item) => item.bindid);
+  // checkedPostNodes.value = props.modelValue.filter(i => i.type === 'GW').map(item => item.bindid);
   dialogVisible.value = true
 }
 
@@ -262,16 +272,21 @@ watch(
   checkedNodes,
   (newValues) => {
     if (!organizationTree.value?.treeRef) return
-    selectPreview.value = (newValues.map(organizationTree.value.treeRef.getItem) ?? []).map((i) => ({
-      label: i?.label,
-      type: i?.data?.type || i?.type,
-      bindid: i?.value
-    }))
+    console.log("部门选择变化", organizationTree.value.treeRef.getItem, newValues)
+    setTimeout(() => {
+      selectPreview.value = (newValues.map(organizationTree.value.treeRef.getItem) ?? []).map((i) => ({
+        label: i?.label,
+        type: i?.data?.type || i?.type,
+        bindid: i?.value
+      }))
+    }, 200)
+
   },
   { deep: true }
 )
 watch(checkedUserNodes, nVal => {
   // 获取新选中的用户数据
+  console.log("用户选择变化")
   const newSelectedUsers = employeeData.value.filter(i => nVal.includes(i.bindid))
   // 获取现有用户的bindid列表，避免重复添加
   const existingBindIds = selectPreviewUser.value.map(user => user.bindid)
@@ -281,6 +296,7 @@ watch(checkedUserNodes, nVal => {
   selectPreviewUser.value = [...selectPreviewUser.value, ...usersToAdd]
 }, { deep: true })
 watch(checkedPostNodes, nVal => {
+  console.log("岗位选择变化")
   selectPreviewPost.value = postData.value.filter(i => nVal.includes(i.bindid))
 }, { deep: true })
 // 监听modelValue变化，同步到选中节点