@farris/jit-engine 1.3.58 → 1.3.62-dev2

package/lib/utility/devkit/form-creator.js

@@ -6,27 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormCreator = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const toolhepler_1 = require("../toolhepler");
-/**
- * Form 控件生成
- *
- * @export
- * @class FormCreator
- */
 class FormCreator {
     constructor() { }
     static getNewInstance() {
         return new FormCreator();
     }
-    /**
-     * 构造FormControl
-     * 根据fields 及Entity 列表
-     *
-     * @param {*} name
-     * @param {*} fields
-     * @param {*} entity
-     * @returns {*}
-     * @memberof FormCreator
-     */
     createForm(name, fields, entity, vmValue) {
         const resourcePrefix = vmValue.resourcePrefix;
         const form = { name: name, controls: [], enableValidation: vmValue.enableValidation, formGroupName: vmValue.formGroupName, resourcePrefix: resourcePrefix };
@@ -67,16 +51,12 @@ class FormCreator {
                             formControlName = e.fields[index].formFieldName;
                         }
                         if (e.fields[index].type == "Date") {
-                            // if (e.fields[index].editorFormat) {
-                            //     form.controls.push({ name: formControlName, type: "FormContrl", binding: e.fields[index].binding, converter: "new DateConverter(" + e.fields[index].editorFormat + ")", field: e.fields[index], valueChanging: item.valueChanging, valueChanged: item.valueChanged, updateOn: item.updateOn });
-                            // } else {
                             if (!item.converter) {
                                 form.controls.push({ name: formControlName, type: "FormContrl", binding: e.fields[index].binding, converterName: "DateConverter", converter: "new DateConverter('yyyy-MM-dd')", field: e.fields[index], voField: item, valueChanging: item.valueChanging, valueChanged: item.valueChanged, updateOn: item.updateOn, multiLanguage: e.fields[index].multiLanguage, fieldId: item.id, resourcePrefix: resourcePrefix });
                             }
                             else {
                                 form.controls.push({ name: formControlName, type: "FormContrl", binding: e.fields[index].binding, converterName: item.converter, converter: this.generateConverter(item.converter), field: e.fields[index], voField: item, valueChanging: item.valueChanging, valueChanged: item.valueChanged, updateOn: item.updateOn, multiLanguage: e.fields[index].multiLanguage, fieldId: item.id, resourcePrefix: resourcePrefix });
                             }
-                            //}
                         }
                         else {
                             form.controls.push({ name: formControlName, type: "FormContrl", binding: e.fields[index].binding, converterName: item.converter, converter: this.generateConverter(item.converter), field: e.fields[index], voField: item, valueChanging: item.valueChanging, valueChanged: item.valueChanged, updateOn: item.updateOn, multiLanguage: e.fields[index].multiLanguage, fieldId: item.id, resourcePrefix: resourcePrefix });
@@ -87,18 +67,9 @@ class FormCreator {
             return form;
         }
         else {
-            // 针对不包含任何字段的表单，输出一个空的form
             return form;
         }
     }
-    /**
-     * 生成converter 实例new
-     *
-     * @private
-     * @param {*} converter
-     * @returns
-     * @memberof FormCreator
-     */
     generateConverter(converter) {
         if (converter) {
             return `new ${converter}()`;
@@ -106,4 +77,3 @@ class FormCreator {
     }
 }
 exports.FormCreator = FormCreator;
-//# sourceMappingURL=form-creator.js.map

package/lib/utility/devkit/form-file-executor.js

@@ -24,52 +24,18 @@ const event_token_generator_1 = require("../event-token-generator");
 const progress_steps_checker_1 = require("../progress-steps-checker");
 const personnel_selector_checker_1 = require("../personnel-selector-checker");
 const approval_logs_check_1 = require("../approval-logs-check");
-/**
- * 表单文件读取
- *
- * @export
- * @class FormFileExecutor
- */
 class FormFileExecutor {
     constructor() {
     }
-    /**
-     * 获取单一实例
-     *
-     * @static
-     * @returns
-     * @memberof FormFileExecutor
-     */
     static getSingleInstance() {
         if (!this.instance) {
             this.instance = new FormFileExecutor();
         }
         return this.instance;
     }
-    /**
-     * 表单文件读取
-     *
-     * @param {{
-     *         inputOptions: JitInputOptions, 入参配置信息
-     *         metaFilePath: string, 表单JSON文件路径
-     *         metaFileName: string, 表单文件名称
-     *         eapiPath: string, 表单对应eapi路径
-     *         externalComponent?: any, 独立组件
-     *         projectName: string,  工程名称
-     *         isGroupForm: boolean, 是否组合表单
-     *         isExternalComponent: boolean, 当前表单是否是被组合表单
-     *         currentPageInfo:PageFlowPage, 当前页面流
-     *         allPages:PageFlowPage[], 当前页面流定义表单
-     *        qdpForm:{isQdp:boolean}, 是否qdp表单
-     *        i18nResourcePrefix:string  国际化资源项前缀
-     *     }} value
-     * @returns
-     * @memberof FormFileExecutor
-     */
     execute(value) {
         var _a, _b, _c;
         let entities, repository, viewmodels, routing, modules;
-        // 如果为弹窗Url  那么不需要读取任何JSON文件
         if (value.externalComponent &&
             value.externalComponent.type == external_component_1.ExternalComponentConstant.ExternalModalContainerType &&
             value.externalComponent.contentType == external_component_1.ExternalComponentConstant.ExternalModalContainerContentTypeUrl) {
@@ -81,51 +47,36 @@ class FormFileExecutor {
             };
         }
         let ui, vo, eapi;
-        let externalComponents = []; // 扩展组件
-        // 读取状态机JSON文件   *.sm.json
+        let externalComponents = [];
         const sm = file_operation_1.FileOperationManager.read(value.metaFilePath, value.metaFileName, file_operation_1.FileOperationType.StateMachine);
-        // 读取命令JSON文件  *.command.json
         const cmd = file_operation_1.FileOperationManager.read(value.metaFilePath, value.metaFileName, file_operation_1.FileOperationType.Command);
-        // 读取表单元数据json文件
         ui = file_operation_1.FileOperationManager.read(value.metaFilePath, value.metaFileName, file_operation_1.FileOperationType.Frm);
         if (ui && ui.module) {
-            // 检测当前表单是否是qdp表单
             qdpForm_checker_1.QdpFormChecker.checkIsQdpForm(ui, value.qdpForm);
-            /// 只有qdp表单 查找是否包含是否联查属性
             const qdpJoinSearch = { isJointSearch: false };
-            // 验证工程中是否包含QDPJoinsearch
             qdp_jointsearch_generator_1.QDPJointSearchGenerator.checkIsQdpJoinSearch(ui, qdpJoinSearch);
-            // 判断是否包含primeng  treegrid
             const hasPrimengTreeGrid = { isPrimengTreeGrid: false };
             primeng_treegrid_checker_1.PrimengTreeGridChecker.checkIsPrimengTreeGrid(ui, hasPrimengTreeGrid);
-            // 验证是否包含personnelSelector
             const hasPersonnelSelector = { isPersonnelSelector: false };
-            personnel_selector_checker_1.PersonnelSelectorChecker.checkIsPersonnelSelector(ui, hasPersonnelSelector); // 判断是否包含approvelogs
+            personnel_selector_checker_1.PersonnelSelectorChecker.checkIsPersonnelSelector(ui, hasPersonnelSelector);
             const hasApproveLogs = { isApprovalLogs: false };
             approval_logs_check_1.ApprovalLogsCheck.checkIsApprovalLogs(ui, hasApproveLogs);
-            // 标识是否包含进度条
             const hasProgressStep = { isProgressStep: false };
             progress_steps_checker_1.ProgressStepsChecker.check(ui, hasProgressStep);
-            // 检测是否存在portlet 小部件
             const hasPortlet = { hasPortlet: false };
             portlet_checker_1.PortletChecker.checkHasPortlet(ui, hasPortlet);
-            // 处理当前表单的事件定义
             if (ui.module.declarations && ui.module.components) {
                 declaration_trigger_1.DeclarationTrigger.getNewInstance().modifyComponentCommand(ui.module.declarations, ui.module.components);
             }
             if (ui.module.code && __1.ToolHelper.isArray(ui.module.schemas, false) && __1.ToolHelper.isArray(ui.module.components, false)) {
-                // 更新事件token  事件发送与事件订阅的token值必须保证相同
                 this.modifyDeclarationEvents(ui, value);
                 const mainEntityCode = ui.module.schemas[0].entities[0].code;
-                // 当前表单对应的eapiFileName  由于ui.module.schemas[0].eapiFileName 包含后缀.eapi 而value.metaFile 不包括eapiFile后缀
                 eapi = this.readEapiJSONFileAndReturnFirst(ui, value, mainEntityCode);
                 vo = ui.module.schemas[0];
-                // 是否启用时区
                 let enableStdTimeFormat = false;
                 if (vo.extendProperties) {
                     enableStdTimeFormat = __1.ToolHelper.isNullOrUndefined(vo.extendProperties.enableStdTimeFormat) ? false : vo.extendProperties.enableStdTimeFormat;
                 }
-                // 根据vo构造Entity
                 entities = entities_creator_1.EntitiesCreator.getSingleInstance().createEntites(vo, enableStdTimeFormat);
                 repository = repository_creator_1.RepositoryCreator.getNewInstance().createRepository({
                     mainEntityCode: mainEntityCode,
@@ -149,7 +100,6 @@ class FormFileExecutor {
                     i18nResourcePrefix: value.i18nResourcePrefix,
                     externalComponentNameSpace: value.externalComponentNameSpace
                 });
-                // 构造表单子路由
                 const componentChildRoutes = component_children_routes_creator_1.ComponentChildrenRoutesCreator.getNewInstance().create(ui);
                 routing = routing_creator_1.RoutingCreator.createRouting({
                     code: ui.module.code,
@@ -158,7 +108,6 @@ class FormFileExecutor {
                     currentPageInfo: value.currentPageInfo,
                     componentChildrenRoutes: componentChildRoutes
                 });
-                // 尝试读取资源文件 如果读取不到 那么采用表单元数据的资源文件
                 const resourceJson = this.getFormResourceJson(value, ui);
                 modules = module_creator_1.ModuleCreator.getNewInstance().createModule({
                     code: ui.module.code,
@@ -188,14 +137,9 @@ class FormFileExecutor {
             __1.LoggerHelper.log(`form file has none module data, the form file path is ${__1.ToolHelper.pathJoinAndnormalize(value.metaFilePath, value.metaFileName + jit_constant_1.JITConstant.JsonExtension)}!`);
             return;
         }
-        // 组合表单扩展组件
         if (__1.ToolHelper.isArray(ui.module.externalComponents, false)) {
-            // 如果当前表单是被组合表单  那么下级表单的父表单IsExternalComponent=true
-            // 避免对象的值互相影响
             const i18nResourcePrefix = value.i18nResourcePrefix;
-            // 如果是独立加载js  那么不创建对应的组合表单实例
             externalComponents = external_components_creator_1.ExternalComponentsCreator.getInstance().createExternalComponents(ui.module, value.inputOptions, viewmodels, value.inputOptions.eapiPath, value.projectName, value.isExternalComponent ? true : false, value.allPages, value.qdpForm, value.metaFilePath, i18nResourcePrefix);
-            // 更新根模块 import
             if (__1.ToolHelper.isArray(externalComponents, false)) {
                 externalComponents.forEach((item) => {
                     if (item.type == external_component_1.ExternalComponentConstant.ExternalModalContainerType && item.contentType == external_component_1.ExternalComponentConstant.ExternalModalContainerContentTypeUrl) {
@@ -210,28 +154,20 @@ class FormFileExecutor {
                 });
             }
         }
-        // 处理包含独立表单js的token 映射
         viewmodels.forEach((viewModelItem) => {
-            // 获取viewModel对应的component
-            // 一个viewModel对应一个component
             const externalContainerParameters = viewModelItem["component"] ? viewModelItem["component"]["externalContainerParameters"] : [];
             if (__1.ToolHelper.isArray(externalContainerParameters, false)) {
                 externalContainerParameters.forEach((externalContainerParameter) => {
                     const externalComponentId = externalContainerParameter.id;
                     const externalComponentCode = externalContainerParameter.code;
-                    // 找到事件定义  查找对应的事件订阅
-                    // 需要从几个地方去查找
-                    // 1、主表单 2、各个子表单
                     if (externalContainerParameter.declarations && __1.ToolHelper.isArray(externalContainerParameter.declarations.events, false)) {
                         externalContainerParameter.declarations.events.forEach((externalContainerEvent) => {
                             const externalContainerEventCode = externalContainerEvent.code;
-                            // 从主表单中进行查找订阅
                             viewmodels.forEach((childViewModel) => {
                                 const childComponentSubscriptions = childViewModel["component"] ? childViewModel["component"]["componentSubscriptions"] : [];
                                 if (__1.ToolHelper.isArray(childComponentSubscriptions, false)) {
                                     childComponentSubscriptions.forEach((childComponentSubscription) => {
                                         if (childComponentSubscription.sourceComponent == externalComponentId && childComponentSubscription.subscribeOn == externalContainerEventCode) {
-                                            // 如果主表单订阅token为空 那么设置  否则使用该token
                                             if (__1.ToolHelper.isNullOrUndefined(childComponentSubscription.token) == true) {
                                                 childComponentSubscription.token = event_token_generator_1.EventTokenGenerator.generateToken(ui.module.code, externalComponentCode, "-");
                                             }
@@ -240,7 +176,6 @@ class FormFileExecutor {
                                     });
                                 }
                             });
-                            // 非独立加载js 从子表单查找
                             if (__1.ToolHelper.isArray(externalComponents, false)) {
                                 externalComponents.forEach((externalComponentItem) => {
                                     const metadataDevkit = externalComponentItem["metaDataDevkit"] ? externalComponentItem["metaDataDevkit"]["devkit"] : {};
@@ -264,7 +199,6 @@ class FormFileExecutor {
                                     }
                                 });
                             }
-                            // 独立加载js从子表单进行查找
                             externalContainerParameters.forEach((exParameter) => {
                                 if (__1.ToolHelper.isArray(exParameter.subscriptions, false)) {
                                     exParameter.subscriptions.forEach((subscriptionParameter) => {
@@ -284,9 +218,6 @@ class FormFileExecutor {
                     }
                     if (__1.ToolHelper.isArray(externalContainerParameter.subscriptions, false)) {
                         externalContainerParameter.subscriptions.forEach((subscriptionItem) => {
-                            // 独立加载js表单订阅
-                            // 定义可能来源主表单 或其他独立js 或 其他非独立js
-                            // 从主表单中进行查找订阅
                             if (ui.module.declarations && __1.ToolHelper.isArray(ui.module.declarations.events, false)) {
                                 const findDeclarationEvent = ui.module.declarations.events.find((declarationEventItem) => {
                                     return declarationEventItem["code"] == subscriptionItem["subscribeOn"] && ui.module.code == subscriptionItem["sourceComponent"];
@@ -299,7 +230,6 @@ class FormFileExecutor {
                                     findDeclarationEvent.token = subscriptionItem.token = externalComponentToken;
                                 }
                             }
-                            // 独立加载js从子表单进行查找
                             externalContainerParameters.forEach((exParameter) => {
                                 if (exParameter.declarations && __1.ToolHelper.isArray(exParameter.declarations.events, false)) {
                                     exParameter.declarations.events.forEach((declarationEventParameter) => {
@@ -321,7 +251,6 @@ class FormFileExecutor {
                 });
             }
         });
-        // 获取表单中配置的是否启用表单解析参数
         const enableFormJieXi = __1.ToolHelper.convertStringToBoolean(((_a = ui.options) === null || _a === void 0 ? void 0 : _a.renderMode) === 'dynamic' || value.inputOptions.isJieXiForm, false);
         return {
             devkit: {
@@ -342,17 +271,7 @@ class FormFileExecutor {
             }
         };
     }
-    /**
-     *
-     * 获取表单资源文件 如果不存在对应的表单资源文件，那么从表单的zh-CHS中读取
-     * @private
-     * @param {{ inputOptions: JitInputOptions; metaFilePath: string; metaFileName: string; eapiPath: string; externalComponent?: any; projectName: string; isGroupForm: boolean; isExternalComponent: boolean; currentPageInfo: PageFlowPage; allPages: PageFlowPage[]; qdpForm: { isQdp: boolean; }; i18nResourcePrefix: string; }} value
-     * @param {*} ui
-     * @returns
-     * @memberof FormFileExecutor
-     */
     getFormResourceJson(value, ui) {
-        // 如果不使用国际化资源项 那么不读取对应的资源文件内容 返回默认的空文件内容
         if (value.inputOptions.useI18nResource == false) {
             return { "zh-CHS": [] };
         }
@@ -369,17 +288,8 @@ class FormFileExecutor {
         }
         return resourceJson;
     }
-    /**
-     * 更新事件定义及事件订阅  确保token一致
-     *
-     * @private
-     * @param {*} ui
-     * @param {{ inputOptions: JitInputOptions; metaFilePath: string; metaFileName: string; eapiPath: string; externalComponent?: any; projectName: string; isGroupForm: boolean; isExternalComponent: boolean; currentPageInfo: PageFlowPage; allPages: PageFlowPage[]; qdpForm: { isQdp: boolean; }; i18nResourcePrefix: string; }} value
-     * @memberof FormFileExecutor
-     */
     modifyDeclarationEvents(ui, value) {
         if (ui.module.declarations) {
-            // 设置子控件的父级module
             const externalParentModule = value.externalComponent ? value.externalComponent.parentModule : null;
             const parentDeclarations = externalParentModule ? externalParentModule.declarations : null;
             if (!externalParentModule) {
@@ -390,16 +300,6 @@ class FormFileExecutor {
             }
         }
     }
-    /**
-     * 获取扩展组件所在模块路径
-     *
-     * @param {*} externalComponent
-     * @returns {{
-     *         "dependency": any;
-     *         "import": any
-     *     }}
-     * @memberof FormFileExecutor
-     */
     getExternalComponentModulePath(externalComponent) {
         if (!externalComponent || (externalComponent.type == external_component_1.ExternalComponentConstant.ExternalModalContainerType && externalComponent.contentType == external_component_1.ExternalComponentConstant.ExternalModalContainerContentTypeUrl)) {
             return;
@@ -409,12 +309,10 @@ class FormFileExecutor {
             return;
         }
         else {
-            // 组合表单引用路径
             const externalComponentUniqueCode = __1.ToolHelper.addPrefixWhenFirstNumber(externalComponent.containerId ? externalComponent.containerId : externalComponent.code);
             const externalComponentModulePath = "./" + external_component_1.ExternalComponentConstant.DefaultExternalComponentFirstPath + "/" + externalComponentUniqueCode.toLowerCase() + "/" + externalComponent.metaDataDevkit.devkit.module.code.toLowerCase() + "/" + externalComponent.metaDataDevkit.devkit.module.code.toLowerCase() + ".module";
             const externalComponentPrefix = __1.ToolHelper.tf(`${externalComponentUniqueCode.toLowerCase()}${externalComponent.metaDataDevkit.devkit.module.code.toLowerCase()}`);
             const usePrefix = externalComponent.parentIsExternal ? false : true;
-            // 如果父级表单为组合表单 那么不需要再次进行增加前缀
             return {
                 "dependency": {
                     name: `${externalComponentPrefix}${externalComponent.metaDataDevkit.devkit.module.code}Module`,
@@ -425,25 +323,14 @@ class FormFileExecutor {
             };
         }
     }
-    /**
-     * 读取Eapi JSON文件
-     *
-     * @param {*} ui
-     * @param {*} value
-     * @param {string} mainEntityCode
-     * @returns
-     * @memberof FormFileExecutor
-     */
     readEapiJSONFileAndReturnFirst(ui, value, mainEntityCode) {
         const eapiFileName = ui.module.schemas[0].eapiFileName ? ui.module.schemas[0].eapiFileName : value.metaFileName;
         const arrEapi = file_operation_1.FileOperationManager.read(value.metaFilePath, value.metaFileName, file_operation_1.FileOperationType.Eapi);
         if (arrEapi && __1.ToolHelper.isArray(arrEapi, false)) {
             const eapi = arrEapi[0];
-            // 读取到eapi的json内容为数组   读取第一个
             eapi.name = mainEntityCode;
             eapi.proxyName = devkit_object_name_creator_1.DevkitObjectNameCreator.getDevkitObjectNameWithType("befProxy", __1.ToolHelper.tf(mainEntityCode));
             eapi.restUri = ui.module.schemas[0].sourceUri;
-            // 针对通过vo创建的表单  不包含content节点 特殊处理
             if (eapi.Service && !eapi.Content) {
                 eapi.Content = {};
                 eapi.Content.Service = eapi.Service;
@@ -457,4 +344,3 @@ class FormFileExecutor {
 }
 exports.FormFileExecutor = FormFileExecutor;
 FormFileExecutor.instance = new FormFileExecutor();
-//# sourceMappingURL=form-file-executor.js.map

package/lib/utility/devkit/form-resource-json-reader.js

@@ -2,25 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormResourceJsonReader = void 0;
 const file_operation_1 = require("../file-operation");
-/**
- * 表单资源文件读取
- *
- * @export
- * @class FormResourceJsonReader
- */
 class FormResourceJsonReader {
-    /**
-     * 构造国际化资源文件
-     *
-     * @static
-     * @param {string} formResourceJsonFileNameNoExtension
-     * @param {string} basePath
-     * @memberof FormResourceJsonReader
-     */
     static read(formResourceJsonFileNameNoExtension, basePath) {
         const formResourceJson = file_operation_1.FileOperationManager.read(basePath, formResourceJsonFileNameNoExtension, file_operation_1.FileOperationType.Resource);
         if (formResourceJson) {
-            // 默认为中文显示
             const ctrlLangs = {
                 "zh-CHS": {}
             };
@@ -34,4 +19,3 @@ class FormResourceJsonReader {
     }
 }
 exports.FormResourceJsonReader = FormResourceJsonReader;
-//# sourceMappingURL=form-resource-json-reader.js.map

package/lib/utility/devkit/handlers-creator.js

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandlersCreator = void 0;
-/**
- * 表单handler构造
- *
- * @export
- * @class HandlersCreator
- */
 class HandlersCreator {
     constructor() { }
     static getNewInstance() {
@@ -42,4 +36,3 @@ class HandlersCreator {
     }
 }
 exports.HandlersCreator = HandlersCreator;
-//# sourceMappingURL=handlers-creator.js.map

package/lib/utility/devkit/index.js

@@ -16,4 +16,3 @@ __exportStar(require("./component-farris-datagrid-parameter"), exports);
 __exportStar(require("./component-sidebar-toolbar"), exports);
 __exportStar(require("./component-farris-lookup-parameter"), exports);
 __exportStar(require("./component-number-spinner-range-creator"), exports);
-//# sourceMappingURL=index.js.map

package/lib/utility/devkit/lookup-type-creator-factory.js

@@ -3,30 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LookupTypeCreatorFactory = void 0;
 class LookupTypeCreatorFactory {
     constructor() { }
-    /**
-     * 判断是否是lookup  类型为LookupEdit，根据lookupStyle来确认采用何种LookupEdit
-     *
-     * @param {*} type
-     * @returns {boolean}
-     * @memberof LookupTypeCreatorFactory
-     */
     static isLookup(type) {
         return type && (type === "LookupEdit");
     }
-    /**
-     * 根据类型和lookupStyle 返回具体的类型
-     *
-     * @param {any} type
-     * @param {any} lookupStyle
-     * @returns {string}
-     * @member LookupTypeCreatorFactory
-     */
     static create(type, lookupStyle) {
         let lookupType;
         const popupType = "LookupEdit";
         const combolistType = "FarrisComboLookup";
         const combolistLookupStyle = "combolist";
-        // 只处理lookup类型的combolist 和 popup
         if (type && (type === "LookupEdit")) {
             if (lookupStyle && lookupStyle === combolistLookupStyle) {
                 lookupType = combolistType;
@@ -39,4 +23,3 @@ class LookupTypeCreatorFactory {
     }
 }
 exports.LookupTypeCreatorFactory = LookupTypeCreatorFactory;
-//# sourceMappingURL=lookup-type-creator-factory.js.map

package/lib/utility/devkit/module-creator.js

@@ -8,43 +8,18 @@ class ModuleCreator {
     static getNewInstance() {
         return new ModuleCreator();
     }
-    /**
-     *  构造Module 实体
-     *
-     * @param {{
-     *         code: string,
-     *         ctrlLangs: any,
-     *         viewmodels: any,
-     *         repository: any,
-     *         ip: string,
-     *         port: string,
-     *         serviceRefs: any,
-     *         commands: any,
-     *         isGroupForm: boolean
-     *     }} obj  obj.code =moduleCode
-     * @returns
-     * @memberof ModuleCreator
-     */
     createModule(obj) {
         const isGroupForm = obj.isGroupForm ? obj.isGroupForm : false;
-        // module 依赖
-        const arrDependencies = [
-        //  { "name": obj.repository.name, "path": "./models/" + ToolHelper.toLowerCase(obj.repository.name) }
-        ];
-        // module  imports
+        const arrDependencies = [];
         const arrImports = [];
         const arrDeclarations = [];
         const arrExports = [];
         const arrEntryComponents = [];
-        // 被组合表单只引用repository
-        // 非组合表单需要引入routing
         if (isGroupForm) {
         }
         const routingModuleName = devkit_object_name_creator_1.DevkitObjectNameCreator.getDevkitObjectNameWithType("rt", obj.code);
         arrDependencies.push({ "name": routingModuleName, "path": "./routing" });
         arrImports.push({ "name": routingModuleName, "usePrefix": true });
-        // }
-        // 确认是否依赖DIP模块
         if (toolhepler_1.ToolHelper.isArray(obj.serviceRefs, false)) {
             obj.serviceRefs.forEach((serviceReference) => {
                 if (serviceReference.path == "@gsp-dip/data-imp-exp") {
@@ -57,7 +32,6 @@ class ModuleCreator {
                 }
             });
         }
-        // 对于自定义模块引入
         if (toolhepler_1.ToolHelper.isArray(obj.extraImports, false)) {
             obj.extraImports.forEach((extraImport) => {
                 const useprefix = toolhepler_1.ToolHelper.isNullOrUndefined(extraImport["usePrefix"]) ? true : extraImport["usePrefix"];
@@ -70,13 +44,11 @@ class ModuleCreator {
                 }
             });
         }
-        // 将依赖component 增加引用
         if (toolhepler_1.ToolHelper.isArray(obj.viewmodels, false)) {
             obj.viewmodels.forEach((item) => {
                 if (item.component) {
                     arrDependencies.push({ name: item.component.name, path: this.moduleDependencyComponentPath(item.component) });
                     arrDeclarations.push(item.component.name);
-                    // 只针对主表单
                     if (item.component.componentType == "Frame" || item.component.dynamic == true) {
                         arrExports.push({ "name": item.component.name });
                         arrEntryComponents.push({ "name": item.component.name });
@@ -84,21 +56,17 @@ class ModuleCreator {
                 }
             });
         }
-        // 针对内部component 如果包含modalContainer  则注入到entryComponents中
         if (toolhepler_1.ToolHelper.isArray(obj.innerComponents, false)) {
             obj.innerComponents.forEach((item) => {
                 if (item && item.type == "ModalContainer") {
                     if (item.relativeComponentId) {
                         item.name = toolhepler_1.ToolHelper.tf(item.relativeComponentId);
-                        // arrDependencies.push({ name: item.name, path: "./components/" + ToolHelper.toLowerCase(item.relativeComponentId) + "/" + ToolHelper.toLowerCase(item.name) });
                         arrEntryComponents.push({ "name": item.name });
                     }
                 }
             });
         }
         if (obj.eapi) {
-            // BEF Proxy 代理import
-            // arrDependencies.push({ "name": obj.repository.name.substring(0, obj.repository.name.length - 10) + "Proxy", "path": './models/' + obj.repository.name.toLowerCase().substring(0, obj.repository.name.length - 10) + "proxy" });
         }
         const moduleConfig = {
             code: obj.code,
@@ -107,9 +75,6 @@ class ModuleCreator {
             imports: arrImports,
             providers: [
                 { provide: 'BE_SERVER_URI_TOKEN', useFactory: "function () { return `${window.location.protocol}//${window.location.hostname}:${window.location.port}`; }" },
-                // 暂时屏蔽 待ng7 升级 再放开
-                // { provide: 'Server_Host', useFactory: "function () { return `${window.location.protocol}//${window.location.hostname}:${window.location.port}`; }" },
-                // { name: obj.repository.name }
             ],
             exports: arrExports,
             ctrlLangs: obj.ctrlLangs,
@@ -119,11 +84,7 @@ class ModuleCreator {
             beforeTemplateScript: obj.beforeTemplateScript
         };
         if (obj.eapi) {
-            // NewTemplateBERepository 更改成Proxy形式NewTemplateBEProxy
-            // moduleConfig.providers.push(
-            // { name: obj.repository.name.substring(0, obj.repository.name.length - 10) + "Proxy" });
         }
-        // 如果是否联查属性为true
         if (obj.isJointSearch) {
             moduleConfig.isJointSearch = obj.isJointSearch;
         }
@@ -142,17 +103,8 @@ class ModuleCreator {
         moduleConfig.isProgressStep = obj.isProgressStep;
         return moduleConfig;
     }
-    /**
-     * 模块依赖的component 路径生成
-     *
-     * @private
-     * @param {*} component
-     * @returns {string}
-     * @memberof ModuleCreator
-     */
     moduleDependencyComponentPath(component) {
         return "./components/" + toolhepler_1.ToolHelper.toLowerCase(component.id) + "/" + toolhepler_1.ToolHelper.toLowerCase(component.name);
     }
 }
 exports.ModuleCreator = ModuleCreator;
-//# sourceMappingURL=module-creator.js.map

package/lib/utility/devkit/repository-creator.js

@@ -10,13 +10,6 @@ class RepositoryCreator {
     static getNewInstance() {
         return new RepositoryCreator();
     }
-    /**
-     * 根据viewModels创建repository
-     *  viewModel中增加state 变量
-     *
-     * @param {*} repositoryParameter
-     * @returns
-     */
     createRepository(repositoryParameter) {
         const viewModels = repositoryParameter.viewModels;
         const remoteStates = [];
@@ -32,12 +25,10 @@ class RepositoryCreator {
                             }
                         });
                     }
-                    // if (viewModel.pagination && viewModel.pagination.enable == true) {
                     const pagination = this.createPagination(viewModel, repositoryParameter.entities);
                     if (pagination) {
                         paginations.push(pagination);
                     }
-                    // }
                 }
             });
         }
@@ -52,30 +43,14 @@ class RepositoryCreator {
             includeProxyReference: repositoryParameter.eapi == null ? false : true
         };
     }
-    /**
-     * 创建repository对应得分页信息
-     *
-     * @private
-     * @param {*} viewModel
-     * @param {any[]} entities
-     * @memberof RepositoryCreator
-     */
     createPagination(viewModel, entities) {
         const bindTo = viewModel.bindTo;
         const paginationEntityInfo = entities_creator_1.EntitiesCreator.getSingleInstance().getEntityByUri(entities, bindTo, 0);
         if (paginationEntityInfo) {
-            // 调整主实体的label值
             this.modifyPaginationEntityInfo(paginationEntityInfo);
             return new viewmodel_parameter_1.ViewModelPaginationParameter(paginationEntityInfo.label, viewModel.pagination, paginationEntityInfo.layer);
         }
     }
-    /**
-     * 调整主实体的label值
-     *
-     * @private
-     * @param {*} paginationEntityInfo
-     * @memberof RepositoryCreator
-     */
     modifyPaginationEntityInfo(paginationEntityInfo) {
         if (paginationEntityInfo.layer == 0) {
             paginationEntityInfo.label = devkit_object_name_creator_1.DevkitObjectNameCreator.getDevkitObjectNameWithType("e", toolhepler_1.ToolHelper.tf(paginationEntityInfo.code));
@@ -83,4 +58,3 @@ class RepositoryCreator {
     }
 }
 exports.RepositoryCreator = RepositoryCreator;
-//# sourceMappingURL=repository-creator.js.map