@epxing/business 5.3.0-beta.2 → 5.3.0-beta.3

package/src/views/Add.vue

@@ -482,11 +482,11 @@ export default {
       }
     },
     init () {
-      if (this.linkAttrs && this.linkAttrs.length > 0) {
-        // this.$bus.off('reload')
-        this.$bus.on('reload', () => {
+      if (this.linkAttrs && this.linkAttrs.length > 0 && !this._reloadHandler) {
+        this._reloadHandler = () => {
           this.reload = true
-        })
+        }
+        this.$bus.on('reload', this._reloadHandler)
       }
       this.getFieldConfig()
       // 获取其级联编辑页面
@@ -671,7 +671,10 @@ export default {
     )
   },
   beforeUnmount () {
-    // this.$bus.off('reload')
+    if (this._reloadHandler) {
+      this.$bus.off('reload', this._reloadHandler)
+      this._reloadHandler = null
+    }
     // this.$bus.off('subAddEntity')
     // this.$bus.on('reload', this.reloadMenuPage)
   }

package/src/views/AiToolManager.vue

@@ -35,6 +35,36 @@
       </div>
     </div>
 
+    <!-- 调用方法沿用工具绑定，不复制方法定义 -->
+    <div class="tool-section">
+      <div class="section-header">
+        <span class="section-title">调用方法</span>
+        <span class="call-method-hint">接入配置中心已启用的方法，供智能体调用</span>
+      </div>
+      <div class="tool-cards">
+        <div v-for="tool in callMethodTools" :key="tool.ID" class="tool-card interface-card clickable" @click="showCallMethodSettings(tool)">
+          <div class="card-header">
+            <span class="card-title">{{ tool['CALL_METHOD|NAME'] || tool.NAME }}</span>
+            <el-tag size="small" :type="String(tool.CONFIRM) === '1' ? 'warning' : 'info'">{{ String(tool.CONFIRM) === '1' ? '执行前确认' : '直接执行' }}</el-tag>
+          </div>
+          <div class="card-content">
+            <div class="card-line">方法标识：{{ tool['CALL_METHOD|CODE'] || '—' }}</div>
+            <div class="card-line">主对象：{{ tool['CALL_METHOD|MAIN_ENTITY#'] || '—' }}</div>
+            <div class="card-line">方法类型：{{ callMethodTypeName(tool['CALL_METHOD|OPERATION']) }}</div>
+            <div class="card-line">{{ tool['CALL_METHOD|DESCRIPTION'] || tool.DESC }}</div>
+          </div>
+          <div class="call-method-actions">
+            <el-button size="small" class="call-method-secondary" @click.stop="showCallMethodSettings(tool)">接入配置</el-button>
+            <el-button size="small" class="call-method-danger" @click.stop="removeCallMethod(tool)">解除绑定</el-button>
+          </div>
+        </div>
+        <div class="tool-card add-card" @click="showCallMethodDialog">
+          <div class="add-icon">+</div>
+          <div class="add-text">添加调用方法</div>
+        </div>
+      </div>
+    </div>
+
     <!-- 对象接口工具 -->
     <div class="tool-section">
       <div class="section-header">
@@ -377,7 +407,7 @@
                 <div class="filter-item">
                   <label>选择对象：</label>
                   <epx-object
-                    v-model="selectedEntity"
+                    :model-value="selectedEntity"
                     :fieldConfigs="{
                       attriLabel: '',
                       codeKey: 'FM_ENTITY',
@@ -385,7 +415,7 @@
                       placeholder: '请选择对象',
                       isMultiple: '0'
                     }"
-                    @change="handleEntityChange"
+                    @update:modelValue="handleEntityChange"
                   />
                 </div>
               </div>
@@ -781,6 +811,49 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="添加调用方法" v-model="callMethodDialogVisible" width="960px" :close-on-click-modal="false" :close-on-press-escape="!callMethodSaving" :show-close="!callMethodSaving">
+      <div class="call-method-toolbar">
+        <el-input v-model="callMethodKeyword" size="small" placeholder="搜索方法名称或标识" clearable :disabled="callMethodSaving" @keyup.enter="searchCallMethods" @clear="searchCallMethods" />
+        <el-button size="small" class="call-method-secondary" :disabled="callMethodSaving" @click="searchCallMethods">查询</el-button>
+        <span class="call-method-hint">已接入的方法不可重复选择</span>
+      </div>
+      <el-table ref="callMethodTable" v-loading="callMethodLoading" :data="callMethodList" row-key="ID" height="340" @selection-change="handleCallMethodSelectionChange">
+        <el-table-column type="selection" width="48" :reserve-selection="true" :selectable="canSelectCallMethod" />
+        <el-table-column prop="NAME" label="方法名称" min-width="160" show-overflow-tooltip />
+        <el-table-column prop="CODE" label="方法标识" min-width="170" show-overflow-tooltip />
+        <el-table-column label="方法类型" width="120"><template #default="scope">{{ callMethodTypeName(scope.row.OPERATION) }}</template></el-table-column>
+        <el-table-column prop="MAIN_ENTITY#" label="主对象" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="DESCRIPTION" label="方法描述" min-width="200" show-overflow-tooltip />
+      </el-table>
+      <el-pagination :current-page="callMethodPage" :page-size="10" layout="total, prev, pager, next" :total="callMethodTotal" :disabled="callMethodSaving" @current-change="changeCallMethodPage" />
+      <div v-if="selectedCallMethods.length" class="call-method-selection">
+        <div class="call-method-selection-title">已选择 {{ selectedCallMethods.length }} 个方法 · 逐项设置执行前确认</div>
+        <div v-for="method in selectedCallMethods" :key="method.ID" class="call-method-selection-row">
+          <span>{{ method.NAME }}</span>
+          <el-checkbox v-model="callMethodConfirm[method.ID]" :disabled="callMethodSaving">执行前确认</el-checkbox>
+        </div>
+      </div>
+      <template #footer><div >
+        <el-button size="small" class="call-method-secondary" :disabled="callMethodSaving" @click="callMethodDialogVisible = false">取消</el-button>
+        <el-button size="small" type="primary" class="call-method-primary" :disabled="!selectedCallMethods.length || callMethodLoading" :loading="callMethodSaving" @click="confirmCallMethods">确认添加</el-button>
+      </div></template>
+    </el-dialog>
+
+    <el-dialog title="调用方法接入配置" v-model="callMethodSettingsVisible" width="600px" :close-on-click-modal="false" :close-on-press-escape="!callMethodSaving" :show-close="!callMethodSaving">
+      <el-form label-width="100px">
+        <el-form-item label="方法名称">{{ callMethodSetting['CALL_METHOD|NAME'] || callMethodSetting.NAME }}</el-form-item>
+        <el-form-item label="方法标识">{{ callMethodSetting['CALL_METHOD|CODE'] || '—' }}</el-form-item>
+        <el-form-item label="方法类型">{{ callMethodTypeName(callMethodSetting['CALL_METHOD|OPERATION']) }}</el-form-item>
+        <el-form-item label="主对象">{{ callMethodSetting['CALL_METHOD|MAIN_ENTITY#'] || '—' }}</el-form-item>
+        <el-form-item label="方法描述">{{ callMethodSetting['CALL_METHOD|DESCRIPTION'] || callMethodSetting.DESC }}</el-form-item>
+        <el-form-item label="执行前确认"><el-switch v-model="callMethodSettingConfirm" :disabled="callMethodSaving" /></el-form-item>
+      </el-form>
+      <template #footer><div >
+        <el-button size="small" class="call-method-secondary" :disabled="callMethodSaving" @click="callMethodSettingsVisible = false">取消</el-button>
+        <el-button size="small" type="primary" class="call-method-primary" :loading="callMethodSaving" @click="saveCallMethodSettings">保存</el-button>
+      </div></template>
+    </el-dialog>
+
     <!-- MCP选择对话框 -->
     <el-dialog
       title="添加MCP工具"
@@ -912,6 +985,21 @@ export default {
       subAgentTools: [],
       skillTools: [],
       sysTools: [],
+      callMethodTools: [],
+      callMethodDialogVisible: false,
+      callMethodList: [],
+      callMethodKeyword: '',
+      callMethodPage: 1,
+      callMethodTotal: 0,
+      callMethodLoading: false,
+      callMethodSaving: false,
+      callMethodRequestId: 0,
+      selectedCallMethods: [],
+      // 确认设置按方法ID保留，跨页选择不会重置用户修改。
+      callMethodConfirm: {},
+      callMethodSettingsVisible: false,
+      callMethodSetting: {},
+      callMethodSettingConfirm: false,
       dialogVisible: false,
       dialogTitle: '新增工具',
       isEdit: false,
@@ -1006,7 +1094,7 @@ export default {
   methods: {
     // 加载工具列表
     loadTools () {
-      this.$http.list({
+      return this.$http.list({
         action: 'list',
         entityId: 'FM_AI_TOOL',
         'scope.AGENT': this.$query.id,
@@ -1014,7 +1102,7 @@ export default {
         order_mode: 'asc',
         columnFieldNames: 'ID,NAME#,TYPE,DESC,ORDER,ACTION,META#,API,TOKEN,MCP_URL,WORKFLOW,SKILL_FILE,ENABLE,CONFIRM,FORM_PAGE,RESULT_PAGE,USE_FORM_PAGE,USE_RESULT_PAGE,API|LABEL,API|NAME,API|ENTITY#,API|PARAM_EXPLAIN,API|FRAME_API,OUT_API|NOTICE,SUB_AGENT|NAME,SUB_AGENT|AGENT_PROMPT,SUB_AGENT|CODE,SUB_AGENT|IMAGE,SKILL,SKILL|NAME,SKILL|CODE,SKILL|DESC,MCP,MCP|NAME,MCP|CODE,MCP|TYPE,MCP|URL,MCP|COMMAND,SYS_TOOL,SYS_TOOL|NAME,SYS_TOOL|CODE,SYS_TOOL|DESC'
       })
-        .then(data => {
+        .then(async data => {
           const tools = data.entitys || []
           this.interfaceTools = tools.filter(t => t.TYPE === 'function')
           this.externalTools = tools.filter(t => t.TYPE === 'api')
@@ -1022,12 +1110,174 @@ export default {
           this.subAgentTools = tools.filter(t => t.TYPE === 'subagent')
           this.skillTools = tools.filter(t => t.TYPE === 'skills')
           this.sysTools = tools.filter(t => t.TYPE === 'sys_tool')
+          await this.loadCallMethodTools(tools.filter(t => t.TYPE === 'call_method'))
         })
         .catch(err => {
           this.$message.error(err.message || '加载工具列表失败')
         })
     },
 
+    callMethodTypeName (operation) {
+      return { CREATE: '数据新增', LIST: '列表分页查询', UPDATE: '数据编辑', DELETE: '数据删除', DETAIL: '详情', APPLY: '申请', APPROVE: '审核', PRINT: '报表打印' }[operation] || operation || '—'
+    },
+
+    // 仅存在此类绑定时读取新增关联字段，兼容尚未接入调用方法的旧配置。
+    async loadCallMethodTools (tools) {
+      this.callMethodTools = tools
+      if (!tools.length) return
+      const result = await this.$http.list({
+        entityId: this.$util.getSystemMeta('FM_AI_TOOL'),
+        'scope.AGENT': this.$query.id,
+        'scope.TYPE': 'call_method',
+        limit: tools.length,
+        columnFieldNames: 'ID,NAME,DESC,CONFIRM,CALL_METHOD,CALL_METHOD|NAME,CALL_METHOD|CODE,CALL_METHOD|DESCRIPTION,CALL_METHOD|OPERATION,CALL_METHOD|MAIN_ENTITY#'
+      })
+      this.callMethodTools = result.entitys || []
+    },
+
+    showCallMethodDialog () {
+      if (!this.$query.id) {
+        this.$message.warning('请先保存智能体，再添加调用方法')
+        return
+      }
+      this.callMethodKeyword = ''
+      this.callMethodPage = 1
+      this.callMethodList = []
+      this.selectedCallMethods = []
+      this.callMethodConfirm = {}
+      this.callMethodDialogVisible = true
+      this.$nextTick(() => {
+        if (this.$refs.callMethodTable) this.$refs.callMethodTable.clearSelection()
+        this.loadCallMethods()
+      })
+    },
+
+    async loadCallMethods () {
+      const requestId = ++this.callMethodRequestId
+      this.callMethodLoading = true
+      try {
+        // 只提供已启用的方法；list返回entitys和total，绑定仍由后端校验。
+        const result = await this.$http.list({
+          entityId: this.$util.getSystemMeta('FM_AI_CALL_METHOD'),
+          'scope.ENABLE': '1',
+          keywordValue: this.callMethodKeyword,
+          keywordFields: 'NAME,CODE',
+          page: this.callMethodPage,
+          limit: 10,
+          columnFieldNames: 'ID,NAME,CODE,DESCRIPTION,OPERATION,MAIN_ENTITY#',
+          order_field: 'CODE',
+          order_mode: 'asc'
+        })
+        if (requestId !== this.callMethodRequestId) return
+        this.callMethodList = result.entitys || []
+        this.callMethodTotal = result.total || 0
+      } catch (err) {
+        if (requestId === this.callMethodRequestId) {
+          this.callMethodList = []
+          this.callMethodTotal = 0
+          this.$message.error(err.msg || err.message || '加载调用方法失败')
+        }
+      } finally {
+        if (requestId === this.callMethodRequestId) this.callMethodLoading = false
+      }
+    },
+
+    searchCallMethods () {
+      this.callMethodPage = 1
+      this.loadCallMethods()
+    },
+
+    changeCallMethodPage (page) {
+      this.callMethodPage = page
+      this.loadCallMethods()
+    },
+
+    canSelectCallMethod (row) {
+      return !this.callMethodSaving && !this.callMethodTools.some(tool => tool.CALL_METHOD === row.ID)
+    },
+
+    handleCallMethodSelectionChange (selection) {
+      this.selectedCallMethods = selection
+      selection.forEach(method => {
+        if (!Object.prototype.hasOwnProperty.call(this.callMethodConfirm, method.ID)) {
+          this.$set(this.callMethodConfirm, method.ID, method.OPERATION === 'CREATE')
+        }
+      })
+    },
+
+    async confirmCallMethods () {
+      if (this.callMethodSaving || !this.selectedCallMethods.length) return
+      this.callMethodSaving = true
+      let saved = 0
+      try {
+        // 每条保存成功即移出待选，部分失败时重试只处理未成功的绑定。
+        for (const method of [...this.selectedCallMethods]) {
+          await this.$http.save({
+            entityId: this.$util.getSystemMeta('FM_AI_TOOL'),
+            bean: {
+              NAME: method.NAME,
+              DESC: method.DESCRIPTION || method.NAME,
+              TYPE: 'call_method',
+              CALL_METHOD: method.ID,
+              AGENT: this.$query.id,
+              CLIENT: this.CLIENT,
+              SYSTEM: this.SYSTEM,
+              ENABLE: '1',
+              CONFIRM: this.callMethodConfirm[method.ID] ? '1' : '0'
+            }
+          })
+          saved++
+          this.$refs.callMethodTable.toggleRowSelection(method, false)
+        }
+        this.callMethodDialogVisible = false
+        this.$message.success(`已添加 ${saved} 个调用方法`)
+      } catch (err) {
+        this.$message.error(`${saved ? `已添加 ${saved} 个，其余未完成：` : ''}${err.msg || err.message || '添加调用方法失败'}`)
+      } finally {
+        await this.loadTools()
+        this.callMethodSaving = false
+      }
+    },
+
+    showCallMethodSettings (tool) {
+      this.callMethodSetting = { ...tool }
+      this.callMethodSettingConfirm = String(tool.CONFIRM) === '1'
+      this.callMethodSettingsVisible = true
+    },
+
+    async saveCallMethodSettings () {
+      if (this.callMethodSaving) return
+      this.callMethodSaving = true
+      try {
+        await this.$http.update({
+          entityId: this.$util.getSystemMeta('FM_AI_TOOL'),
+          bean: { ID: this.callMethodSetting.ID, CONFIRM: this.callMethodSettingConfirm ? '1' : '0' }
+        })
+        this.callMethodSettingsVisible = false
+        this.$message.success('接入配置已保存')
+        await this.loadTools()
+      } catch (err) {
+        this.$message.error(err.msg || err.message || '保存接入配置失败')
+      } finally {
+        this.callMethodSaving = false
+      }
+    },
+
+    async removeCallMethod (tool) {
+      try {
+        await this.$confirm(`确定解除“${tool['CALL_METHOD|NAME'] || tool.NAME}”的绑定吗？方法定义会保留。`, '解除绑定', { type: 'warning' })
+      } catch (cancel) {
+        return
+      }
+      try {
+        await this.$http.removeMulti({ entityId: this.$util.getSystemMeta('FM_AI_TOOL'), ids: tool.ID })
+        this.$message.success('已解除绑定')
+        await this.loadTools()
+      } catch (err) {
+        this.$message.error(err.msg || err.message || '解除绑定失败')
+      }
+    },
+
     // 新增工具
     handleAdd (type) {
       if (type === 'interface') {
@@ -1861,6 +2111,78 @@ export default {
   color: var(--epx-text);
 }
 
+.call-method-hint {
+  margin-left: 12px;
+  font-size: 12px;
+  color: var(--epx-text-secondary, #909399);
+}
+
+.call-method-actions,
+.call-method-toolbar,
+.call-method-selection-row {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.call-method-actions {
+  margin-top: 12px;
+}
+
+.call-method-toolbar {
+  margin-bottom: 16px;
+
+  .el-input { width: 300px; }
+}
+
+.call-method-selection {
+  margin-top: 16px;
+  padding: 12px 16px;
+  background: var(--epx-bg-card, #f5f7fa);
+  max-height: 180px;
+  overflow-y: auto;
+}
+
+.call-method-selection-title {
+  margin-bottom: 8px;
+  font-weight: 600;
+}
+
+.call-method-selection-row {
+  justify-content: space-between;
+  padding: 6px 0;
+}
+
+:deep(.el-button.call-method-secondary) ,
+:deep(.el-button.call-method-primary) ,
+:deep(.el-button.call-method-danger) {
+  font-weight: 600;
+}
+
+:deep(.el-button.call-method-secondary) {
+  background: var(--epx-bg-card, #ecf5ff);
+  border-color: var(--epx-border, #b3d8ff);
+  color: var(--epx-text, #1670d2);
+}
+
+:deep(.el-button.call-method-primary) {
+  background: rgb(var(--color-primary, 8, 116, 231));
+  border-color: rgb(var(--color-primary, 8, 116, 231));
+  color: #fff;
+
+  &.is-disabled {
+    background: var(--epx-bg, #d9e6f5);
+    border-color: var(--epx-border, #d9e6f5);
+    color: #fff;
+  }
+}
+
+:deep(.el-button.call-method-danger) {
+  background: var(--epx-bg-card, #fef0f0);
+  border-color: var(--epx-border, #fbc4c4);
+  color: var(--epx-text-secondary, #d94b4b);
+}
+
 .tool-cards {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));

package/src/views/App.vue

@@ -1,53 +1,4 @@
-<template>
-  <!-- app入口 -->
-  <component v-if="load" :is="component" :page="firstPage"></component>
-</template>
-
-<script>
-/**
- * 应用入口  获取应用配置模板
- */
-export default {
-  name: 'epx-app',
-  computed: {
-    appConfig () {
-      return this.$store.state.config.appConfig
-    }
-  },
-
-  data () {
-    return {
-      load: false,
-      component: 'epx-app-index',
-      firstPage: {}
-    }
-  },
-  methods: {
-    getPage () {
-      const { FIRST_PAGE, MOBILE_FIRST_PAGE } = this.appConfig
-      this.$store.dispatch({ // 加回调
-        type: 'ADD_PAGE',
-        pageId: this.$isMobile ? MOBILE_FIRST_PAGE : FIRST_PAGE
-      })
-        .then((page = {}) => {
-          const { pagePath } = page
-          this.firstPage = page
-          this.component = this.$loadComponent(pagePath, this.component)
-          this.load = true
-        })
-        .catch(() => {
-          // this.component = this.$loadComponent(null, this.component)
-          this.load = true
-        })
-    }
-  },
-  created () {
-    this.getPage()
-  }
-
-}
-</script>
-
-<style>
-
-</style>
+<script>
+// 保留业务包旧路径，基础路由页统一由 core 提供。
+export { default } from '@epxing/core/src/views/App.vue'
+</script>