diff --git a/src/commercial-module/README.md b/src/commercial-module/README.md
index fb2281b637738d0241a263417cf8a7d287af04c0..31e8dc17f4b18322dc4a30cf9684aa71ffacfb7b 100644
--- a/src/commercial-module/README.md
+++ b/src/commercial-module/README.md
@@ -1,2 +1,3 @@
-# 商业模块放置地址
-> 该文件夹勿删
\ No newline at end of file
+# 商业模块文件夹
+
+> 该文件夹勿删，该文件夹下项目以模块命名，切记直接使用neatlogic-web-xxx，否则文件路径会找不到
diff --git a/src/resources/api/api.js b/src/resources/api/api.js
index b8752f6c4051171029ebe6831cd47f8c97d8870d..004eb97e25f98bfad1268d693124148b33edf8b4 100644
--- a/src/resources/api/api.js
+++ b/src/resources/api/api.js
@@ -13,19 +13,39 @@ import report from './report';
 import rdm from './rdm';
 import documentonline from './documentonline';
 let moduleApiConfig = {};
+let moduleList = ['autoexec', 'cmdb', 'common', 'dashboard', 'deploy', 'framework', 'globalsearch', 'inspect', 'knowledge', 'pbc', 'process', 'report', 'rdm', 'documentonline']; // 用于自定义页面接口导入做浅拷贝
+let moduleConfig = {
+  autoexec: autoexec,
+  cmdb: cmdb,
+  common: common,
+  dashboard: dashboard,
+  deploy: deploy,
+  framework: framework,
+  globalsearch: globalsearch,
+  inspect: inspect,
+  knowledge: knowledge,
+  pbc: pbc,
+  process: process,
+  report: report,
+  rdm: rdm,
+  documentonline: documentonline
+};
 try {
   // 导入自定义模块，获取导出接口地址
   const apiConfig = require.context('@/commercial-module', true, /api.js$/);
-  const moduleApiPathList = apiConfig.keys();
-  moduleApiPathList.forEach(routerPath => {
-    const moduleId = routerPath.split('/')[1];
-    const exportValue = apiConfig(routerPath).default || {};
-    const lastModuleName = moduleId.split('-');
-    const moduleName = lastModuleName?.pop() || moduleId;
-    moduleApiConfig[moduleName] = exportValue;
+  apiConfig.keys().forEach(apiPath => {
+    if (apiPath) {
+      const moduleName = apiPath.split('/')[1]?.split('-')?.pop() || apiPath.split('/')[1];
+      const exportValue = apiConfig(apiPath).default || {};
+      if (moduleList.includes(moduleName)) {
+        moduleApiConfig[moduleName] = Object.assign(moduleConfig[moduleName], exportValue); //自定义页面接口导入，在现有模块基础上添加
+      } else {
+        moduleApiConfig[moduleName] = exportValue;
+      }
+    }
   });
 } catch (error) {
-  //
+  console.error('api.js抛出异常', error);
 }
 
 export default {
diff --git a/src/resources/plugins/TsSheet/form-item-config.vue b/src/resources/plugins/TsSheet/form-item-config.vue
index a55690fed71f927bcff62af56e7249c7a553c528..14154ccf2c8746ea3275bdfe800557ef9ee04369 100644
--- a/src/resources/plugins/TsSheet/form-item-config.vue
+++ b/src/resources/plugins/TsSheet/form-item-config.vue
@@ -80,7 +80,7 @@
   </div>
 </template>
 <script>
-import * as formItemConfig from './form/config/index.js';
+import formItemConfig from './form/config/index.js';
 import { FORMITEMS } from './form/formitem-list.js';
 
 export default {
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index b5f0dd81650d9aba455ba7ec32535c375226d0fa..ee14e70531408a71f3e4a6b373611bf0845279a2 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -88,7 +88,7 @@
   </div>
 </template>
 <script>
-import * as formItems from './form/component/index.js';
+import formItems from './form/component/index.js';
 import conditionMixin from './form/conditionexpression/condition-mixin.js';
 export default {
   name: '',
diff --git a/src/resources/plugins/TsSheet/form/component/index.js b/src/resources/plugins/TsSheet/form/component/index.js
index 9a6432a781b468c65594a429d693b06915a99ee4..4cc68ba846729304e787a039efe7bf08fb977761 100644
--- a/src/resources/plugins/TsSheet/form/component/index.js
+++ b/src/resources/plugins/TsSheet/form/component/index.js
@@ -1,30 +1,79 @@
-export { default as formlabel } from './formlabel.vue';
-export { default as formtext } from './formtext.vue';
-export { default as formtextarea } from './formtextarea.vue';
-export { default as formckeditor } from './formckeditor.vue';
-export { default as formnumber } from './formnumber.vue';
-export { default as formpassword } from './formpassword.vue';
-export { default as formselect } from './formselect.vue';
-export { default as formcascader } from './formcascader.vue';
-export { default as formradio } from './formradio.vue';
-export { default as formcheckbox } from './formcheckbox.vue';
-export { default as formtableselector } from './formtableselector';
-export { default as formtableinputer } from './formtableinputer';
-export { default as formdate } from './formdate.vue';
-export { default as formtime } from './formtime.vue';
-export { default as formlink } from './formlink.vue';
-export { default as formrate } from './formrate.vue';
-export { default as formuserselect } from './formuserselect.vue';
-export { default as formtreeselect } from './formtreeselect.vue';
-export { default as formaccounts } from './formaccounts';
-export { default as formupload } from './formupload.vue';
-export { default as formdivider } from './formdivider';
-export { default as formcube } from './formcube.vue';
-export { default as formtab } from './formtab.vue';
-export { default as formcollapse } from './formcollapse.vue';
-export { default as formtable } from './formtable.vue';
+import formlabel from './formlabel.vue';
+import formtext from './formtext.vue';
+import formtextarea from './formtextarea.vue';
+import formckeditor from './formckeditor.vue';
+import formnumber from './formnumber.vue';
+import formpassword from './formpassword.vue';
+import formselect from './formselect.vue';
+import formcascader from './formcascader.vue';
+import formradio from './formradio.vue';
+import formcheckbox from './formcheckbox.vue';
+import formtableselector from './formtableselector';
+import formtableinputer from './formtableinputer';
+import formdate from './formdate.vue';
+import formtime from './formtime.vue';
+import formlink from './formlink.vue';
+import formrate from './formrate.vue';
+import formuserselect from './formuserselect.vue';
+import formtreeselect from './formtreeselect.vue';
+import formaccounts from './formaccounts';
+import formupload from './formupload.vue';
+import formdivider from './formdivider';
+import formcube from './formcube.vue';
+import formtab from './formtab.vue';
+import formcollapse from './formcollapse.vue';
+import formtable from './formtable.vue';
 
-export * from '@/views/pages/cmdb/form/component';
-export * from '@/views/pages/autoexec/form/component';
+import * as cmdbComponent from '@/views/pages/cmdb/form/component';
+import * as autoexecComponent from '@/views/pages/autoexec/form/component';
 
-export { default as formsubassembly } from './formsubassembly.vue';
+import formsubassembly from './formsubassembly.vue';
+
+let importComponentConfig = {};
+try {
+  // 导入自定义组件
+  let importComponentConfig;
+  const componentConfig = require.context('@/commercial-module', true, /formcomponent.js$/);
+  componentConfig
+    .keys()
+    .filter(path => {
+      const moduleName = path.split('/')?.[1]?.split('-')?.pop() || path.split('/')?.[1];
+      return moduleName === MODULEID;
+    })
+    .forEach(path => {
+      importComponentConfig = componentConfig(path).default || {};
+    });
+} catch (error) {
+  console.error('form/component/index.js异常', error);
+}
+export default {
+  formlabel,
+  formtext,
+  formtextarea,
+  formckeditor,
+  formnumber,
+  formpassword,
+  formselect,
+  formcascader,
+  formradio,
+  formcheckbox,
+  formtableselector,
+  formtableinputer,
+  formdate,
+  formtime,
+  formlink,
+  formrate,
+  formuserselect,
+  formtreeselect,
+  formaccounts,
+  formupload,
+  formdivider,
+  formcube,
+  formtab,
+  formcollapse,
+  formtable,
+  formsubassembly,
+  ...cmdbComponent,
+  ...autoexecComponent,
+  ...importComponentConfig
+};
diff --git a/src/resources/plugins/TsSheet/form/config/index.js b/src/resources/plugins/TsSheet/form/config/index.js
index 13f9d2155a0cc0ad3fcccba28f79fcbec78f4fd1..7fe28e74e5c8ae756b635acd76b706d310154c89 100644
--- a/src/resources/plugins/TsSheet/form/config/index.js
+++ b/src/resources/plugins/TsSheet/form/config/index.js
@@ -1,29 +1,74 @@
-export { default as formlabel } from './formlabel-conf.vue';
-export { default as formtext } from './formtext-conf.vue';
-export { default as formtextarea } from './formtextarea-conf.vue';
-export { default as formckeditor } from './formckeditor-conf.vue';
-export { default as formnumber } from './formnumber-conf.vue';
-export { default as formpassword } from './formpassword-conf.vue';
-export { default as formselect } from './formselect-conf.vue';
-export { default as formcascader } from './formcascader-conf.vue';
-export { default as formradio } from './formradio-conf.vue';
-export { default as formcheckbox } from './formcheckbox-conf.vue';
-export { default as formtableselector } from './formtableselector-conf';
-export { default as formtableinputer } from './formtableinputer-conf';
-export { default as formdate } from './formdate-conf.vue';
-export { default as formtime } from './formtime-conf.vue';
-export { default as formlink } from './formlink-conf.vue';
-export { default as formrate } from './formrate-conf.vue';
-export { default as formuserselect } from './formuserselect-conf.vue';
-export { default as formtreeselect } from './formtreeselect-conf.vue';
-export { default as formaccounts } from './formaccounts-conf.vue';
-export { default as formupload } from './formupload-conf.vue';
-export { default as formdivider } from './formdivider-conf.vue';
-export { default as formcube } from './formcube-conf.vue';
-export { default as formtab } from './formtab-conf.vue';
-export { default as formcollapse } from './formcollapse-conf.vue';
+import formlabel from './formlabel-conf.vue';
+import formtext from './formtext-conf.vue';
+import formtextarea from './formtextarea-conf.vue';
+import formckeditor from './formckeditor-conf.vue';
+import formnumber from './formnumber-conf.vue';
+import formpassword from './formpassword-conf.vue';
+import formselect from './formselect-conf.vue';
+import formcascader from './formcascader-conf.vue';
+import formradio from './formradio-conf.vue';
+import formcheckbox from './formcheckbox-conf.vue';
+import formtableselector from './formtableselector-conf';
+import formtableinputer from './formtableinputer-conf';
+import formdate from './formdate-conf.vue';
+import formtime from './formtime-conf.vue';
+import formlink from './formlink-conf.vue';
+import formrate from './formrate-conf.vue';
+import formuserselect from './formuserselect-conf.vue';
+import formtreeselect from './formtreeselect-conf.vue';
+import formaccounts from './formaccounts-conf.vue';
+import formupload from './formupload-conf.vue';
+import formdivider from './formdivider-conf.vue';
+import formcube from './formcube-conf.vue';
+import formtab from './formtab-conf.vue';
+import formcollapse from './formcollapse-conf.vue';
 
-export * from '@/views/pages/cmdb/form/config';
-export * from '@/views/pages/autoexec/form/config';
+import * as cmdbComponent from '@/views/pages/cmdb/form/config';
+import * as autoexecComponent from '@/views/pages/autoexec/form/config';
 
-export { default as formsubassembly } from './formsubassembly-conf.vue';
+import formsubassembly from './formsubassembly-conf.vue';
+let importComponentConfig = {};
+try {
+  // 导入表单自定义配置文件
+  const componentConfig = require.context('@/commercial-module', true, /formconfig.js$/);
+  componentConfig.keys().forEach(path => {
+    if (path) {
+      const moduleName = path.split('/')[1].split('-').pop() || path.split('/')[1];
+      if (moduleName == MODULEID) {
+        importComponentConfig = componentConfig(path).default || {};
+      }
+    }
+  });
+} catch (error) {
+  console.log('form/config/index.js抛出异常', error);
+}
+export default {
+  formlabel,
+  formtext,
+  formtextarea,
+  formckeditor,
+  formnumber,
+  formpassword,
+  formselect,
+  formcascader,
+  formradio,
+  formcheckbox,
+  formtableselector,
+  formtableinputer,
+  formdate,
+  formtime,
+  formlink,
+  formrate,
+  formuserselect,
+  formtreeselect,
+  formaccounts,
+  formupload,
+  formdivider,
+  formcube,
+  formtab,
+  formcollapse,
+  formsubassembly,
+  ...cmdbComponent,
+  ...autoexecComponent,
+  ...importComponentConfig
+};
diff --git a/src/resources/plugins/TsSheet/form/formitem-list.js b/src/resources/plugins/TsSheet/form/formitem-list.js
index 02296c0ad3732342d451f36f5ef1bab919dc2cf6..e3ff1dd87f12abdf69b43fa65fbbee7dfc76756d 100644
--- a/src/resources/plugins/TsSheet/form/formitem-list.js
+++ b/src/resources/plugins/TsSheet/form/formitem-list.js
@@ -33,32 +33,25 @@ export const FORMITEM_CATEGORY = [
   { value: 'autoexec', text: $t('term.framework.automationwidget') },
   { value: 'cmdb', text: $t('term.framework.cmdbwidget') }
 ];
-
-export const FORMITEMS = [formlabel,
-  formtext,
-  formtextarea,
-  formckeditor,
-  formnumber,
-  formpassword,
-  formselect,
-  formcascader, 
-  formradio, 
-  formcheckbox, 
-  formcube, 
-  formtableselector, 
-  formtableinputer, 
-  formdate,
-  formtime,
-  formlink,
-  formrate, 
-  formuserselect, 
-  formtreeselect, 
-  formaccounts, 
-  formupload,
-  formdivider, 
-  formtab, 
-  formcollapse,
-  formsubassembly, 
-  ...CMDBITEMS,
-  ...AUTOEXECITEMS
-];
+let importComponentConfig = {};
+let defineList = [];
+try {
+  // 导入自定义组件
+  const componentConfig = require.context('@/commercial-module', true, /formdefine.js$/);
+  componentConfig.keys().forEach(path => {
+    if (path) {
+      const moduleName = path.split('/')[1]?.split('-')?.pop() || path.split('/')[1];
+      if (moduleName == MODULEID) {
+        importComponentConfig = componentConfig(path).default || {};
+      }
+    }
+  });
+  for (let key in importComponentConfig) {
+    if (key && importComponentConfig.hasOwnProperty(key)) {
+      defineList.push(importComponentConfig[key]);
+    }
+  }
+} catch (error) {
+  console.error('formitem-list.js抛出异常', error);
+}
+export const FORMITEMS = [formlabel, formtext, formtextarea, formckeditor, formnumber, formpassword, formselect, formcascader, formradio, formcheckbox, formcube, formtableselector, formtableinputer, formdate, formtime, formlink, formrate, formuserselect, formtreeselect, formaccounts, formupload, formdivider, formtab, formcollapse, formsubassembly, ...CMDBITEMS, ...AUTOEXECITEMS, ...defineList];
diff --git a/src/views/pages/deploy/router.js b/src/views/pages/deploy/router.js
index 090e02b4321ff906e82257735927a555462e8d1c..e874fd61044a543f438d50eea1794099fe9d18d5 100644
--- a/src/views/pages/deploy/router.js
+++ b/src/views/pages/deploy/router.js
@@ -16,15 +16,15 @@ const applicationConfigPipeline = () => import('./application-config/application
 // 自动化
 const actionDetail = () => import('@/views/pages/autoexec/detail/action-detail.vue'); // 组合工具详情
 const scriptDetail = () => import('@/views/pages/autoexec/detail/script-detail.vue'); //自动化：自定义工具
-const toolDetail = () => import('@/views/pages/autoexec/detail/tool-detail.vue');//自动化：工具
-const testDetail = () => import('@/views/pages/autoexec/detail/test-detail.vue');//自动化：工具测试
+const toolDetail = () => import('@/views/pages/autoexec/detail/tool-detail.vue'); //自动化：工具
+const testDetail = () => import('@/views/pages/autoexec/detail/test-detail.vue'); //自动化：工具测试
 const jobDetail = () => import('@/views/pages/autoexec/detail/job-detail.vue'); // 自动发现作业详情
 
 // 自动化end
 const publishingJobManage = () => import('./job/job-manage'); //一键发布
 const publishingJobAdd = () => import('./job/job-add'); //新建发布作业
-const batchPublishingJobEdit = () => import('./job/batch-job-edit.vue');//修改批量作业
-const batchPublishingJobExecute = () => import('./job/batch-job-detail.vue');//执行批量作业
+const batchPublishingJobEdit = () => import('./job/batch-job-edit.vue'); //修改批量作业
+const batchPublishingJobExecute = () => import('./job/batch-job-detail.vue'); //执行批量作业
 const pipelineDetail = () => import('./application-config/pipeline-detail.vue'); // 流水线详情
 
 //超级流水线
@@ -46,7 +46,7 @@ const jobWebhookEdit = () => import('./webhook/job-webhook-edit.vue');
 // 工具分类
 const toolClassificationManage = () => import('./toolclassification/tool-classification-manage.vue');
 
-import {$t} from '@/resources/init.js';
+import { $t } from '@/resources/init.js';
 
 export default [
   {
@@ -136,7 +136,6 @@ export default [
     }
   },
   {
-
     path: '/application-config-pipeline',
     name: 'application-config-pipeline',
     component: applicationConfigPipeline,
diff --git a/src/views/pages/framework/framework.js b/src/views/pages/framework/framework.js
index 8a9fc4900cb90bf8cb2a503b18a01b8cfd2673b0..3a1818557065cb95110e95f6160c17f5011f4495 100644
--- a/src/views/pages/framework/framework.js
+++ b/src/views/pages/framework/framework.js
@@ -12,19 +12,19 @@ import LocalStore from '@/resources/assets/js/localStore.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
-import {initRouter, initI18n} from '@/resources/init.js';
+import { initRouter, initI18n } from '@/resources/init.js';
 
 Vue.use(VueRouter);
 Vue.use(VueI18n);
-Vue.use(CompareUtil);//必须要在use router之后执行
+Vue.use(CompareUtil); //必须要在use router之后执行
 
-import {config} from './config.js';
+import { config } from './config.js';
 MODULEID = config.module;
 MENULIST = routers;
 MENUTYPE = config.menuType;
 
-let router = initRouter(VueRouter, store);//路由拦截处理
-let i18n = initI18n(VueI18n, {});//语言包配置
+let router = initRouter(VueRouter, store); //路由拦截处理
+let i18n = initI18n(VueI18n, {}); //语言包配置
 
 Vue.prototype.$tsrouter = router;
 Vue.config.productionTip = false;
diff --git a/vue.config.js b/vue.config.js
index 4440a5194ba79fa9832cdc3c210e3416688d5eb2..14436c9eee5029422aff219881566f6ad9cbe029 100755
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,68 +13,73 @@ function getPages(pageList) {
   const pages = {};
   if (!pageList) {
     const pagePath = glob.sync(src + '/views/pages/*/router.js');
+    let importModulePathList = glob.sync(`${commercialModule}/**/router.js`) || [];
     let pagePathList = [...pagePath];
-    let importModuleList = [];
-    let customPagePath = [];
-    let importModulePathList;
-    importModulePathList = glob.sync(`${commercialModule}/**/router.js`);
+
+    let defaultModuleList = getAllModuleList([], JSON.parse(JSON.stringify(pagePath)));
+    let commercialModuleList = [];
     if (importModulePathList && importModulePathList.length > 0) {
-      customPagePath.push(...importModulePathList);
-      pagePathList.push(...customPagePath);
-    }
-    pagePathList.forEach(p => {
-      let filename = '';
-      let customImportModuleName = ''; // 自定义导入模块名称
-      const projectFilename = p.match(/src\/views\/pages\/(.*)\/router\.js/);
-      const importFilename = p.match(/\/[^\/]+\/router\.js$/);
-      if (projectFilename) {
-        filename = projectFilename[1];
-      } else if (importFilename) {
-        customImportModuleName = importFilename[0].match(/\/([^\/]+)\/router\.js$/);
-        if (customImportModuleName) {
-          filename = customImportModuleName[1];
-          importModuleList.push(filename);
+      importModulePathList.forEach(filePath => {
+        let moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
+        if (moduleName && !defaultModuleList.includes(getModuleName(moduleName))) {
+          // 剔除非模块的情况，如自定义页面或者自定义组件
+          pagePathList.push(filePath);
+          commercialModuleList.push(getModuleName(moduleName));
         }
-      }
+      });
+    }
+    pagePathList.forEach(filePath => {
+      let moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
+
       const newpage = {};
-      let pageLogin = `${pageTitle}-${getModuleName(importModuleList, filename)}`;
+      let filename = getModuleName(moduleName);
+      let pageLogin = `${pageTitle}-${filename}`;
       if (`${filename}` == 'login') {
         pageLogin = `${pageTitle}`;
       }
-      newpage[getModuleName(importModuleList, filename)] = {
-        entry: importModuleList.includes(filename) ? `${commercialModule}/${filename}/${getLastValue(filename)}.js` : `${src}/views/pages/${filename}/${filename}.js`,
+      newpage[filename] = {
+        entry: commercialModuleList.includes(filename) ? `${commercialModule}/${moduleName}/${filename}.js` : `${src}/views/pages/${filename}/${filename}.js`,
         template: `public/index.html`,
-        filename: `${getModuleName(importModuleList, filename)}.html`,
+        filename: `${filename}.html`,
         title: pageLogin, // 标题名称+参数
-        chunks: [`chunk-vendors`, `chunk-common`, getModuleName(importModuleList, filename)]
+        chunks: [`chunk-vendors`, `chunk-common`, filename]
       };
       Object.assign(pages, newpage);
     });
   } else {
     //eg:['process','dashboard']
     let list = typeof pageList == 'string' ? JSON.parse(pageList) : pageList;
-    list.forEach(p => {
+    list.forEach(filePath => {
       const newpage = {};
-      newpage[getModuleName(importModuleList, p)] = {
-        entry: importModuleList.includes(p) ? `${commercialModule}/${p}/${getLastValue(p)}.js` : `${src}/views/pages/${p}/${p}.js`,
+      newpage[filePath] = {
+        entry: `${src}/views/pages/${filePath}/${filePath}.js`,
         template: `public/index.html`,
-        filename: `${getModuleName(importModuleList, p)}.html`,
-        title: `${pageTitle}-${getModuleName(importModuleList, p)}`, // 标题名称+参数
-        chunks: [`chunk-vendors`, `chunk-common`, getModuleName(importModuleList, p)]
+        filename: `${filePath}.html`,
+        title: `${pageTitle}-${filePath}`, // 标题名称+参数
+        chunks: [`chunk-vendors`, `chunk-common`, filePath]
       };
       Object.assign(pages, newpage);
     });
   }
   return pages;
 }
-function getModuleName(importModuleList, moduleName) {
-  // 自定义模块例如：neatlogic-web-codehub 拿到codehub模块名称
-  return importModuleList.includes(moduleName) ? `${getLastValue(moduleName)}` : `${moduleName}`;
+function getModuleName(moduleName) {
+  // 截取neatlofic-web-xxx xxx值
+  let currentModuleName = moduleName ? JSON.parse(JSON.stringify(moduleName)) : '';
+  return (currentModuleName && currentModuleName.split('-') && currentModuleName.split('-').pop()) || currentModuleName;
 }
-function getLastValue(moduleName) {
-  const lastValue = moduleName.split('-');
-  const moduleNames = lastValue.pop() || moduleName;
-  return moduleNames;
+function getAllModuleList(defaultModuleList, modulePathList = []) {
+  // 获取所有非自定义模块
+  let moduleList = [];
+  modulePathList.forEach(filePath => {
+    if (filePath) {
+      const moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
+      if (moduleName && getModuleName(moduleName) && !defaultModuleList.includes(getModuleName(moduleName))) {
+        moduleList.push(getModuleName(moduleName));
+      }
+    }
+  });
+  return moduleList;
 }
 
 function resolve(dir) {