bdip-office-assistant-cli 1.0.0 → 1.0.1

package/dist/wfupload.js

@@ -11,6 +11,7 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
+import { createApiFromProfile } from './client.js';
 const IMG_EXT = new Set(['png', 'jpg', 'jpeg', 'gif', 'bmp', 'webp', 'svg', 'tif', 'tiff']);
 /** 判断文件按图片还是附件上传（按扩展名；可被 --list-type 覆盖）。 */
 export function guessListType(filePath) {
@@ -25,7 +26,10 @@ export async function uploadFile(cfg, opts) {
     const { workflowId, fieldId, filePath } = opts;
     const listType = opts.listType ?? guessListType(filePath);
     const category = opts.category ?? '21';
-    const loginuserid = opts.loginuserid ?? '1';
+    const loginuserid = opts.loginuserid;
+    if (!/^[1-9]\d*$/.test(String(loginuserid ?? '')) || !/^\d+$/.test(String(workflowId)) || !/^\d+$/.test(String(fieldId)))
+        throw new Error('上传需要已核实的当前账号、流程和字段 ID');
+    if (!['img', 'list'].includes(listType)) throw new Error('不支持的附件类型');
     if (!fs.existsSync(filePath))
         throw new Error(`文件不存在: ${filePath}`);
     const buf = fs.readFileSync(filePath);
@@ -35,9 +39,10 @@ export async function uploadFile(cfg, opts) {
         : ext === 'jpg' || ext === 'jpeg' ? 'image/jpeg'
             : ext === 'gif' ? 'image/gif'
                 : 'application/octet-stream';
-    // 直接用 fetch + aiAgentToken（不走 E9Api，因 multipart 需自定义 body）
-    const sess = (await import('./auth-token.js')).AuthTokenSession.fromProfile(cfg);
-    const base = cfg.baseUrl.replace(/\/+$/, '');
+    const api = opts.api ?? await createApiFromProfile(cfg);
+    const headers = await api.getHeaders();
+    delete headers['Content-Type'];
+    const base = api.baseUrl.replace(/\/+$/, '');
     const url = `${base}/api/doc/upload/uploadFile2Doc?category=,,${category}&workflowid=${workflowId}&listType=${listType}&wfTestStr=&uploadSrc=wfform&loginuserid=${loginuserid}`;
     const fd = new FormData();
     fd.append('name', filename);
@@ -49,18 +54,18 @@ export async function uploadFile(cfg, opts) {
     fd.append('file', new Blob([buf], { type: mime }), filename);
     const r = await fetch(url, {
         method: 'POST',
-        headers: { aiAgentToken: sess.token },
+        headers,
         body: fd,
         signal: AbortSignal.timeout(60000),
+        redirect: 'manual',
     });
-    const t = await r.text();
     let j = null;
     try {
-        j = JSON.parse(t);
+        j = await r.json();
     }
     catch { /* non-json */ }
-    if (!r.ok || !j?.data?.fileid) {
-        throw new Error(`上传失败 status=${r.status}: ${t.slice(0, 300)}`);
+    if (!r.ok || j?.status === false || j?.api_status === false || !/^\d+$/.test(String(j?.data?.fileid ?? ''))) {
+        throw new Error(`附件上传结果未确认，HTTP ${r.status}；请检查上传回执，不要立即重复上传`);
     }
     const d = j.data;
     return {

package/dist/workflow-runtime.js

@@ -5,6 +5,7 @@ import {pathToFileURL} from 'node:url';
 import {createApiFromProfile} from './client.js';
 import {buildCreateSubmitBody} from './wfstart.js';
 import {stableConfig} from './field-preparation.js';
+import {queryPersonBrowser} from './person-selection.js';
 
 const idOf = id => String(id).replace(/^field/, '');
 export function definitions(form) {
@@ -12,7 +13,7 @@ export function definitions(form) {
 }
 export function fingerprint(form) {
     const schema = definitions(form).map(f => [f.table,f.id,f.fieldname,f.fieldlabel,f.viewattr,f.htmltype,f.detailtype,f.fielddbtype,f.browserattr]).sort((a,b)=>String(a).localeCompare(String(b)));
-    const browsers = Object.entries(form.browserInfo ?? {}).map(([key,b]) => [key,b.relateFieldid,Object.keys(b.dataParams??{}).sort(),b.dataParams?.type,b.dataParams?.fielddbtype,b.conditionDataParams?.type]);
+    const browsers = stableConfig(form.browserInfo ?? {});
     return createHash('sha256').update(JSON.stringify(['unified-linkage-2',schema,browsers,form.params?.formid,form.params?.layoutversion,stableConfig(form.linkageCfg??{})])).digest('hex');
 }
 export function adapterDirectory(cfg, workflowId) {
@@ -52,13 +53,36 @@ export async function detailTables(api,form,workflowId,requestId) {
 }
 export function browserQuery(form,fieldId,context={}) {
     const f=definitions(form).find(x=>x.id===String(fieldId));if(!f)throw Error('浏览框字段不存在');
-    const b=form.browserInfo?.[`${f.detailtype}_${f.fielddbtype}`];
+    const source=form.browserInfo?.[`${f.detailtype}_${f.fielddbtype}`]??form.browserInfo?.[String(f.detailtype)];
+    const b=source?{...source,...source.otherParams}:null;
     if(!b)throw Error('缺少浏览框配置，请读取网页配置后适配');
     const p=form.params;
     const query={...b.conditionDataParams,...b.completeParams,...b.dataParams,wfid:String(p.workflowid),billid:p.formid,isbill:p.isbill,
         requestid:String(p.requestid??'-1'),fieldid:String(fieldId),viewtype:f.table==='main'?'0':'1',fromModule:'workflow',
         f_weaver_belongto_userid:p.f_weaver_belongto_userid,f_weaver_belongto_usertype:p.f_weaver_belongto_usertype,
+        wf_isagent:p.isagent,wf_beagenter:p.beagenter,wfTestStr:p.wfTestStr,wfCreater:p.creater,disabledConditionCache:true,
         current:'1',pageSize:String(context.pageSize??10),min:'1',max:String(context.pageSize??10)};
+    Object.assign(query,f.browserattr?.browserParams??{});
+    const cellValue=id=>{
+        const dependency=definitions(form).find(x=>x.id===String(id));
+        if(!dependency)throw Error('依赖字段不存在');
+        const values=dependency.table==='main'?context.main:context.row;
+        const cell=dependency.table==='main'?form.maindata?.['field'+id]:context.rowCells?.['field'+id];
+        const value=values?.[id]??values?.['field'+id]??cell?.value;
+        if(value===undefined)throw Error('缺少同一行/主表依赖值：'+id);
+        return value;
+    };
+    for(const ref of b.relateFieldid??[]) {
+        const [id,isDetail]=String(ref).split('_'),dep=definitions(form).find(x=>x.id===id);
+        if(!dep?.fieldname)throw Error('关联字段名称缺失');
+        let key=isDetail==='1'?dep.tableName+'_'+dep.fieldname:dep.fieldname;
+        if([161,162,256,257].includes(Number(f.detailtype)))key=key.toLowerCase()+'_'+b.dataParams?.currenttime;
+        query[key]=cellValue(id);
+    }
+    for(const ref of f.browserattr?.relateFieldid??[]) {
+        const id=String(ref).split('_')[0];query['field'+id]=cellValue(id);
+    }
+    if(context.customDataParam||context.customBrowserProp)throw Error('自定义浏览行为须经本地适配验证');
     for(const dep of f.browserattr?.cusDependShip??[]) {
         const dependency=definitions(form).find(x=>x.id===String(dep.fieldid));
         if(!dependency)throw Error('依赖字段不存在');
@@ -69,10 +93,12 @@ export function browserQuery(form,fieldId,context={}) {
         if(!dep.key||!b.dataParams?.currenttime)throw Error('缺少依赖字段key或服务器时间标识');
         query[dep.key.toLowerCase()+'_'+b.dataParams.currenttime]=value;
     }
-    return {field:f,query};
+    // undefined 参数不能编码成字符串 undefined。
+    return {field:f,query:Object.fromEntries(Object.entries(query).filter(([,v])=>v!==undefined))};
 }
 export async function queryBrowser(api,form,fieldId,context={}) {
     const {field,query}=browserQuery(form,fieldId,context);
+    if(Number(field.htmltype)===3&&[1,17].includes(Number(field.detailtype)))return queryPersonBrowser(api,form,field,query,context);
     const condition=await api.get('/api/public/browser/condition/'+field.detailtype,query,{forceCookie:true});
     const conditions=condition.json?.conditions??condition.json?.conditioninfo?.conditions;
     if(context.search) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdip-office-assistant-cli",
-  "version": "1.0.0",
-  "description": "BDIP5办公助手：待办、流程、台账、日志、邮件、日程、公文、考勤及关联账号切换",
+  "version": "1.0.1",
+  "description": "毕埃慕ai助手 CLI：待办、流程、台账、日志、邮件、日程、公文、考勤、会议及文档",
   "type": "module",
   "bin": {
     "bdip": "dist/cli.js"
@@ -20,7 +20,8 @@
     "bdip": "node dist/cli.js"
   },
   "author": "毕埃慕(上海)建筑数据技术股份有限公司",
-  "releaseVersion": "1.0.0",
+  "releaseVersion": "1.0.1",
+  "desktopLoginContract": "verified-auto-close-v1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"