@ebiz/designer-components 0.1.22 → 0.1.24

package/package.json

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

package/src/components/EbizApproval.vue

@@ -20,9 +20,8 @@
                   {{ getAvatarText(approver.name) }}
                 </t-avatar>
                 <div class="user-info" :class="{ 'no-delete': required && approvers.length <= 1 }">
-                  <span class="approver-name">{{ approver.name }}</span>
-                  <t-icon v-if="!required || approvers.length > 1" name="close" size="16px"
-                    @click="removeEmployee(approver, 'approver')" />
+                  <span class="approver-name">{{ approver.no }} - {{ approver.name }}</span>
+                  <t-icon name="close" size="16px" @click="removeEmployee(approver, 'approver')" />
                 </div>
               </div>
               <t-icon v-if="index < approvers.length - 1" name="chevron-right" class="arrow-icon" />
@@ -204,12 +203,12 @@ const fetchEmployeeList = async () => {
 // 处理审批人选择
 const handleApproverSelect = (data: []) => {
   console.log(data, 195)
-  if (!data[0]) return;
-  if (selectedApprover.value.includes(data[0])) {
-    let index = selectedApprover.value.indexOf(data[0]);
+
+  if (selectedApprover.value.includes(data)) {
+    let index = selectedApprover.value.indexOf(data);
     selectedApprover.value.splice(index, 1);
   };
-  selectedApprover.value = [...selectedApprover.value, data[0]];
+  selectedApprover.value = [...selectedApprover.value, data];
   console.log(selectedApprover.value, 200)
   tempApprover.value = [];
 }
@@ -222,9 +221,6 @@ const handleCCSelect = (data: []) => {
 // 移除人员
 const removeEmployee = (employee: Employee, type: 'approver' | 'cc') => {
   if (type === 'approver') {
-    if (props.required && props.approverList.length <= 1) {
-      return
-    }
     const newList = props.approverList.filter(id => id !== employee.id);
     selectedApprover.value = newList;
   } else {

package/src/components/EbizEmployeeSelector.vue

@@ -520,6 +520,9 @@ const fetchEmployeesByIds = async (ids) => {
     selectedItems.value = [];
     return;
   }
+  if (props.single) {
+    ids = [ids];
+  }
 
   loading.value = true;
   try {
@@ -692,9 +695,17 @@ const showDialog = () => {
 const handleConfirm = () => {
   const selectedEmployeeIds = tempSelectedEmployees.value.map(item => item.id);
 
-  emit('update:modelValue', selectedEmployeeIds);
-  emit('change', selectedEmployeeIds);
-  emit('confirm', selectedEmployeeIds);
+  if (props.single) {
+    emit('update:modelValue', selectedEmployeeIds[0]);
+    emit('change', selectedEmployeeIds[0]);
+    emit('confirm', selectedEmployeeIds[0]);
+  } else {
+    emit('update:modelValue', selectedEmployeeIds);
+    emit('change', selectedEmployeeIds);
+    emit('confirm', selectedEmployeeIds);
+
+  }
+
   dialogVisible.value = false;
 };
 

package/src/components/EbizSApprovalProcess.vue

@@ -374,7 +374,7 @@ const getProcessStatusTheme = (status) => {
 const getProcessStatusText = (status) => {
     const statusMap = {
         'CANCELED': '已取消',
-        'REJECTED': '已拒绝',
+        'REJECTED': '已驳回',
         'APPROVED': "已通过",
         'ACTIVE': '进行中',
         'COMPLETED': '已完成',

package/src/components/TdesignUpload.vue

@@ -252,6 +252,10 @@ const computedHeaders = computed(() => {
 // 当前上传进度
 const computedModelValue = computed({
     get() {
+        console.log("props.modelValue", props.modelValue)
+        if (props.modelValue == null || props.modelValue == "" || props.modelValue.length == 0) {
+            return [];
+        }
         if (props.modelValue instanceof Array) {
             return props.modelValue.map(file => {
                 // 从文件路径获取文件名
@@ -271,12 +275,12 @@ const computedModelValue = computed({
                 }
             ]
         } else {
-            return []
+            return [props.modelValue]
         }
     },
     set(value) {
         const files = [];
-        for( const fileItem of value ){
+        for (const fileItem of value) {
             files.push({
                 url: fileItem.url,
                 name: fileItem.name,