npm - neo-cmp-cli - Versions diffs - 1.13.8 → 1.13.10 - Mend

neo-cmp-cli 1.13.8 → 1.13.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (57) hide show

package/dist/neo/neoLogin.js CHANGED Viewed

	@@ -1 +1 @@
1	- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("axios"),t=require("node:fs"),n=require("node:path"),s=require("ora"),r=require("node:http"),o=require("node:url"),i=require("open"),a=require("node:net"),c=require("lodash"),l=require("../utils/common.js"),h=require("./neoEnvManager.js");var p,u;exports.__require=function(){if(u)return p;u=1;const d=e,g=t,m=n,y=s,k=r,_=o,f=i,T=a,w=c,{errorLog:U,successLog:R}=l.__require(),$=h.__require();return p=class{constructor(e){if(this.tokenDir=m.join(process.cwd(),".neo-cli"),this.tokenFile=m.join(this.tokenDir,"token.json"),this.pageDir=m.join(__dirname,"../../template/pageHtml"),this.authErrorTemplate=m.join(this.pageDir,"auth-error.html"),this.authSuccessTemplate=m.join(this.pageDir,"auth-success.html"),this.tokenErrorTemplate=m.join(this.pageDir,"token-error.html"),this.authFailedTemplate=m.join(this.pageDir,"auth-failed.html"),!e)return;const{neoBaseURL:t,loginURL:n,tokenURL:s}=e,r=$.getAuthConfig(),{redirectUri:o,authType:i,auth:a}=r;if(!n\|\|!s)throw new Error("neo.config.js 配置不完整，需要包含 loginURL、tokenURL");this.neoBaseURL=t,this.loginURL=n,this.tokenURL=s,this.NeoCrmAPI=r,this.redirectUri=o,this.authType=i\|\|"oauth2",this.response_type=a.response_type\|\|"code",this.client_id=a.client_id,this.client_secret=a.client_secret,this.scope=a.scope\|\|"all",this.oauthType=a.oauthType\|\|"standard",this.access_type=a.access_type\|\|"offline",this.grant_type=a.grant_type\|\|"authorization_code";try{$.setEnvConfig(w.pick(e,["neoBaseURL","loginURL","tokenURL"]))}catch(e){U(`保存环境配置失败: ${e.message\|\|e.msg}`)}}ensureTokenDir(){g.existsSync(this.tokenDir)\|\|g.mkdirSync(this.tokenDir,{recursive:!0})}saveToken(e){this.ensureTokenDir();const t={...e,savedAt:Date.now(),expiresAt:Date.now()+1e3*(e.expires_in\|\|7200)};g.writeFileSync(this.tokenFile,JSON.stringify(t,null,2),"utf-8")}readToken(){if(!g.existsSync(this.tokenFile))return null;try{return JSON.parse(g.readFileSync(this.tokenFile,"utf-8"))}catch(e){return U(`读取 token 文件失败: ${e.message\|\|e.msg}`),null}}isTokenExpired(e){return!e\|\|!e.expiresAt\|\|Date.now()>=e.expiresAt-3e5}clearToken(){g.existsSync(this.tokenFile)&&g.unlinkSync(this.tokenFile)}getRedirectURI(e){return`http://localhost:${e}`}buildAuthUrl(e){const t=new URLSearchParams({response_type:this.response_type,client_id:this.client_id,redirect_uri:e,scope:this.scope,oauthType:this.oauthType,access_type:this.access_type});return`${this.loginURL}?${t.toString()}`}async openBrowser(e){try{await f(e)}catch(t){U(`无法自动打开浏览器: ${t.message\|\|t.msg}`),console.log(`\n请手动访问以下 URL 进行授权:\n${e}\n`)}}getHtmlTemplate(e,t={}){try{let n=g.readFileSync(e,"utf-8");return Object.keys(t).forEach(e=>{const s=`{{${e}}}`;n=n.replace(new RegExp(s,"g"),t[e])}),n}catch(e){return U(`读取 HTML 模板失败: ${e.message\|\|e.msg}`),"<html><body><h1>页面加载失败</h1></body></html>"}}async isPortInUse(e){return new Promise(t=>{const n=T.createServer();n.once("error",e=>{"EADDRINUSE"===e.code?t(!0):t(!1)}),n.once("listening",()=>{n.once("close",()=>{t(!1)}),n.close()}),n.listen(e)})}async startCallbackServer(){let e=this.redirectUri,t=new URL(e),n=parseInt(t.port,10);await this.isPortInUse(n)&&(U(`\n警告: 端口 ${n} 已被占用，请调整 redirectUri 配置项，使其指向一个未被占用的端口。`),process.exit(1));const s=new Promise((s,r)=>{const o=k.createServer(async(n,i)=>{const a=_.parse(n.url,!0);if(a.pathname===t.pathname\|\|"/"===a.pathname){const t=a.query.code,n=a.query.error;if(n){i.writeHead(400,{"Content-Type":"text/html; charset=utf-8"});const e=this.getHtmlTemplate(this.authErrorTemplate,{ERROR:n});return i.end(e),o.close(),void r(new Error(`授权失败: ${n}`))}if(t)try{const n=await this.getTokenByCode(t,e);this.saveToken(n);const r=n.userInfo.tenantName?`${n.userInfo.tenantName}(${n.tenant_id})`:n.tenant_id\|\|"未返回",a=n.instance_uri\|\|"未返回";i.writeHead(200,{"Content-Type":"text/html; charset=utf-8"});const c=this.getHtmlTemplate(this.authSuccessTemplate,{TENANT_ID:r,INSTANCE_URI:a});return i.end(c),o.close(),void s({code:t,tokenData:n})}catch(e){i.writeHead(500,{"Content-Type":"text/html; charset=utf-8"});const t=this.getHtmlTemplate(this.tokenErrorTemplate,{ERROR:e});return i.end(t),o.close(),void r(e)}i.writeHead(400,{"Content-Type":"text/html; charset=utf-8"});const c=this.getHtmlTemplate(this.authFailedTemplate);i.end(c),o.close(),r(new Error("未获取到授权码"))}else i.writeHead(404,{"Content-Type":"text/plain"}),i.end("Not Found")});o.on("error",e=>{"EADDRINUSE"===e.code?r(new Error(`端口 ${n} 已被占用，无法启动回调服务器`)):r(e)}),o.listen(n,()=>{console.log(`\n本地回调服务器已启动，监听端口: ${n}`),console.log(`回调地址: ${e}`)}),setTimeout(()=>{o.close(),r(new Error("授权超时，请重试"))},3e5)});return{redirectUri:e,getCodeAndTokenPromise:s}}async getTokenByCode(e,t){const n=y("正在获取 access token...").start();try{const s=new URLSearchParams;s.append("grant_type",this.grant_type),s.append("client_id",this.client_id),s.append("client_secret",this.client_secret),s.append("code",e),s.append("redirect_uri",t);const r=(await d.post(this.tokenURL,s.toString(),{headers:{"Content-Type":"application/x-www-form-urlencoded"}})).data;if(r&&r.access_token){const e=await this.getUserInfo(r.access_token);r.userInfo=e}else U("获取 token 失败：响应中未包含 access_token",n),U(`响应数据: ${JSON.stringify(r)}`),process.exit(1);return R("成功获取 access token",n),r}catch(e){U("获取 token 失败",n),U(`\n获取 token 失败: ${e.message\|\|e.msg}`),e.response&&U(`响应数据: ${JSON.stringify(e.response.data)}`),process.exit(1)}}async refreshToken(e){const t=y("正在刷新授权信息（token）...").start();try{const n=new URLSearchParams;n.append("grant_type","refresh_token"),n.append("client_id",this.client_id),n.append("client_secret",this.client_secret),n.append("refresh_token",e);const s=(await d.post(this.tokenURL,n.toString(),{headers:{"Content-Type":"application/x-www-form-urlencoded"}})).data;if(!s\|\|!s.access_token)return U("刷新授权信息失败：响应中未包含 access_token",t),U(`响应数据: ${JSON.stringify(s)}`),null;{const e=await this.getUserInfo(s.access_token);s.userInfo=e}return R("刷新授权信息成功（token）。",t),s}catch(e){return U("刷新授权信息失败",t),U(`\n刷新授权信息失败: ${e.message\|\|e.msg}`),e.response&&U(`响应数据: ${JSON.stringify(e.response.data)}`),null}}async getUserInfo(e){let t={};try{let n=this.buildFullUrl(this.NeoCrmAPI.getUserInfoAPI);const s=await d.get(n,{headers:{Authorization:`Bearer ${e}`,"xsy-inner-source":"bff","Content-Type":"application/json"}}),{code:r,message:o,msg:i}=s.data\|\|{};r&&"200"!==r&&(U(`获取用户信息失败: ${o\|\|i\|\|"未知错误"}`),process.exit(1)),t=s.data.result\|\|s.data.data\|\|{}}catch(e){const t=e.message\|\|e.msg;U(t?`获取用户信息失败: ${t}`:`响应数据: ${JSON.stringify(e)}`),process.exit(1)}return t}async login(){console.log("\n========== NeoCRM 登录授权 ==========\n");try{const{redirectUri:e,getCodeAndTokenPromise:t}=await this.startCallbackServer(),n=this.buildAuthUrl(e);console.log("授权 URL:",n),console.log("\n正在打开浏览器进行授权..."),await this.openBrowser(n);const{code:s,tokenData:r}=await t;return R("\n✓ 已获取授权码"),console.log("\n========== 登录成功 ==========\n"),console.log(`实例地址: ${r.instance_uri\|\|"未返回"}`),console.log(`当前租户信息: ${r.userInfo.tenantName\|\|"未返回租户名称"}（${r.tenant_id\|\|"未返回租户 ID"}）`),console.log(`当前登录用户: ${r.userInfo.name\|\|"未返回用户名"}`),r}catch(e){U(`\n登录失败: ${e.message\|\|e.msg}`),process.exit(1)}}async logout(){if(console.log("\n========== NeoCRM 登出 ==========\n"),g.existsSync(this.tokenFile))try{$.clearEnvConfig(),this.clearToken(),R("已清除授权信息，下次登录需要重新授权。"),console.log("\n登出成功！\n")}catch(e){U(`登出失败: ${e.message\|\|e.msg}`),process.exit(1)}else console.log("当前未登录，无需登出。")}async getValidToken(){const e=this.readToken();if(e\|\|(U("未找到授权信息，请先执行 neo login 进行登录。"),process.exit(1)),this.isTokenExpired(e)){console.log("授权信息已过期，正在尝试刷新..."),e.refresh_token\|\|(U("自动刷新授权信息失败，请重新登录（neo login）。"),process.exit(1));const t=await this.refreshToken(e.refresh_token);return t\|\|(U("刷新授权信息失败，请重新登录 (neo login)"),process.exit(1)),this.saveToken(t),t}return e}async getAccessToken(){return await this.getValidToken()}buildFullUrl(e){return e.startsWith("http://")\|\|e.startsWith("https://")?e:`${this.neoBaseURL}${e}`}}};
1	+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("axios"),t=require("node:fs"),n=require("node:path"),s=require("ora"),r=require("node:http"),o=require("node:url"),i=require("open"),a=require("node:net"),c=require("lodash"),l=require("../utils/common.js"),h=require("./neoEnvManager.js");var p,u;exports.__require=function(){if(u)return p;u=1;const d=e,g=t,m=n,y=s,k=r,_=o,f=i,T=a,U=c,{errorLog:w,successLog:R}=l.__require(),$=h.__require();return p=class{constructor(e){if(this.tokenDir=m.join(process.cwd(),".neo-cli"),this.tokenFile=m.join(this.tokenDir,"token.json"),this.pageDir=m.join(__dirname,"../../template/pageHtml"),this.authErrorTemplate=m.join(this.pageDir,"auth-error.html"),this.authSuccessTemplate=m.join(this.pageDir,"auth-success.html"),this.tokenErrorTemplate=m.join(this.pageDir,"token-error.html"),this.authFailedTemplate=m.join(this.pageDir,"auth-failed.html"),!e)return;const{neoBaseURL:t,loginURL:n,tokenURL:s}=e,r=$.getAuthConfig(),{redirectUri:o,authType:i,auth:a}=r;if(!n\|\|!s)throw new Error("neo.config.js 配置不完整，需要包含 loginURL、tokenURL");this.neoBaseURL=t,this.loginURL=n,this.tokenURL=s,this.NeoCrmAPI=r,this.redirectUri=o,this.authType=i\|\|"oauth2",this.response_type=a.response_type\|\|"code",this.client_id=a.client_id,this.client_secret=a.client_secret,this.scope=a.scope\|\|"all",this.oauthType=a.oauthType\|\|"standard",this.access_type=a.access_type\|\|"offline",this.grant_type=a.grant_type\|\|"authorization_code";try{$.setEnvConfig(U.pick(e,["neoBaseURL","loginURL","tokenURL"]))}catch(e){w(`保存环境配置失败: ${e.message\|\|e.msg}`)}}ensureTokenDir(){g.existsSync(this.tokenDir)\|\|g.mkdirSync(this.tokenDir,{recursive:!0})}saveToken(e){this.ensureTokenDir();const t={...e,savedAt:Date.now(),expiresAt:Date.now()+1e3*(e.expires_in\|\|7200)};g.writeFileSync(this.tokenFile,JSON.stringify(t,null,2),"utf-8")}readToken(){if(!g.existsSync(this.tokenFile))return null;try{return JSON.parse(g.readFileSync(this.tokenFile,"utf-8"))}catch(e){return w(`读取 token 文件失败: ${e.message\|\|e.msg}`),null}}isTokenExpired(e){return!e\|\|!e.expiresAt\|\|Date.now()>=e.expiresAt-3e5}clearToken(){g.existsSync(this.tokenFile)&&g.unlinkSync(this.tokenFile)}getRedirectURI(e){return`http://localhost:${e}`}buildAuthUrl(e){const t=new URLSearchParams({response_type:this.response_type,client_id:this.client_id,redirect_uri:e,scope:this.scope,oauthType:this.oauthType,access_type:this.access_type});return`${this.loginURL}?${t.toString()}`}async openBrowser(e){try{await f(e)}catch(t){w(`无法自动打开浏览器: ${t.message\|\|t.msg}`),console.log(`\n请手动访问以下 URL 进行授权:\n${e}\n`)}}getHtmlTemplate(e,t={}){try{let n=g.readFileSync(e,"utf-8");return Object.keys(t).forEach(e=>{const s=`{{${e}}}`;n=n.replace(new RegExp(s,"g"),t[e])}),n}catch(e){return w(`读取 HTML 模板失败: ${e.message\|\|e.msg}`),"<html><body><h1>页面加载失败</h1></body></html>"}}async isPortInUse(e){return new Promise(t=>{const n=T.createServer();n.once("error",e=>{"EADDRINUSE"===e.code?t(!0):t(!1)}),n.once("listening",()=>{n.once("close",()=>{t(!1)}),n.close()}),n.listen(e)})}async startCallbackServer(){let e=this.redirectUri,t=new URL(e),n=parseInt(t.port,10);await this.isPortInUse(n)&&(w(`\n警告: 端口 ${n} 已被占用，请调整 redirectUri 配置项，使其指向一个未被占用的端口。`),process.exit(1));const s=new Promise((s,r)=>{const o=k.createServer(async(n,i)=>{const a=_.parse(n.url,!0);if(a.pathname===t.pathname\|\|"/"===a.pathname){const t=a.query.code,n=a.query.error;if(n){i.writeHead(400,{"Content-Type":"text/html; charset=utf-8"});const e=this.getHtmlTemplate(this.authErrorTemplate,{ERROR:n});return i.end(e),o.close(),void r(new Error(`授权失败: ${n}`))}if(t)try{const n=await this.getTokenByCode(t,e);this.saveToken(n);const r=n.userInfo.tenantName?`${n.userInfo.tenantName}(${n.tenant_id})`:n.tenant_id\|\|"未返回",a=n.instance_uri\|\|"未返回";i.writeHead(200,{"Content-Type":"text/html; charset=utf-8"});const c=this.getHtmlTemplate(this.authSuccessTemplate,{TENANT_ID:r,INSTANCE_URI:a});return i.end(c),o.close(),void s({code:t,tokenData:n})}catch(e){i.writeHead(500,{"Content-Type":"text/html; charset=utf-8"});const t=this.getHtmlTemplate(this.tokenErrorTemplate,{ERROR:e});return i.end(t),o.close(),void r(e)}i.writeHead(400,{"Content-Type":"text/html; charset=utf-8"});const c=this.getHtmlTemplate(this.authFailedTemplate);i.end(c),o.close(),r(new Error("未获取到授权码"))}else i.writeHead(404,{"Content-Type":"text/plain"}),i.end("Not Found")});o.on("error",e=>{"EADDRINUSE"===e.code?r(new Error(`端口 ${n} 已被占用，无法启动回调服务器`)):r(e)}),o.listen(n,()=>{console.log(`\n本地回调服务器已启动，监听端口: ${n}`),console.log(`回调地址: ${e}`)}),setTimeout(()=>{o.close(),r(new Error("授权超时，请重试"))},3e5)});return{redirectUri:e,getCodeAndTokenPromise:s}}async getTokenByCode(e,t){const n=y("正在获取 access token...").start();try{const s=new URLSearchParams;s.append("grant_type",this.grant_type),s.append("client_id",this.client_id),s.append("client_secret",this.client_secret),s.append("code",e),s.append("redirect_uri",t);const r=(await d.post(this.tokenURL,s.toString(),{headers:{"Content-Type":"application/x-www-form-urlencoded"}})).data;if(r&&r.access_token){r&&r.instance_uri&&r.instance_uri!==this.neoBaseURL&&(this.neoBaseURL=r.instance_uri,$.setEnvConfig({neoBaseURL:r.instance_uri}));const e=await this.getUserInfo(r.access_token);e&&e.tenantName&&e.name?r.userInfo=e:w("获取用户信息失败：",e)}else w("获取 token 失败：响应中未包含 access_token",n),w(`响应数据: ${JSON.stringify(r)}`),process.exit(1);return R("成功获取 access token",n),r}catch(e){w("获取 token 失败",n),w(`\n获取 token 失败: ${e.message\|\|e.msg}`),e.response&&w(`响应数据: ${JSON.stringify(e.response.data)}`),process.exit(1)}}async refreshToken(e){const t=y("正在刷新授权信息（token）...").start();try{const n=new URLSearchParams;n.append("grant_type","refresh_token"),n.append("client_id",this.client_id),n.append("client_secret",this.client_secret),n.append("refresh_token",e);const s=(await d.post(this.tokenURL,n.toString(),{headers:{"Content-Type":"application/x-www-form-urlencoded"}})).data;if(!s\|\|!s.access_token)return w("刷新授权信息失败：响应中未包含 access_token",t),w(`响应数据: ${JSON.stringify(s)}`),null;{const e=await this.getUserInfo(s.access_token);s.userInfo=e}return R("刷新授权信息成功（token）。",t),s}catch(e){return w("刷新授权信息失败",t),w(`\n刷新授权信息失败: ${e.message\|\|e.msg}`),e.response&&w(`响应数据: ${JSON.stringify(e.response.data)}`),null}}async getUserInfo(e){let t={};try{let n=this.buildFullUrl(this.NeoCrmAPI.getUserInfoAPI);const s=await d.get(n,{headers:{Authorization:`Bearer ${e}`,"xsy-inner-source":"bff","Content-Type":"application/json"}}),{code:r,message:o,msg:i}=s.data\|\|{};console.log("getUserInfo response:",s),r&&"200"!==r&&(w(`获取用户信息失败: ${o\|\|i\|\|"未知错误"}`),process.exit(1)),t=s.data.result\|\|s.data.data\|\|{}}catch(e){const t=e.message\|\|e.msg;w(t?`获取用户信息失败: ${t}`:`响应数据: ${JSON.stringify(e)}`),process.exit(1)}return t}async login(){console.log("\n========== NeoCRM 登录授权 ==========\n");try{const{redirectUri:e,getCodeAndTokenPromise:t}=await this.startCallbackServer(),n=this.buildAuthUrl(e);console.log("授权 URL:",n),console.log("\n正在打开浏览器进行授权..."),await this.openBrowser(n);const{code:s,tokenData:r}=await t;return R("\n✓ 已获取授权码"),console.log("\n========== 登录成功 ==========\n"),console.log(`实例地址: ${r.instance_uri\|\|"未返回"}`),console.log(`当前租户信息: ${r.userInfo.tenantName\|\|"未返回租户名称"}（${r.tenant_id\|\|"未返回租户 ID"}）`),console.log(`当前登录用户: ${r.userInfo.name\|\|"未返回用户名"}`),r}catch(e){w(`\n登录失败: ${e.message\|\|e.msg}`),process.exit(1)}}async logout(){if(console.log("\n========== NeoCRM 登出 ==========\n"),g.existsSync(this.tokenFile))try{$.clearEnvConfig(),this.clearToken(),R("已清除授权信息，下次登录需要重新授权。"),console.log("\n登出成功！\n")}catch(e){w(`登出失败: ${e.message\|\|e.msg}`),process.exit(1)}else console.log("当前未登录，无需登出。")}async getValidToken(){const e=this.readToken();if(e\|\|(w("未找到授权信息，请先执行 neo login 进行登录。"),process.exit(1)),this.isTokenExpired(e)){console.log("授权信息已过期，正在尝试刷新..."),e.refresh_token\|\|(w("自动刷新授权信息失败，请重新登录（neo login）。"),process.exit(1));const t=await this.refreshToken(e.refresh_token);return t\|\|(w("刷新授权信息失败，请重新登录 (neo login)"),process.exit(1)),this.saveToken(t),t}return e}async getAccessToken(){return await this.getValidToken()}buildFullUrl(e){return e.startsWith("http://")\|\|e.startsWith("https://")?e:`${this.neoBaseURL}${e}`}}};

package/dist/package.json.js CHANGED Viewed

	@@ -1 +1 @@
1	- "use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});var e="1.13.8";const o={version:e};exports.default=o,exports.version=e;
1	+ "use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});var e="1.13.9";const o={version:e};exports.default=o,exports.version=e;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "neo-cmp-cli",
-  "version": "1.13.8",
+  "version": "1.13.10",
   "description": "Neo 自定义组件开发工具，支持react 和 vue2.0技术栈。",
   "keywords": [
     "neo-cli",

package/template/antd-custom-cmp-template/package.json CHANGED Viewed

@@ -48,11 +48,14 @@
     "@commitlint/config-conventional": "^18.0.0",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"
   },
+  "overrides": {
+    "typescript": "<6"
+  },
   "engines": {
     "node": ">= 16.0.0",
     "npm": ">= 8.0.0"

package/template/asset-manage-template/package.json CHANGED Viewed

@@ -52,22 +52,18 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",
     "@babel/runtime": "^7.26.0",
     "@types/echarts": "^4.9.0"
   },
+  "overrides": {
+    "typescript": "<6"
+  },
   "engines": {
     "node": ">= 16.0.0",
     "npm": ">= 8.0.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://git@github.com:xxx/CD-TEST.git"
-  },
-  "bugs": {
-    "url": "https://github.com/xxx/CD-TEST/issues"
-  }
 }

package/template/echarts-custom-cmp-template/package.json CHANGED Viewed

@@ -48,12 +48,15 @@
     "@commitlint/config-conventional": "^18.0.0",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",
     "@types/echarts": "^4.9.0"
   },
+  "overrides": {
+    "typescript": "<6"
+  },
   "engines": {
     "node": ">= 16.0.0",
     "npm": ">= 8.0.0"

package/template/empty-custom-cmp-template/package.json CHANGED Viewed

@@ -41,11 +41,14 @@
     "@commitlint/config-conventional": "^18.0.0",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"
   },
+  "overrides": {
+    "typescript": "<6"
+  },
   "engines": {
     "node": ">= 16.0.0",
     "npm": ">= 8.0.0"

package/template/map-custom-cmp-template/package.json CHANGED Viewed

@@ -47,11 +47,14 @@
     "@commitlint/config-conventional": "^18.0.0",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"
   },
+  "overrides": {
+    "typescript": "<6"
+  },
   "engines": {
     "node": ">= 16.0.0",
     "npm": ">= 8.0.0"

package/template/neo-bi-cmps/package.json CHANGED Viewed

@@ -55,6 +55,9 @@
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"
   },
+  "overrides": {
+    "typescript": "<6"
+  },
   "engines": {
     "node": ">= 16.0.0",
     "npm": ">= 8.0.0"

package/template/neo-custom-cmp-template/package.json CHANGED Viewed

@@ -55,7 +55,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/neo-h5-cmps/package.json CHANGED Viewed

@@ -49,7 +49,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/neo-order-cmps/package.json CHANGED Viewed

@@ -47,11 +47,14 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"
   },
+  "overrides": {
+    "typescript": "<6"
+  },
   "engines": {
     "node": ">= 16.0.0",
     "npm": ">= 8.0.0"

package/template/neo-web-entity-grid/package.json CHANGED Viewed

@@ -52,7 +52,7 @@
     "@types/react-dom": "^16.9.15",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
-    "neo-cmp-cli": "^1.13.8",
+    "neo-cmp-cli": "^1.13.9",
     "prettier": "^2.0.5"
   },
   "overrides": {

package/template/neo-web-entity-grid/src/components/createForm__c/index.tsx CHANGED Viewed

@@ -266,7 +266,7 @@ export default class CreateEntityForm extends React.PureComponent<
    * 表单提交事件
    */
   @NeoEvent.dispatch
-  onSubmit() {
+  onSubmit(eventData?: any) {
     console.log('触发了表单提交事件：', this.props);
     /*
@@ -345,7 +345,10 @@ export default class CreateEntityForm extends React.PureComponent<
       }
       // 触发表单提交事件
-      this.onSubmit();
+      this.onSubmit({
+        xObjectApiKey,
+        data: values
+      });
     });
   }
@@ -376,6 +379,7 @@ export default class CreateEntityForm extends React.PureComponent<
       referModalVisible: false,
       currentReferField: null,
     });
+    return false; // 阻止事件冒泡
   }
   /**
@@ -674,6 +678,7 @@ export default class CreateEntityForm extends React.PureComponent<
               referItemApiKey: currentReferField.apiKey,
             }}
             selectedCount={1}
+            hiddenHeader={true}
             onCancel={this.closeReferModal}
             onSelectedCall={(selectedData: any) => {
               const { currentReferField: curField, currentReferField } = this.state;
@@ -699,6 +704,7 @@ export default class CreateEntityForm extends React.PureComponent<
                   currentReferField: null,
                 }));
               }
+              return false; // 阻止事件冒泡
             }}
           />
         )}
@@ -719,7 +725,7 @@ export default class CreateEntityForm extends React.PureComponent<
     console.log('createForm__c / this.props:', this.props);
     const curAmisData = data || {};
-    const systemInfo = curAmisData.__NeoSystemInfo || {};
+    // const systemInfo = curAmisData.__NeoSystemInfo || {};
     const { xObjectApiKey } = this.props.xObjectDataApi || {};
     const displayTitle = formTitle || title || '新增数据';
@@ -730,7 +736,6 @@ export default class CreateEntityForm extends React.PureComponent<
           <div className="form-header">
             <h3 className="form-title">
               {displayTitle}
-              {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
             </h3>
           </div>

package/template/neo-web-entity-grid/src/components/createForm__c/model.ts CHANGED Viewed

@@ -49,7 +49,7 @@ export class CreateFormModel {
   defaultComProps = {
     formTitle: '新增数据表单',
     showResetButton: true,
-    columnCount: 1,
+    columnCount: 2,
     xObjectDataApi: {
       xObjectApiKey: 'opportunity',
       fields: ['entityType', 'ownerId', 'opportunityName', 'accountId', 'money', 'closeDate'],
@@ -65,6 +65,8 @@ export class CreateFormModel {
       apiKey: 'onSubmit', // 事件名称
       label: '提交表单后', // 事件
       helpText: '表单提交后触发该事件', // 信息icon hover 时的提示文本
+      eventParams: // 定义事件触发时接收到的事件数据格式
+        '[{"apiKey":"eventParam","children":[{"apiKey":"data","label":"当前表单数据","type":"Object"}],"label":"事件入参","type":"Object"}]',
     },
   ];
@@ -101,7 +103,7 @@ export class CreateFormModel {
       type: 'panelSelect',
       name: 'columnCount',
       label: '表单列数',
-      value: 1,
+      value: 2,
       placeholder: '请选择表单列数',
       options: [
         {

package/template/neo-web-entity-grid/src/components/entityGrid3__c/model.ts CHANGED Viewed

@@ -9,11 +9,11 @@ export class NeoEntityGridModel {
   // cmpType: string = 'entityList__c';
   // 组件名称，用于设置在编辑器左侧组件面板中展示的名称
-  label: string = 'Picker列表弹窗';
+  label: string = 'Picker列表';
   // 组件描述，用于设置在编辑器左侧组件面板中展示的描述
   description: string =
-    '自定义Picker列表弹窗: 自定义 Picker 列表模式的数据选择弹窗，支持在其他自定义组件中使用。';
+    '自定义Picker列表: Picker 模式的数据选择列表，支持在其他自定义组件中使用。支持单选和多选。';
   // 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示
   // tags: string[] = ['自定义组件'];

package/template/neo-web-entity-grid/src/components/searchForm__c/index.tsx CHANGED Viewed

@@ -596,23 +596,19 @@ export default class SearchForm extends React.PureComponent<
     const { title, loading, submitting, error } = this.state;
     const { formTitle, className, showResetButton = true, data } = this.props;
-    // 测试输出
-    console.log('this.props:', this.props);
     const curAmisData = data || {};
-    const systemInfo = curAmisData.__NeoSystemInfo || {};
+    // const systemInfo = curAmisData.__NeoSystemInfo || {};
     const { xObjectApiKey } = this.props.xObjectDataApi || {};
     const displayTitle = formTitle || title || '自定义筛选条件';
     return (
-      <div className={`searchForm__c ${className}`}>
-        <Card>
+      <div className={`searchForm__c ${className || ''}`.trim()}>
+        <Card bordered={false} className="searchForm__c-card">
           <div className="form-header">
-            <h3 className="form-title">
-              {displayTitle}
-              {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
-            </h3>
+            <div className="form-header-text">
+              <h3 className="form-title">{displayTitle}</h3>
+            </div>
           </div>
           <div className="form-content">

package/template/neo-web-entity-grid/src/components/searchForm__c/model.ts CHANGED Viewed

@@ -49,7 +49,7 @@ export class SearchFormModel {
   defaultComProps = {
     formTitle: '自定义查询表单',
     showResetButton: true,
-    columnCount: 1,
+    columnCount: 2,
     xObjectDataApi: {
       xObjectApiKey: 'customContact__c',
       fields: ['name', 'entityType', 'phone__c'],