@farris/jit-engine 1.3.58 → 1.3.62-dev2

package/lib/task/recursiveGenerateDevkit.js

@@ -35,12 +35,6 @@ const farris_datagrid_template_1 = require("./farris-datagrid-template");
 const form_jiexi_generator_manager_1 = require("../utility/template-generator/form-jiexi/form-jiexi-generator-manager");
 const expression_1 = require("../utility/expression");
 const path = __importStar(require("path"));
-/**
- * 递归生成devkit
- *
- * @export
- * @class RecursiveGenerateDevkit
- */
 class RecursiveGenerateDevkit {
     constructor(generator, domGenerator, isQdpForm = false) {
         this.isQdpForm = false;
@@ -48,11 +42,6 @@ class RecursiveGenerateDevkit {
         this.domGenerator = domGenerator;
         this.isQdpForm = isQdpForm;
     }
-    /**
-     * 根据context递归生成devkit
-     *
-     * @param generateParam
-     */
     recursiveGenerateDevkit(generateParam) {
         this.recursiveGenerateDevkitObject({
             obj: generateParam.obj,
@@ -65,21 +54,12 @@ class RecursiveGenerateDevkit {
             layer: generateParam.layer
         });
     }
-    /**
-     * 递归生成devkit  object
-     *
-     * @param devkitParam
-     */
     recursiveGenerateDevkitObject(devkitParam) {
-        // 如果当前对象不存在可遍历的属性 那么退出当前递归
         if (RecursiveGenerateDevkit.canRecursiveDevkitObject(devkitParam.obj) == false) {
             return;
         }
-        // 递归对象中的所有可枚举的属性
         Object.keys(devkitParam.obj).forEach(key => {
-            //  不循环component中的parentExternalComponent属性
             if (devkitParam.obj[key] && (key !== "parentExternalComponent" && key != utility_1.DevkitConstant.ViewModelName)) {
-                // 如果数据类型为数组
                 if (utility_1.ToolHelper.isArray(devkitParam.obj[key], true) === true) {
                     devkitParam.obj[key].forEach((item) => {
                         this.generateHtmlOrDevkitWithSpecialValue({
@@ -109,45 +89,25 @@ class RecursiveGenerateDevkit {
             }
         });
     }
-    /**
-     * 判断是否是否存在可枚举的属性
-     *  只有不为null 且不为字符串
-     * @param {*} obj
-     * @returns {boolean}
-     */
     static canRecursiveDevkitObject(obj) {
         return obj && typeof obj !== "string";
     }
-    /**
-     * 根据数据生成 Devkit及其关联的HTML
-     *
-     * @returns
-     * @param generateParam
-     */
     generateHtmlOrDevkitWithSpecialValue(generateParam) {
         const className = utility_1.ToolHelper.getClassName(generateParam.value);
-        // 如果当前是组合表单 根据className是否是组合表单类型来进行判断
         if (generateParam.value && generateParam.value.metaDataDevkit && generateParam.value.metaDataDevkit.devkit && className_isExternalcomponent_checker_1.ClassNameIsExternalComponentChecker.isExternalComponentClass(className) == true) {
-            // 生成组合表单
             this.generateExternalComponent(generateParam, className);
             return;
         }
-        // 只有为devkit的时候执行frm_code的赋值  针对具体的表单值
         if (generateParam.value.module && generateParam.value.module.code && className == utility_1.DevkitConstant.DevkitClassName) {
             generateParam.frm_code = generateParam.value.module.code.toLowerCase();
             if (generateParam.value.isApproveFormat) {
                 generateParam.frm_code = generateParam.value.formCode.toLowerCase();
             }
             utility_1.LoggerHelper.log(`generate source code with form:${generateParam.frm_code}`, utility_1.LoggerLevel.Info);
-            // 移除解析表单遗留的services目录
             this.deleteServicesFolder(generateParam);
-            // 针对不是组合表单的表单 层级设置为0 重点
             if (generateParam.isGroupForm == false) {
                 generateParam.layer = 0;
             }
-            // 如果执行的是表单解析  那么执行解析工程代码生成
-            // 两层参数守护 如果加了内层参数 那么外层参数可以放弃
-            // 如果为解析型表单 那么需要将对应的代码移除 避免出现非解析型表单向解析型表单转换而多出来一些无效代码 导致编译失败问题
             if (generateParam.value.enableFormJieXi || generateParam.metaDataConfig.isJieXiForm) {
                 form_jiexi_generator_manager_1.FormJieXiGeneratorManager.generate(generateParam.value, generateParam.metaDataConfig, {
                     publishPath: generateParam.publishPath,
@@ -183,51 +143,38 @@ class RecursiveGenerateDevkit {
                     frm_code: generateParam.frm_code,
                     projectName: generateParam.metaDataConfig.projectName
                 };
-                // 将生成html文件内容调整此处
                 if (className == "ComponentConfig") {
-                    // 生成对应的Html内容
                     generatedComponentHtml = this.generateComponentHtml(generateParam, publishConfig);
-                    // 生成对应的空scss文件
                     this.createEmptyScssFile(generateParam, publishConfig);
                 }
-                // 针对组合表单的选择特殊处理 只针对组合表单的Frame
                 this.modifyExternalComponentParam(className, generateParam.isGroupForm, generateOptions, generateParam.externalComponentType, generateParam.frm_code);
-                // 针对组合表单 需要调整子路由path
                 if (generateParam.isGroupForm && className == "Routing") {
                     const groupFormRoutePage = generateParam.metaDataConfig.projectPages.pages.find((page) => {
                         return page.code.toLowerCase() == generateParam.frm_code.toLowerCase();
                     });
                     if (groupFormRoutePage && utility_1.ToolHelper.isArray(groupFormRoutePage.children, false)) {
-                        // 调整组合表单的路由path
                         groupFormRoutePage.children.forEach((child) => {
                             child.relativePath = utility_1.ExternalComponentChildRoutingPathGenerator.generate(child.code, generateParam.layer);
                         });
-                        // 设置当前组合表单路由变量
                         generateOptions.devkit.currentPageInfo = groupFormRoutePage;
                     }
                 }
-                // 复制表单对应的i18n文件到源代码目录
                 if (className == "Module") {
                     utility_1.I18nResourceManager.copyI18nFolder(generateParam.metaDataConfig.metaDataPath, generateParam.frm_code, generateParam.publishPath, generateParam.metaDataConfig.projectName, generateParam.isGroupForm);
                     expression_1.ExpressionManager.copyExpression(generateParam.metaDataConfig.metaDataPath, generateParam.frm_code, generateParam.publishPath, generateParam.metaDataConfig.projectName, generateParam.isGroupForm);
                 }
-                // 根据生成参数调用生成器执行代码生成
                 generateOptions.devkit['isQdpForm'] = this.isQdpForm;
                 if (generateParam.isGroupForm) {
-                    // 针对扩展表单 更改其生成的文件名及类名
                     const devkitClassNameModifier = devkit_className_modifier_ts_1.DevkitClassNameModifierFactory.getInstance().create(className);
                     if (devkitClassNameModifier) {
                         devkitClassNameModifier.modify(generateOptions.devkit, generateParam.frm_code, generateParam.moduleCode);
                     }
                 }
                 generateOptions.devkit['isGroupForm'] = generateParam.isGroupForm;
-                // 如果是component 参数传递增加html
                 if (className == utility_1.DevkitConstant.ComponentClassName && generateParam.metaDataConfig.isRuntime) {
                     generateOptions.componentHtml = generatedComponentHtml;
                 }
-                // 验证是否允许生成
                 if (utility_1.JITGenerateIgnoreManager.getInstance().canGenerate(utility_1.ToolHelper.pathJoinAndnormalize(generateOptions.generatePath, generateOptions.generateFileName), generateParam.metaDataConfig.publishPath, generateParam.metaDataConfig.projectName, generateParam.frm_code)) {
-                    // 当前仅针对模块引入
                     const templateType = utility_1.DevkitClassNameTemplateTypeConvertor.convert(className);
                     if (generateParam.metaDataConfig.useNewTemplate && templateType) {
                         utility_1.TemplateGeneratorManager.generate(generateOptions, templateType, generateParam.metaDataConfig);
@@ -251,10 +198,6 @@ class RecursiveGenerateDevkit {
             });
         }
     }
-    /**
-     * 移除services目录 主要是为了去除解析表单遗留下来的脚本文件
-     * @param generateParam
-     */
     deleteServicesFolder(generateParam) {
         try {
             const generatePath = utility_1.JitPathHelper.getProjectAppPath(generateParam.metaDataConfig.publishPath, generateParam.metaDataConfig.projectName);
@@ -265,74 +208,30 @@ class RecursiveGenerateDevkit {
             utility_1.LoggerHelper.log(e, utility_1.LoggerLevel.Info);
         }
     }
-    /**
-     * 针对component  生成对应的空scss文件
-     *
-     * @private
-     * @param {*} generateParam
-     * @param {*} publishConfig
-     * @memberof RecursiveGenerateDevkit
-     */
     createEmptyScssFile(generateParam, publishConfig) {
-        // 仅在非运行时定制情况下生成scss文件  由于babel编译当前
         if (generateParam.metaDataConfig.createEmptyScssFile && generateParam.metaDataConfig.isRuntime == false) {
-            // 生成空的scss文件
             utility_1.TemplateGeneratorManager.generate({ generatePath: publishConfig.path, generateFileName: publishConfig.scssFileName, customComponentClass: generateParam.value.customComponentClass }, utility_1.TemplateType.AppComponentScss, generateParam.metaDataConfig);
         }
     }
-    /**
-     * 执行表达式文件复制
-     *
-     * @private
-     * @param {string} sourceBasePath
-     * @param {string} formModuleCode
-     * @param {string} targetBasePath
-     * @param {string} projectName
-     * @param {boolean} isGroupForm
-     * @memberof RecursiveGenerateDevkit
-     */
     copyExpression(sourceBasePath, formModuleCode, targetBasePath, projectName, isGroupForm) {
-        // 组合表单无需进行文件拷贝
         if (isGroupForm) {
             return;
         }
         const sourcePath = `${sourceBasePath}/expressions/${formModuleCode.toLowerCase()}/expressions`;
         let targetPath;
         targetPath = `${targetBasePath}/projects/${projectName}/src/app/${formModuleCode.toLowerCase()}/expressions`;
-        // 只有源文件夹存在时进行拷贝
         if (utility_1.DirectoryFileHelper.isExists(sourcePath)) {
             utility_1.DirectoryFileHelper.copyDir(sourcePath, targetPath, (error) => {
                 utility_1.LoggerHelper.log(`copy expression folder failed, the path is ${sourcePath}, error message is ${error}`);
             });
-            // if (DirectoryFileHelper.isExists(targetPath)) {
-            //     const files = DirectoryFileHelper.getFilesInDir(targetPath);
-            //     if (ToolHelper.isArray(files, false)) {
-            //         files.map((file: string) => {
-            //             const fileContent = DirectoryFileHelper.readFile(ToolHelper.pathJoinAndnormalize(targetPath, file));
-            //             const i18nVersionKey = `${formModuleCode.toLocaleLowerCase()}/${file.toLocaleLowerCase()}`;
-            //             // 更新资源文件的版本
-            //             BuildFileVersionManager.updateBuildFileVersionWithFileContent(BuildFileVersionContants.I18nCategory, i18nVersionKey, fileContent);
-            //         });
-            //     }
-            // }
         }
     }
-    /**
-     * 生成组件对应的html内容
-     *
-     * @private
-     * @param {{ value: any; publishPath: string; frm_code: string; isGroupForm: boolean; externalComponentType: string; moduleCode: string; metaDataConfig: JitInputOptions; }} generateParam
-     * @param {*} publishConfig
-     * @memberof RecursiveGenerateDevkit
-     */
     generateComponentHtml(generateParam, publishConfig) {
         const farrisSidebarHtml = new farrissidebar_html_1.FarrisSideBarHtml();
-        // datagrid 模板
         const farrisDataGridHtml = [];
         const sectionHtml = new domstructure_1.SectionHtml();
         let html = this.recursiveAssembleTemplate(generateParam.value.template, null, farrisSidebarHtml, sectionHtml, farrisDataGridHtml, false);
         if (farrisSidebarHtml && farrisSidebarHtml.html && farrisSidebarHtml.html.length > 0) {
-            // 针对侧边栏html 进行替换
             html = html + farrisSidebarHtml.html;
         }
         if (utility_1.ToolHelper.isArray(farrisDataGridHtml, false)) {
@@ -342,12 +241,9 @@ class RecursiveGenerateDevkit {
                 }
             });
         }
-        // 如果是运行时定制环境下  不再生成html文件 转而写入到ts文件中
-        // 仅仅在运行时定制场景下进行此操作
         if (generateParam.metaDataConfig.isRuntime) {
             return html;
         }
-        // 验证是否允许生成
         if (utility_1.JITGenerateIgnoreManager.getInstance().canGenerate(utility_1.ToolHelper.pathJoinAndnormalize(publishConfig.path, publishConfig.htmlFileName), generateParam.metaDataConfig.publishPath, generateParam.metaDataConfig.projectName, generateParam.frm_code)) {
             if (generateParam.metaDataConfig.formatCode) {
                 html = formatter_1.CodeFormatter.formatCode(html, formatter_1.FormatterType.html);
@@ -360,7 +256,6 @@ class RecursiveGenerateDevkit {
                     utility_1.DirectoryFileHelper.createFile(publishConfig.path, publishConfig.htmlFileName, html);
                 }
                 else {
-                    //  LoggerHelper.log(`file ${publishConfig.htmlFileName} not change, jit not recreate it !`);
                 }
             }
             else {
@@ -369,17 +264,8 @@ class RecursiveGenerateDevkit {
         }
         return;
     }
-    /**
-     * 生成组合表单
-     *
-     * @private
-     * @param {{ value: any; publishPath: string; frm_code: string; isGroupForm: boolean; externalComponentType: string; moduleCode: string; metaDataConfig: JitInputOptions; }} generateParam
-     * @param {string} className
-     * @memberof RecursiveGenerateDevkit
-     */
     generateExternalComponent(generateParam, className) {
         const devKit = new domstructure_1.Devkit(generateParam.value.metaDataDevkit.devkit);
-        // 渲染子级表单 如果存在组合表单的唯一标识containerId，那么使用containerId，否则使用表单Code
         const externalComponentUniqueCode = utility_1.ToolHelper.addPrefixWhenFirstNumber(external_component_uniquecode_creator_1.ExternalComponentUniqueCodeCreator.getCode(generateParam.value));
         const externalComponentPublishPath = utility_1.ExternalComponentPublishPathGenerator.generate(generateParam.publishPath, generateParam.metaDataConfig.projectName, generateParam.frm_code, externalComponentUniqueCode, generateParam.isGroupForm, utility_1.ExternalComponentConstant.DefaultExternalComponentFirstPath);
         this.recursiveGenerateDevkit({
@@ -393,29 +279,15 @@ class RecursiveGenerateDevkit {
             layer: ++generateParam.layer
         });
     }
-    /**
-     * 针对组合表单 进行FrameID的特殊处理
-     *
-     * @private
-     * @param {*} className
-     * @param {boolean} isGroupForm
-     * @param {{ devkit: any; templatePath: any; generatePath: any; generateFileName: any; className: any; }} generateOptions
-     * @param {string} externalComponentType 扩展表单类型
-     * @param {string} frm_code
-     * @memberof RecursiveGenerateDevkit
-     */
     modifyExternalComponentParam(className, isGroupForm, generateOptions, externalComponentType, frm_code) {
         if (className == "ComponentConfig" && isGroupForm == true && generateOptions.devkit.parentExternalComponent) {
             const parentExternalComponent = generateOptions.devkit.parentExternalComponent;
-            // 获取组合表单frameid对应前缀
             const externalComponentUniqueID = external_component_uniquecode_creator_1.ExternalComponentUniqueCodeCreator.getExternalComponentUniqueId({
                 containerId: parentExternalComponent.containerId,
                 externalComponentId: parentExternalComponent.id,
                 externalComponentType: externalComponentType
             });
             if (externalComponentType == "ModalContainer") {
-                // 只针对组合表单的Frame 确定是根组件
-                // 针对弹窗 弹窗ID与设置ID相同
                 if (generateOptions.devkit.componentType == "Frame") {
                     generateOptions.devkit.componentSelector = componentSelector_helper_1.ComponentSelectorHelper.getComponentSelector({
                         "externalComponentCode": externalComponentUniqueID,
@@ -424,20 +296,17 @@ class RecursiveGenerateDevkit {
                     });
                     generateOptions.devkit.componentSelector = utility_1.ToolHelper.tf(generateOptions.devkit.componentSelector).toLowerCase();
                 }
-                // 更改組合表单内部的frameID
                 generateOptions.devkit.componentFrameID = componentFrameID_helper_1.ComponentFrameIDHelper.getComponentFrameID({
                     "externalComponentCode": externalComponentUniqueID,
                     "moduleCode": frm_code,
                     "frameID": generateOptions.devkit.id
                 });
-                // 构造组件对应的namespace  为frameID前缀
                 generateOptions.devkit.componentNameSpace = componentFrameID_helper_1.ComponentFrameIDHelper.getComponentNameSpace({
                     "externalComponentCode": externalComponentUniqueID,
                     "moduleCode": frm_code
                 });
             }
             else {
-                // 只针对组合表单的Frame 确定是根组件
                 if (generateOptions.devkit.componentType == "Frame") {
                     generateOptions.devkit.componentSelector = componentSelector_helper_1.ComponentSelectorHelper.getComponentSelector({
                         "externalComponentCode": externalComponentUniqueID,
@@ -446,13 +315,11 @@ class RecursiveGenerateDevkit {
                     });
                     generateOptions.devkit.componentSelector = utility_1.ToolHelper.tf(generateOptions.devkit.componentSelector).toLowerCase();
                 }
-                // 更改組合表单内部的frameID
                 generateOptions.devkit.componentFrameID = componentFrameID_helper_1.ComponentFrameIDHelper.getComponentFrameID({
                     "externalComponentCode": externalComponentUniqueID,
                     "moduleCode": frm_code,
                     "frameID": generateOptions.devkit.id
                 });
-                // 构造组件对应的namespace  为frameID前缀
                 generateOptions.devkit.componentNameSpace = componentFrameID_helper_1.ComponentFrameIDHelper.getComponentNameSpace({
                     "externalComponentCode": externalComponentUniqueID,
                     "moduleCode": frm_code
@@ -460,24 +327,11 @@ class RecursiveGenerateDevkit {
             }
         }
     }
-    /**
-     * 递归 根据模板生成HTML 字符串
-     *
-     * @param {*} obj
-     * @param {any[]} children
-     * @param farrisSidebarHtml
-     * @param sectionHtml
-     * @param farrisDataGridTemplateHtml
-     * @param isPTreeTable
-     * @returns
-     */
     recursiveAssembleTemplate(obj, children, farrisSidebarHtml, sectionHtml, farrisDataGridTemplateHtml, isPTreeTable) {
-        // 如果子级对象不为空 且子级对象长度大于0
         if (children && children.length) {
             let htmlStr = '';
             children.forEach((item) => {
                 const html = this.generateHtmlWithTemplate(item, farrisSidebarHtml, sectionHtml, farrisDataGridTemplateHtml, isPTreeTable);
-                // 如果读取到的字符串不为空 那么追加
                 if (html && html.length > 0) {
                     htmlStr += html;
                 }
@@ -485,12 +339,10 @@ class RecursiveGenerateDevkit {
             return htmlStr;
         }
         else {
-            // 加入数组的目的是为了适应qdp表单 组合表单结构
             if (utility_1.ToolHelper.isArray(obj, true)) {
                 let htmlStr = '';
                 obj.forEach((item) => {
                     const html = this.generateHtmlWithTemplate(item, farrisSidebarHtml, sectionHtml, farrisDataGridTemplateHtml, isPTreeTable);
-                    // 如果读取到的字符串不为空 那么追加
                     if (html && html.length > 0) {
                         htmlStr += html;
                     }
@@ -502,33 +354,20 @@ class RecursiveGenerateDevkit {
             }
         }
     }
-    /**
-     * 根据模板信息生成HTML
-     *
-     * @param {*} value
-     * @param farrisSidebarHtml
-     * @param sectionHtml
-     * @param farrisDataGridTemplateHtml
-     * @param isPTreeTable
-     * @returns {*}
-     */
     generateHtmlWithTemplate(value, farrisSidebarHtml, sectionHtml, farrisDataGridTemplateHtml, isPTreeTable) {
         const className = utility_1.ToolHelper.getClassName(value);
         if (config.domTemplateConfig[className]) {
-            // 提前构造侧边栏 toolbar  应用于新列表 卡片模板
             if (className == "FarrisSideBar") {
                 if (!value.farrisSidebarToolbar && value.toolbar) {
                     farrisSidebarHtml.toolbarHtml = this.recursiveAssembleTemplate(value.toolbar, null, farrisSidebarHtml, sectionHtml, farrisDataGridTemplateHtml, false);
                     value.farrisSidebarToolbar = farrisSidebarHtml.toolbarHtml;
                 }
             }
-            // 如果只包含externalContainer 并没有引入表单
             if (className == "ExternalContainer") {
                 if (!value.externalCmp) {
                     return "";
                 }
             }
-            // 处理section  中的views节点
             if (className == "Section" && value && value.views) {
                 value.viewsDom = this.domGenerator.generate({
                     templatePath: config.domTemplateConfig["ViewChange"].template,
@@ -542,8 +381,6 @@ class RecursiveGenerateDevkit {
             else {
                 html = this.domGenerator.generate({ templatePath: config.domPTreeTableTemplateConfig[className].template, uiDom: value });
             }
-            // 针对datagrid  模板特殊处理
-            // 针对树模板和datagrid模板进行同样的处理
             if (className == "FarrisDataGrid" || className == "TreeGrid") {
                 const templateHtml = this.domGenerator.generate({
                     templatePath: config.domTemplateConfig["FarrisDataGridTemplate"].template, uiDom: value
@@ -556,14 +393,12 @@ class RecursiveGenerateDevkit {
             }
             if (className == "FarrisSideBar") {
                 if (value.createType == "internal") {
-                    // 由于sidebar需要插入至最外层html
                     if (farrisSidebarHtml) {
                         farrisSidebarHtml.html = html;
                     }
                     return "";
                 }
             }
-            // 针对wizardDetail headerTemplate特殊处理
             if (className == "Wizard" && value.header && utility_1.ToolHelper.isArray(value.header.contents, false)) {
                 const wizardHeaderTemplateHtml = this.recursiveAssembleTemplate(null, value.header.contents, farrisSidebarHtml, sectionHtml, farrisDataGridTemplateHtml, false);
                 if (wizardHeaderTemplateHtml && wizardHeaderTemplateHtml.length > 0) {
@@ -572,7 +407,6 @@ class RecursiveGenerateDevkit {
             }
             let subHtml;
             if (value.contents && value.contents.length) {
-                // 如果为可编辑树列表
                 if (className == "PTreeTable") {
                     subHtml = this.recursiveAssembleTemplate(null, value.contents, farrisSidebarHtml, sectionHtml, farrisDataGridTemplateHtml, true);
                 }
@@ -591,7 +425,6 @@ class RecursiveGenerateDevkit {
             return html;
         }
         else {
-            // tab放置于component中  针对不需要生成html的class  不显示提示信息
             if (className != "TabToolbarItem" && className != "ModalContainer" && className != "TabToolbar") {
                 utility_1.LoggerHelper.log(`unknown ui template type,the type is :${className}`, utility_1.LoggerLevel.Warning);
             }
@@ -600,4 +433,3 @@ class RecursiveGenerateDevkit {
     }
 }
 exports.RecursiveGenerateDevkit = RecursiveGenerateDevkit;
-//# sourceMappingURL=recursiveGenerateDevkit.js.map

package/lib/template/ui/kendo/farris-progress-step.pug

@@ -7,7 +7,7 @@ if (variable.stepsMessage && variable.stepsMessage.type == 'Variable')
   -attrs['[steps]'] = variable.stepsMessage.value;
 if (variable.currentId && variable.currentId.type == 'Variable')
   -attrs['[currentId]'] = variable.currentId.value;
-farris-progress-step(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  'direction'=variable.direction?variable.direction:undefined '[fill]'=(variable.fill || variable.fill==false)?variable.fill+"":undefined '(step-click)'=variable.stepClick?variable.stepClick:undefined '[clickable]'=(variable.clickable || variable.clickable==false)?variable.clickable+"":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[stepsCls]'=variable.stepsCls?"'"+variable.stepsCls+"'":undefined '[stepStyle]'=variable.stepStyle?"'{"+variable.stepStyle+"}'":undefined )&attributes(attrs)
+farris-progress-step(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  'direction'=variable.direction?variable.direction:undefined '[fill]'=(variable.fill || variable.fill==false)?variable.fill+"":undefined '(step-click)'=variable.stepClick?variable.stepClick:undefined '[clickable]'=(variable.clickable || variable.clickable==false)?variable.clickable+"":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[stepsCls]'=variable.stepsCls?"'"+variable.stepsCls+"'":undefined '[stepStyle]'=variable.stepStyle?""+variable.stepStyle:undefined )&attributes(attrs)
   if(variable.extendTemplate )
     ng-template(progressStepExtend  let-step="step" let-i="index" let-length="length"
       let-activeIndex="activeIndex" let-direction="direction" )

package/lib/template/ui/kendo/farris-wizard-page-detail.pug

@@ -1,4 +1,4 @@
-wizard-page-detail(id=variable.replacedId?""+variable.replacedId:undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  '(pagedetailSelected)'=(variable.pageDetailSelected ? variable.pageDetailSelected+"":undefined) )
+wizard-page-detail(id=variable.replacedId?""+variable.replacedId:undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  '(pagedetailSelected)'=(variable.pageDetailSelected ? variable.pageDetailSelected+"":undefined)  '*ngIf'!=variable.visible?variable.visible.value+'':undefined)
   if(variable.headerTemplate)
     ng-template(wizardPageHeader)
       if(variable.headerTemplate.contents && variable.headerTemplate.contents.length)

package/lib/template/ui/kendo/farris-wizard.pug

@@ -1,4 +1,4 @@
-farris-wizard(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[currentPageId]'=variable.currentPageId?"'"+variable.currentPageId+"'":undefined '[progressData]'=variable.progressDataLang?variable.progressDataLang+"":undefined  '[stepClickable]'=(variable.stepClickable||variable.stepClickable==false)?variable.stepClickable+'':undefined '[fill]'=(variable.fill||variable.fill==false)?variable.fill+'':undefined '[stepDirection]'=variable.stepDirection?"'"+variable.stepDirection+"'":undefined  '[stepPosition]'=variable.stepPosition?"'"+variable.stepPosition+"'":undefined  '(stateChange)'=variable.stateChange?variable.stateChange+"":undefined   '[storedIndex]'=(variable.storedIndex || variable.storedIndex == false)?variable.storedIndex+"":undefined '[storedIndexState]'=(variable.storedIndexState || variable.storedIndexState == false)?""+variable.storedIndexState:undefined   '[subStepData]'!=variable.subStepData?variable.subStepData:undefined       )
+farris-wizard(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[currentPageId]'=variable.currentPageId?"'"+variable.currentPageId+"'":undefined '[progressData]'=variable.progressDataLang?variable.progressDataLang+"":undefined  '[stepClickable]'=(variable.stepClickable||variable.stepClickable==false)?variable.stepClickable+'':undefined '[fill]'=(variable.fill||variable.fill==false)?variable.fill+'':undefined '[stepDirection]'=variable.stepDirection?"'"+variable.stepDirection+"'":undefined  '[stepPosition]'=variable.stepPosition?"'"+variable.stepPosition+"'":undefined  '(stateChange)'=variable.stateChange?variable.stateChange+"":undefined   '[storedIndex]'=(variable.storedIndex || variable.storedIndex == false)?variable.storedIndex+"":undefined '[storedIndexState]'=(variable.storedIndexState || variable.storedIndexState == false)?""+variable.storedIndexState:undefined   '[subStepData]'!=variable.subStepData?variable.subStepData:undefined     '*ngIf'!=variable.visible?variable.visible.value+'':undefined  )
   if(variable.header)
     ng-template(wizardHeader)
       if(variable.header.contents && variable.header.contents.length)

package/lib/template/ui/kendo/lookup-employee.pug

@@ -53,6 +53,9 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
           '[mapFields]'=variable.mapFields?variable.mapFields:undefined
           '(tagRemoved)'!=variable.tagRemoved?variable.tagRemoved+"":undefined
           '(selectionsChange)'!=variable.selectionsChange?variable.selectionsChange+"":undefined
+          "[idField]"=variable.idField?"'"+variable.idField+"'":undefined
+          "[displayField]"=variable.textField?"'"+variable.textField+"'":undefined
+          "[formatFn]"=variable.formatterName?""+variable.formatterName:undefined
           '(inputClear)'!=variable.inputClear?variable.inputClear+"":undefined
         )&attributes(attrs)
         if (variable.needValid && variable.binding && variable.binding.path)

package/lib/template/ui/kendo/wizarddetailcontainer.pug

@@ -1,5 +1,5 @@
 
-wizard-page(id=variable.replacedId?""+variable.replacedId:undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[pageId]'="'"+variable.replacedId+"'"  '(pageSelected)'=variable.pageSelected?variable.pageSelected+"":undefined)
+wizard-page(id=variable.replacedId?""+variable.replacedId:undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[pageId]'="'"+variable.replacedId+"'"  '(pageSelected)'=variable.pageSelected?variable.pageSelected+"":undefined  '*ngIf'!=variable.visible?variable.visible.value+'':undefined)
   if(variable.contents && variable.contents.length)
     | {{content}}
   else if(variable.componentName)

package/lib/template/ui/mobilevue/calendar-input.pug

@@ -1,26 +1,26 @@
-fm-calendar-input(
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  v-if=variable.visible?variable.visible+"":"false"
-  v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
-  :modelValue=variable.modelValue ?variable.modelValue+"":undefined 
-  label=variable.title?variable.title:undefined 
-  placeholder=variable.placeholder?""+variable.placeholder:undefined 
-  :readonly!=variable.readonly?variable.readonly+"":undefined
-  :required!=variable.require?variable.require+"":undefined
-  :disabled!=variable.disabled?variable.disabled+"":undefined
-  :clearable!=variable.clearable?variable.clearable+"":undefined
-  input-align="right"
-  :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
-  :error-message!=variable.errorMessage
-  error-message-align=variable.errorMessage ? "right" : undefined
-  :firstDay=variable.firstDay?""+variable.firstDay:undefined 
-  view=variable.view?""+variable.view:undefined 
-  :mark=variable.mark?""+variable.mark:undefined 
-  :event=variable.event?""+variable.event:undefined 
-  :events=variable.events?""+variable.events:undefined 
-  :useLunar=variable.useLunar
-  type=variable.showType
-  @dayClick=variable.dayClick?""+variable.dayClick:undefined 
-  @render=variable.render?""+variable.render:undefined 
-)
+div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
+  fm-calendar-input(
+    style=(variable.appearance && variable.appearance.style)
+    class=variable.className
+    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
+    :modelValue=variable.modelValue ?variable.modelValue+"":undefined 
+    label=variable.title?variable.title:undefined 
+    placeholder=variable.placeholder?""+variable.placeholder:undefined 
+    :readonly!=variable.readonly?variable.readonly+"":undefined
+    :required!=variable.require?variable.require+"":undefined
+    :disabled!=variable.disabled?variable.disabled+"":undefined
+    :clearable!=variable.clearable?variable.clearable+"":undefined
+    input-align="right"
+    :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
+    :error-message!=variable.errorMessage
+    error-message-align=variable.errorMessage ? "right" : undefined
+    :firstDay=variable.firstDay?""+variable.firstDay:undefined 
+    view=variable.view?""+variable.view:undefined 
+    :mark=variable.mark?""+variable.mark:undefined 
+    :event=variable.event?""+variable.event:undefined 
+    :events=variable.events?""+variable.events:undefined 
+    :useLunar=variable.useLunar
+    type=variable.showType
+    @dayClick=variable.dayClick?""+variable.dayClick:undefined 
+    @render=variable.render?""+variable.render:undefined 
+  )

package/lib/template/ui/mobilevue/checkbox-group.pug

@@ -1,4 +1,6 @@
 -variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+-var attrs = variable.direction === 'vertical' ? {'#default': ''} : {'#value': ''}
+-var direction = variable.displayType === 'button' ? 'horizontal' : variable.direction
 div(class="fm-input-wrapper" v-if=variable.visible?undefined:"false")
   fm-input(
     class="fm-input-vertical"
@@ -8,7 +10,7 @@ div(class="fm-input-wrapper" v-if=variable.visible?undefined:"false")
     :error-message!=variable.errorMessage
     error-message-align=variable.errorMessage ? "right" : undefined
   )
-    template(#default)
+    template()&attributes(attrs)
       fm-checkbox-group(
         class=(variable.appearance && variable.appearance.class)
         style=(variable.appearance && variable.appearance.style)
@@ -18,6 +20,6 @@ div(class="fm-input-wrapper" v-if=variable.visible?undefined:"false")
         textField=variable.textField?""+variable.textField:undefined
         :readonly=variable.readonly?variable.readonly+"":undefined
         :disabled=variable.readonly?variable.readonly+"":undefined
-        :direction=variable.direction?variable.direction+"":undefined
+        direction=direction?direction+"":undefined
         type=variable.displayType?variable.displayType+"":undefined
       )

package/lib/template/ui/mobilevue/date-time-picker.pug

@@ -4,6 +4,7 @@ div(v-if=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
   fm-datetime-picker(
     style=(variable.appearance && variable.appearance.style)  
     class=(variable.appearance && variable.appearance.class)  
+    inputClass=variable.direction === 'vertical' ? "fm-input-vertical" : undefined
     v-if=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
     id=variable.id?""+variable.id:undefined 
     label=variable.title?""+variable.title:undefined 

package/lib/template/ui/mobilevue/list-view.pug

@@ -8,7 +8,7 @@ fm-listview(
   style=(variable.appearance && variable.appearance.style)  
   class=(variable.appearance && variable.appearance.class)  
   ref=variable.replacedId
-  :list-data="entityListData" 
+  :list-data=variable.data?""+variable.data:"entityListData" 
   :finished=finished
   :showFinishedText=showFinishedText
   :loading="uiState['listaviewState']['loadMoreLoading']"

package/lib/template/ui/mobilevue/lookup-input.pug

@@ -4,6 +4,7 @@ div(v-if=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
   fm-lookup-input(
     style=(variable.appearance && variable.appearance.style)  
     class=(variable.appearance && variable.appearance.class)  
+    inputClass=variable.direction === 'vertical' ? "fm-input-vertical" : undefined
     v-if=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
     id=variable.id?""+variable.id:undefined 
     label=variable.title?""+variable.title:undefined 

package/lib/template/ui/mobilevue/number.pug

@@ -4,7 +4,7 @@
 div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
   fm-input(
     style=(variable.appearance && variable.appearance.style)  
-    class=(variable.appearance && variable.appearance.class)  
+    class=variable.className
     id=variable.id?"" + variable.id:undefined 
     v-if=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
     v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 

package/lib/template/ui/mobilevue/picker.pug

@@ -4,6 +4,7 @@ div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
   fm-picker(
     style=(variable.appearance && variable.appearance.style)  
     class=(variable.appearance && variable.appearance.class)  
+    inputClass=variable.direction === 'vertical' ? "fm-input-vertical" : undefined
     v-if=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
     id=variable.title?""+variable.id:undefined 
     label=variable.title?""+variable.title:undefined