@ebiz/designer-components 0.1.81 → 0.1.83

package/package.json

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

package/src/components/EbizDictionarySelect.vue

@@ -195,29 +195,30 @@ const handleChange = (value, context) => {
 
 // 组件挂载时，如果有默认值则加载对应的选项
 onMounted(async () => {
-    if (apiConfig.value.apiId && apiConfig.value.apiType >= 0) {
-        loading.value = true;
-        try {
-            const params = {
-                queryParams: queryParams.value
-            };
-            const res = await dataService.fetch(params, {
-                "key": "query_dictionary_option",
-                "apiId": 2978,
-                "apiType": 0
-            });
-            const { labelField, valueField } = props.optionsConfig;
-
-            options.value = res.data.at(0).vlaue.map(item => ({
-                ...item,
-                label: labelField ? item[labelField] : (item.label || item.name),
-                value: valueField ? item[valueField] : (item.value || item.id)
-            }));
-        } catch (error) {
-            console.error('加载默认选项失败:', error);
-        } finally {
-            loading.value = false;
-        }
+    loading.value = true;
+    try {
+        const params = {
+            queryParams: {
+                ...queryParams.value,
+                dictionaryKey: props.dictionaryKey
+            }
+        };
+        const res = await dataService.fetch(params, {
+            "key": "query_dictionary_option",
+            "apiId": 2978,
+            "apiType": 0
+        });
+        const { labelField, valueField } = props.optionsConfig;
+
+        options.value = res.data.at(0).value.map(item => ({
+            ...item,
+            label: labelField ? item[labelField] : (item.label || item.name),
+            value: valueField ? item[valueField] : (item.value || item.id)
+        }));
+    } catch (error) {
+        console.error('加载默认选项失败:', error);
+    } finally {
+        loading.value = false;
     }
 });
 </script>

package/src/components/EbizPageHeader.vue

@@ -62,13 +62,16 @@ const goToHelp = () => {
 }
 
 // 监听路由变化
-watch(() => route.path, () => {
-  generateBreadcrumb()
-}, { immediate: true })
+if (route) {
+  watch(() => route.path, () => {
+    generateBreadcrumb()
+  }, { immediate: true })
+
+  onMounted(() => {
+    generateBreadcrumb()
+  })
+}
 
-onMounted(() => {
-  generateBreadcrumb()
-})
 </script>
 
 <style scoped>
@@ -93,4 +96,4 @@ onMounted(() => {
 .help-doc span {
   margin-left: 4px;
 }
-</style> 
+</style>

package/src/components/EbizTreeSelector.vue

@@ -25,11 +25,9 @@
 
             <!-- 选项卡 -->
             <t-tabs v-model="activeTab" class="selector-tabs">
-              <t-tab-panel value="organization" label="组织架构" :destroyOnHide="false">
-
-              </t-tab-panel>
+              <t-tab-panel value="organization" label="组织架构"></t-tab-panel>
               <!-- <t-tab-panel value="department" label="部门"></t-tab-panel> -->
-              <!-- <t-tab-panel value="position" label="岗位"></t-tab-panel> -->
+               <t-tab-panel value="GW" label="岗位"></t-tab-panel>
               <t-tab-panel value="employee" label="员工"></t-tab-panel>
             </t-tabs>
 
@@ -47,14 +45,16 @@
               :items="filteredData."
               v-model="checkedNodes"
               :disable-check="disableCheck"
-            />
+            /> -->
             <EbizTree
-              v-else-if="activeTab === 'position'"
+              ref="postTree"
+              v-show="activeTab === 'GW'"
               checkable
-              :items="filteredData.position"
-              v-model="checkedNodes"
+              :items="postData"
+              :keys="{ label: 'label', value: 'bindid', children: 'childs' }"
+              v-model="checkedPostNodes"
               :disable-check="disableCheck"
-            /> -->
+            />
               <EbizTree ref="employeeTree" v-show="activeTab === 'employee'" checkable :items="employeeData"
                 :keys="{ label: 'label', value: 'bindid', children: 'childs' }" v-model="checkedUserNodes"
                 :disable-check="disableCheck" />
@@ -64,15 +64,15 @@
           <!-- 右侧已选区域 -->
           <div class="right-panel">
             <div class="selected-title">已选择的部门、成员</div>
-            <div class="selected-count">共 {{ [...selectPreview, ...selectPreviewUser].length }} 项</div>
+            <div class="selected-count">共 {{ [...selectPreview, ...selectPreviewPost,...selectPreviewUser].length }} 项</div>
             <div class="selected-list">
-              <div v-for="(item, index) in [...selectPreview,...selectPreviewUser]" :key="index"
+              <div v-for="(item, index) in [...selectPreview,...selectPreviewPost,...selectPreviewUser]" :key="index"
                 class="selected-list-item">
                 <t-icon :name="getIconForType(item)" class="item-icon" />
                 <span class="selected-label">{{ item.label }}</span>
                 <t-icon name="close-circle" class="remove-icon" @click="removePreviewItem(item)" />
               </div>
-              <div v-if="[...selectPreview, ...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>
@@ -129,6 +129,7 @@ const searchText = ref('')
 // 选中的节点
 const checkedNodes = ref([])
 const  checkedUserNodes = ref([]);
+const checkedPostNodes = ref([])
 // 展开的节点
 const expandedNodes = ref([])
 // 当前活动的选项卡
@@ -136,32 +137,55 @@ const activeTab = ref('organization')
 // 弹窗内预览的选中项
 const selectPreview = ref([])
 const selectPreviewUser = ref([])
+const selectPreviewPost = ref([])
 // 加载状态
 const loading = ref(false)
 // API返回的数据
 const organizationData = ref([])
 const employeeData = ref([])
+const postData = ref([]);
+
 const organizationTree = ref()
 const employeeTree = ref()
+const postTree = ref()
 
 // 获取API数据
 const fetchApiData = async () => {
   loading.value = true
   try {
-    organizationData.value = await dataService.fetch(
+     dataService.fetch(
       { keyWord: activeTab.value === 'organization' ? searchText.value : '' },
       {},
       '/appdata/execute/plugin?key=organizational_structure'
-    )
-    employeeData.value = (await dataService.fetch(
+    ).then(res=>{
+       organizationData.value = res || []
+    })
+     dataService.fetch(
       {postEnable:true, keyWord:activeTab.value === 'employee' ? searchText.value : ''},
       {},
       "/appdata/execute/plugin?key=all_active_employesse"
-    )).map(i=>({
-      label:i.name,
-      bindid:i.id,
-      type:'employee'
-    }))
+    ).then(res=>{
+      employeeData.value = (res || []).map(i=>({
+        label:i.name,
+        bindid:i.id,
+        type:'employee'
+      }));
+    })
+    dataService.fetch({
+      apiKey:'all_active_post',
+      queryParams:{
+       name:searchText.value,
+       status:true
+     }
+    },{
+    },'/appdata/process?key=all_active_post').then(res=>{
+      postData.value = (res?.data || []).map(i=>({
+        label:i.name,
+        bindid:i.id,
+        type:'GW'
+      }))
+    })
+    console.log(postData.value)
   } catch (error) {
   } finally {
     loading.value = false
@@ -176,7 +200,7 @@ const getIconForType = (item) => {
     GW: 'user-list',
     employee: 'user'
   }
-  return iconMap[item.type] || 'user'
+  return iconMap[item?.type] || 'user'
 }
 
 // 显示对话框
@@ -184,8 +208,9 @@ function showDialog() {
   // 获取API数据
   fetchApiData()
   // 重置选中的节点
-  checkedNodes.value = props.modelValue.filter(i => i.type !== 'employee').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
 }
 
@@ -195,11 +220,10 @@ function handleConfirm() {
     label: item.label,
     bindid: item.bindid,
     type: item.type
-  })), ...selectPreviewUser.value];
-  emit(
-    'update:modelValue', finalValue
-  )
+  })), ...selectPreviewUser.value,...selectPreviewPost.value];
+  emit('update:modelValue', finalValue)
   emit('change', finalValue)
+  console.log(finalValue)
   dialogVisible.value = false
 }
 
@@ -210,18 +234,24 @@ function handleCancel() {
 
 // 移除已选择预览中的项目
 function removePreviewItem(item) {
-  const isUser = item.type == 'employee';
-  if(isUser){
-    let index = selectPreviewUser.value.findIndex(i=>i.bindid === item.bindid);
-    const removedUser = selectPreviewUser.value[index];
-    selectPreviewUser.value.splice(index,1);
-    checkedUserNodes.value = checkedUserNodes.value.filter((value) => value !== removedUser.bindid)
-    return
-  }
-  let index = selectPreview.value.findIndex(i => i.bindid === item.bindid);
-  const removedItem = selectPreview.value[index];
-  selectPreview.value.splice(index, 1)
-  checkedNodes.value = checkedNodes.value.filter((value) => value !== removedItem.bindid)
+  let {selects,nodes} = {
+    'DEPT':{
+      selects:selectPreview.value,
+      nodes:checkedNodes.value
+    },
+    'GW':{
+      selects:selectPreviewPost.value,
+      nodes:checkedPostNodes.value
+    },
+    'employee':{
+      selects:selectPreviewUser.value,
+      nodes:checkedUserNodes.value
+    }
+  }[item.type]
+    let index = selects.value.findIndex(i=>i.bindid === item.bindid);
+    const removedUser = selects.value[index];
+    selects.value.splice(index,1);
+    nodes.value = nodes.value.filter((value) => value !== removedUser.bindid)
 }
 
 // 移除选中项
@@ -248,13 +278,16 @@ watch(
 watch(checkedUserNodes,nVal=>{
   selectPreviewUser.value = employeeData.value.filter(i=>nVal.includes(i.bindid))
 },{deep:true})
+watch(checkedPostNodes,nVal=>{
+  selectPreviewPost.value = postData.value.filter(i=>nVal.includes(i.bindid))
+},{deep:true})
 // 监听modelValue变化，同步到选中节点
 watch(
   () => props.modelValue,
   (newValue) => {
-    checkedNodes.value = newValue.filter(i=>i.type!=='employee').map((item) => item.bindid);
+    checkedNodes.value = newValue.filter(i=>i.type === 'DEPT').map((item) => item.bindid);
     checkedUserNodes.value = newValue.filter(i => i.type === 'employee').map((item) => item.bindid);
-    console.log(newValue,checkedUserNodes.value,267)
+    checkedPostNodes.value = newValue.filter(i=>i.type === 'GW').map(item=>item.bindid);
   },
   { deep: true ,immediate:true}
 )

package/src/components/senior/EbizSForm/item.vue

@@ -169,7 +169,7 @@
                         </div>
 
                         <!-- 表格 -->
-                        <t-table :data="computedModelValue" :columns="computedTableColumns" :pagination="false"
+                        <t-table :data="computedModelValue" :columns="computedTableColumns"
                             row-key="__id" size="small" bordered :empty="'暂无数据'">
                             <!-- 序号列 -->
                             <template #index="{ rowIndex }">
@@ -192,12 +192,18 @@
                                     @update:model-value="(value) => updateTableCell(rowIndex, col.key, value)" />
 
                                 <!-- 选择器 -->
-                                <t-select v-else-if="col.type === 'select'" v-model="row[col.key]" :disabled="disabled"
+                                <t-select v-else-if="col.type === 'select' && col.isRemote !== true" v-model="row[col.key]" :disabled="disabled"
                                     :placeholder="col.placeholder || `请选择${col.name}`" :options="col.options || []"
                                     :clearable="col.clearable !== false" :filterable="col.filterable"
                                     :multiple="col.multiple"
                                     @update:model-value="(value) => updateTableCell(rowIndex, col.key, value)" />
 
+                                <!-- 远程搜索 -->
+                                <ebiz-remote-select v-else-if="col.type === 'select' && col.isRemote === true" v-model="row[col.key]" :queryParams="col.queryParams"
+                                        :placeholder="col.placeholder || `请选择${col.name}`" :disabled="disabled" :clearable="col.clearable !== false"
+                                        :filterable="true" :multiple="col.multiple" :apiConfig="col.remoteApiConfig"
+                                        @update:model-value="(value) => updateTableCell(rowIndex, col.key, value)" />
+
                                 <!-- 日期选择器 -->
                                 <t-date-picker v-else-if="col.type === 'date'" v-model="row[col.key]"
                                     :disabled="disabled" :placeholder="col.placeholder || `请选择${col.name}`"
@@ -231,6 +237,11 @@
                                     :disabled="disabled" :options="col.options || []" :max="col.max"
                                     @update:model-value="(value) => updateTableCell(rowIndex, col.key, value)" />
 
+                                <ebiz-employee-selector v-else-if="col.type === 'employee'" v-model="row[col.key]"
+                                    :placeholder="col.placeholder || '请选择员工'" :disabled="disabled" 
+                                    :clearable="col.clearable !== false" :single="col.single" :defaultTab="col.defaultTab"
+                                    :maxCount="col.maxCount" @update:model-value="(value) => updateTableCell(rowIndex, col.key, value)" />
+
                                 <!-- 默认文本显示 -->
                                 <span v-else>{{ row[col.key] || '' }}</span>
                             </template>
@@ -301,6 +312,7 @@ import EbizEmployeeSelector from '../../EbizEmployeeSelector.vue';
 import EbizDepartmentSelector from '../../EbizDepartmentSelector.vue';
 import { EbizUpload } from '../../../index.js'
 import EbizRichTextEditor from '../../EbizRichTextEditor.vue';
+import EbizDictionarySelect from '../../EbizDictionarySelect.vue';
 
 const props = defineProps({
     /**