npm - @farris/jit-engine - Versions diffs - 1.3.124 → 1.3.128 - Mend

@farris/jit-engine 1.3.124 → 1.3.128

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

Files changed (316) hide show

package/lib/mobileapp/vue2/utility/vue-object-creator.js CHANGED Viewed

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

package/lib/task/devkit-className-modifier.ts/index.js CHANGED Viewed

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AbstractDevkitClassNameModifier"), exports);

package/lib/task/index.js CHANGED Viewed

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./interface"), exports);

package/lib/task/kendo-task.js CHANGED Viewed

@@ -159,7 +159,8 @@ KendoTask = __decorate([
     typescript_ioc_1.AutoWired,
     typescript_ioc_1.Singleton,
     typescript_ioc_1.Provides(interface_1.ITask),
-    __param(0, typescript_ioc_1.Inject), __param(1, typescript_ioc_1.Inject),
+    __param(0, typescript_ioc_1.Inject),
+    __param(1, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [generator_1.DomGenerator, generator_1.DevKitGenerator])
 ], KendoTask);
 exports.KendoTask = KendoTask;

package/lib/task/kendo-task.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"kendo-task.js","sourceRoot":"","sources":["../../src/task/kendo-task.ts"],"names":[],"mappings":"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~~EAAmB,~~WAAA,uBAAM,CAAA;qCAArB,wBAAY,EAAa,2BAAe;GAJtD,SAAS,CA2OrB;AA3OY,8BAAS"}
1	+ {"version":3,"file":"kendo-task.js","sourceRoot":"","sources":["../../src/task/kendo-task.ts"],"names":[],"mappings":"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"}

package/lib/task/recursiveGenerateDevkit.js CHANGED Viewed

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -105,7 +105,12 @@ class RecursiveGenerateDevkit {
                 generateParam.frm_code = generateParam.value.formCode.toLowerCase();
             }
             utility_1.LoggerHelper.log(`generate source code with form:${generateParam.frm_code}`, utility_1.LoggerLevel.Info);
-            this.deleteServicesFolder(generateParam);
+            if (generateParam.value.clearSourceCodeWhenGeneration) {
+                this.deleteFormCode(generateParam);
+            }
+            else {
+                this.deleteServicesFolder(generateParam);
+            }
             if (generateParam.isGroupForm == false) {
                 generateParam.layer = 0;
             }
@@ -209,6 +214,16 @@ class RecursiveGenerateDevkit {
             utility_1.LoggerHelper.log(e, utility_1.LoggerLevel.Info);
         }
     }
+    deleteFormCode(generateParam) {
+        try {
+            const generatePath = utility_1.JitPathHelper.getProjectAppPath(generateParam.metaDataConfig.publishPath, generateParam.metaDataConfig.projectName);
+            const formSourceCodePath = path.join(generatePath, generateParam.frm_code);
+            utility_1.DirectoryFileHelper.deleteFolderRecursive(formSourceCodePath, true, false);
+        }
+        catch (e) {
+            utility_1.LoggerHelper.log(e, utility_1.LoggerLevel.Info);
+        }
+    }
     createEmptyScssFile(generateParam, publishConfig) {
         if (generateParam.metaDataConfig.createEmptyScssFile && generateParam.metaDataConfig.isRuntime == false) {
             utility_1.TemplateGeneratorManager.generate({ generatePath: publishConfig.path, generateFileName: publishConfig.scssFileName, customComponentClass: generateParam.value.customComponentClass }, utility_1.TemplateType.AppComponentScss, generateParam.metaDataConfig);
@@ -378,7 +393,13 @@ class RecursiveGenerateDevkit {
             let html;
             if (isPTreeTable == false) {
                 if (value.editorType && value.editorType === editor_type_enum_1.EditorTypeEnum.Table) {
-                    html = this.domGenerator.generate({ templatePath: config.domTableTemplateConfig[className].template, uiDom: value });
+                    if (!config.domTableTemplateConfig[className]) {
+                        utility_1.LoggerHelper.log(`table表格布局中不存在类型:${className}配置，使用默认模板。`);
+                        html = this.domGenerator.generate({ templatePath: config.domTemplateConfig[className].template, uiDom: value });
+                    }
+                    else {
+                        html = this.domGenerator.generate({ templatePath: config.domTableTemplateConfig[className].template, uiDom: value });
+                    }
                 }
                 else {
                     html = this.domGenerator.generate({ templatePath: config.domTemplateConfig[className].template, uiDom: value });

package/lib/task/recursiveGenerateDevkit.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"recursiveGenerateDevkit.js","sourceRoot":"","sources":["../../src/task/recursiveGenerateDevkit.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"recursiveGenerateDevkit.js","sourceRoot":"","sources":["../../src/task/recursiveGenerateDevkit.ts"],"names":[],"mappings":"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"}

package/lib/template/ui/kendo/farris-file-upload-preview.pug CHANGED Viewed

@@ -25,7 +25,8 @@ f-file-upload-and-preview(id=variable.replacedId class=(variable.appearance && v
     '(fUploadDoneEvent)'=variable.fUploadDoneEvent?""+variable.fUploadDoneEvent:undefined
     '(fUploadRemovedEvent)'=variable.fUploadRemovedEvent?""+variable.fUploadRemovedEvent:undefined
     '[previewEnableRename]'=""+variable.previewEnableRename
-    '[previewDefaultRename]'=variable.previewDefaultRename?""+variable.previewDefaultRename:undefined
+    '[previewDefaultRename]'=variable.previewDefaultRename?"'"+variable.previewDefaultRename+"'":undefined
+    '[contentFill]'=variable.contentFill?""+variable.contentFill.value:undefined
       )
   if(variable.uploadAreaTemplate)
     ng-template(fFielUpload let-disabled="disabled")

package/lib/template/ui/kendo/spreadsheet.pug CHANGED Viewed

@@ -2,7 +2,7 @@
 -var attrs = {};
 -attrs['#'+variable.referenceId] = "";
 if(variable.isJointSearch)
-  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined  '(contextmenu)'="menuController.handleContextmenu($event,menuElement,qdpView,qdpViewElementRef)" '(click)'="menuController.handleClick(menuElement)"  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined  '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)
+  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[multiSheets]'=variable.multiSheets ? "'" + variable.multiSheets + "'" : undefined '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined  '(contextmenu)'="menuController.handleContextmenu($event,menuElement,qdpView,qdpViewElementRef)" '(click)'="menuController.handleClick(menuElement)"  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined  '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)
   qdp-search-join-menu('[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined  '#menu')
 else
-  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined   '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined   '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)
+  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[multiSheets]'=variable.multiSheets ? "'" + variable.multiSheets + "'" : undefined '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined   '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined   '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)

package/lib/template/ui/kendo/table/checkbox.pug CHANGED Viewed

@@ -1,87 +1,87 @@
 div(class="farris-input-wrap")
-    if(variable.isTextArea)
-      -var divAttr = {};
-      if(variable.readonly && variable.readonly.isComposite)
-        -divAttr["*ngIf"]="!"+variable.readonly.value;
-      else
-        -divAttr["*ngIf"]="viewModel.stateMachine['editable']";
-      div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?""+variable.readonly.value:undefined )&attributes(divAttr)
-        -var attrs = {};
-        if (variable.binding && variable.binding.type == 'Variable')
-          -attrs['[(ngModel)]'] = variable.binding.value;
-          -attrs['name'] = variable.replacedId;
-          -attrs['[ngModelOptions]'] = "{standalone:true}";
-        else if (variable.includeInLoopContainer==false)
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
-        else
-          -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.binding && variable.binding.path;
-          -attrs['name'] = variable.replacedId;
-          -attrs['[ngModelOptions]'] = "{standalone:true}";
-        input(id=variable.replacedId class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
-        if(variable.linkedLabelEnabled)
-          label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-          label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-        else
-          label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-          label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-        if (variable.needValid && variable.binding && variable.binding.path)
-          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-          validationMessage('[errors]'!=`${path}`  '[hidden]'="!viewModel.form.isShowValidationMsg"  )
-    else
-      div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?variable.readonly.value+"":undefined )
-        -var attrs = {};
-        if (variable.binding && variable.binding.type == 'Variable')
-          -attrs['[(ngModel)]'] = variable.binding.value;
-          -attrs['name'] = variable.replacedId;
-          -attrs['[ngModelOptions]'] = "{standalone:true}";
-        else if (variable.includeInLoopContainer==false)
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
-        else
-          -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.binding && variable.binding.path;
-          -attrs['name'] = variable.replacedId;
-          -attrs['[ngModelOptions]'] = "{standalone:true}";
-        if(variable.hasDefaultFocus)
-          -attrs["farris-set-focus"]="";
-          if(variable.focusState)
-            -attrs["[focusState]"]=variable.focusState+"";
-        input(id=variable.replacedId "input-end-edit" class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
-        if(variable.linkedLabelEnabled)
-          label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-          label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-        else
-          label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-          label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-        if (variable.needValid && variable.binding && variable.binding.path)
-          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
   if(variable.isTextArea)
-    -var areaAttrs = {};
-    -var areaLabelAttrs = {};
+    -var divAttr = {};
     if(variable.readonly && variable.readonly.isComposite)
-      -areaLabelAttrs["*ngIf"]=variable.readonly.value;
-      -areaAttrs["*ngIf"]=variable.readonly.value;
+      -divAttr["*ngIf"]="!"+variable.readonly.value;
     else
-      -areaLabelAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-      -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-    if (variable.binding && variable.binding.type == 'Variable')
-      -areaAttrs['[(ngModel)]'] = variable.binding.value;
-      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    else if (variable.includeInLoopContainer==false)
-      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-    else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
-      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    if(variable.title)
-      -areaLabelAttrs['title'] = "viewModel.bindingData['"+ (variable.binding && variable.binding.path)+"']";
-    label(class="col-form-label"  )&attributes(areaLabelAttrs)
-      span(class="farris-label-text")
-        | {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-    farris-text('[type]'="'boolean'" )&attributes(areaAttrs)
+      -divAttr["*ngIf"]="viewModel.stateMachine['editable']";
+    div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?""+variable.readonly.value:undefined )&attributes(divAttr)
+      -var attrs = {};
+      if (variable.binding && variable.binding.type == 'Variable')
+        -attrs['[(ngModel)]'] = variable.binding.value;
+        -attrs['name'] = variable.replacedId;
+        -attrs['[ngModelOptions]'] = "{standalone:true}";
+      else if (variable.includeInLoopContainer==false)
+        -attrs['formControlName'] = (variable.binding && variable.binding.path);
+      else
+        -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.ngModelPath;
+        -attrs['name'] = variable.replacedId;
+        -attrs['[ngModelOptions]'] = "{standalone:true}";
+      input(id=variable.replacedId class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined  '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
+      if(variable.linkedLabelEnabled)
+        label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+        label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+      else
+        label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+        label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+      if (variable.needValid && variable.binding && variable.binding.path)
+        -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+        validationMessage('[errors]'!=`${path}`  '[hidden]'="!viewModel.form.isShowValidationMsg"  )
+  else
+    div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?variable.readonly.value+"":undefined )
+      -var attrs = {};
+      if (variable.binding && variable.binding.type == 'Variable')
+        -attrs['[(ngModel)]'] = variable.binding.value;
+        -attrs['name'] = variable.replacedId;
+        -attrs['[ngModelOptions]'] = "{standalone:true}";
+      else if (variable.includeInLoopContainer==false)
+        -attrs['formControlName'] = (variable.binding && variable.binding.path);
+      else
+        -attrs['[(ngModel)]'] =variable.rowPrefix+ ngModelPath;
+        -attrs['name'] = variable.replacedId;
+        -attrs['[ngModelOptions]'] = "{standalone:true}";
+      if(variable.hasDefaultFocus)
+        -attrs["farris-set-focus"]="";
+        if(variable.focusState)
+          -attrs["[focusState]"]=variable.focusState+"";
+      input(id=variable.replacedId "input-end-edit" class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined  '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
+      if(variable.linkedLabelEnabled)
+        label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+        label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+      else
+        label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+        label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+      if (variable.needValid && variable.binding && variable.binding.path)
+        -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+        validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
+if(variable.isTextArea)
+  -var areaAttrs = {};
+  -var areaLabelAttrs = {};
+  if(variable.readonly && variable.readonly.isComposite)
+    -areaLabelAttrs["*ngIf"]=variable.readonly.value;
+    -areaAttrs["*ngIf"]=variable.readonly.value;
+  else
+    -areaLabelAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+    -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+  if (variable.binding && variable.binding.type == 'Variable')
+    -areaAttrs['[(ngModel)]'] = variable.binding.value;
+    -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+  else if (variable.includeInLoopContainer==false)
+    -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+  else
+    -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
+    -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+  if(variable.title)
+    -areaLabelAttrs['title'] = "viewModel.bindingData['"+ (variable.binding && variable.binding.path)+"']";
+  label(class="col-form-label"  )&attributes(areaLabelAttrs)
+    span(class="farris-label-text")
+      | {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+  farris-text('[type]'="'boolean'"   '[inputAppendControlType]'="'StaticText'" '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)
-    span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-      i(class="f-icon f-icon-description-tips")
-    -var tipsAttrs= {};
-    -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-    ng-template()&attributes(tipsAttrs)
-      | !{variable.titleTipsTemplate}
+  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+    i(class="f-icon f-icon-description-tips")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
+    | !{variable.titleTipsTemplate}

package/lib/template/ui/kendo/table/checkboxgroup.pug CHANGED Viewed

@@ -11,7 +11,7 @@ div(class="farris-input-wrap")
           else if (variable.includeInLoopContainer==false)
             -attrs['formControlName'] = (variable.binding && variable.binding.path);
           else
-            -attrs['[(ngModel)]'] = variable.rowPrefix+(item.binding && item.binding.path);
+            -attrs['[(ngModel)]'] = variable.rowPrefix+(item.ngModelPath);
             -attrs['name'] = variable.replacedId;
             -attrs['[ngModelOptions]'] = "{standalone:true}";
           if(variable.hasDefaultFocus)

package/lib/template/ui/kendo/table/combobox.pug CHANGED Viewed

@@ -6,7 +6,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(item.binding && item.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(item.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.readonly)
@@ -23,7 +23,7 @@ div(class="farris-input-wrap")
       -attrs["*ngIf"]="!"+variable.readonly.value;
     else
       -attrs["*ngIf"]="viewModel.stateMachine['editable']";
-  kendo-combobox(id=variable.replacedId "input-end-edit" '[data]'!=variable.enumDataLang+"" '[textField]'="'name'" '[valueField]'="'value'" '[valuePrimitive]'="true"  class="form-control" '(valueChange)'=variable.valueChange?variable.valueChange+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
+  kendo-combobox(id=variable.replacedId "input-end-edit" '[data]'!=variable.enumDataLang+"" '[textField]'="'name'" '[valueField]'="'value'" '[valuePrimitive]'="true"  class="form-control" '(valueChange)'=variable.valueChange?variable.valueChange+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined  '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
   if (variable.needValid && variable.binding && variable.binding.path)
     -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
     validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
@@ -41,9 +41,9 @@ div(class="farris-input-wrap")
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang)&attributes(areaAttrs)
+    farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang '[inputAppendControlType]'="'StaticText'" '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

package/lib/template/ui/kendo/table/datepicker.pug CHANGED Viewed

@@ -7,7 +7,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.valueChange)
@@ -23,7 +23,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
-  kendo-datepicker(id=variable.replacedId "input-end-edit" class="form-control k-widget k-datepicker k-header" '[format]'=variable.format?variable.format:undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[(value)]'=variable.value?variable.value:undefined  '[min]'=(variable.minValue?("'"+variable.minValue+"'|parseStrToDate"):undefined)  '[max]'=(variable.maxValue?("'"+variable.maxValue+"'|parseStrToDate"):undefined)   '[formatPlaceholder]'=variable.format+"|dateFormatPlaceholder:'"+(variable.binding && variable.binding.path)+"'"  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
+  kendo-datepicker(id=variable.replacedId "input-end-edit" class="form-control k-widget k-datepicker k-header" '[format]'=variable.format?variable.format:undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[(value)]'=variable.value?variable.value:undefined  '[min]'=(variable.minValue?("'"+variable.minValue+"'|parseStrToDate"):undefined)  '[max]'=(variable.maxValue?("'"+variable.maxValue+"'|parseStrToDate"):undefined)   '[formatPlaceholder]'=variable.format+"|dateFormatPlaceholder:'"+(variable.binding && variable.binding.path)+"'"  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
   if (variable.needValid && variable.binding && variable.binding.path)
     -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
     validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
@@ -40,9 +40,9 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] =variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] =variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    farris-text('[type]'="'date'" '[showTime]'=(variable.showTime || variable.showTime== false)?""+variable.showTime:undefined '[format]'=variable.format?variable.format:undefined)&attributes(areaAttrs)
+    farris-text('[type]'="'date'" '[showTime]'=(variable.showTime || variable.showTime== false)?""+variable.showTime:undefined '[format]'=variable.format?variable.format:undefined '[inputAppendControlType]'="'StaticText'" '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

package/lib/template/ui/kendo/table/farris-avatar.pug CHANGED Viewed

@@ -1,17 +1,18 @@
--var attrs = {};
-if (variable.binding && variable.binding.type == 'Variable')
-  -attrs['[(ngModel)]'] = variable.binding.value;
-  -attrs['name'] = variable.replacedId;
-  -attrs['[ngModelOptions]'] = "{standalone:true}";
-else if (variable.includeInLoopContainer==false)
-  -attrs['formControlName'] = (variable.binding && variable.binding.path);
-else
-  -attrs['[(ngModel)]'] =variable.rowPrefix+ (variable.binding && variable.binding.path);
-  -attrs['name'] = variable.replacedId;
-  -attrs['[ngModelOptions]'] = "{standalone:true}";
--attrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-farris-avatar(id=variable.replacedId "input-end-edit" class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[imgShape]'=variable.imgShape?"'"+variable.imgShape+"'":undefined  '[avatarWidth]'=(variable.size && variable.size.width)?"'"+variable.size.width+"'":undefined  '[avatarHeight]'=(variable.size && variable.size.height)?"'"+variable.size.height+"'":undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[type]'=variable.imgType?"'"+variable.imgType+"'":undefined   '[imgTitle]'=variable.imgTitle?"'"+variable.imgTitle+"'":undefined  '[size]'=(variable.maxSize || variable.maxSize==0)?variable.maxSize.toString():undefined  '(imgChange)'=variable.imgChange?variable.imgChange+"":undefined  '[cover]'=variable.cover?"'"+variable.cover+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined )&attributes(attrs)
+div(class="farris-input-wrap f-utils-hcenter-vcenter "+((variable.appearance && variable.appearance.class)?""+variable.appearance.class:"")  style=(variable.appearance && variable.appearance.style))
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else if (variable.includeInLoopContainer==false)
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  else
+    -attrs['[(ngModel)]'] =variable.rowPrefix+ (variable.ngModelPath);
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  -attrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;
+  if(variable.hasDefaultFocus)
+    -attrs["farris-set-focus"]="";
+    if(variable.focusState)
+      -attrs["[focusState]"]=variable.focusState+"";
+  farris-avatar(id=variable.replacedId "input-end-edit" '[imgShape]'=variable.imgShape?"'"+variable.imgShape+"'":undefined  '[avatarWidth]'=(variable.size && variable.size.width)?"'"+variable.size.width+"'":undefined  '[avatarHeight]'=(variable.size && variable.size.height)?"'"+variable.size.height+"'":undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[type]'=variable.imgType?"'"+variable.imgType+"'":undefined   '[imgTitle]'=variable.imgTitle?"'"+variable.imgTitle+"'":undefined  '[size]'=(variable.maxSize || variable.maxSize==0)?variable.maxSize.toString():undefined  '(imgChange)'=variable.imgChange?variable.imgChange+"":undefined  '[cover]'=variable.cover?"'"+variable.cover+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  )&attributes(attrs)

package/lib/template/ui/kendo/table/farris-checkbox-group.pug CHANGED Viewed

@@ -7,7 +7,7 @@ if (variable.binding && variable.binding.type == 'Variable')
 else if (variable.includeInLoopContainer==false)
   -attrs['formControlName'] = (variable.binding && variable.binding.path);
 else
-  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
   -attrs['name'] = variable.replacedId;
   -attrs['[ngModelOptions]'] = "{standalone:true}";
 if(variable.isTextArea)
@@ -20,7 +20,7 @@ if(variable.hasDefaultFocus)
   if(variable.focusState)
     -attrs["[focusState]"]=variable.focusState+"";
 div('class'='farris-input-wrap')
-  farris-checkboxgroup(id=variable.replacedId "input-end-edit" '(setCheckboxData)'=variable.setCheckboxData?variable.setCheckboxData+"":undefined   '(changeValue)'=variable.changeValue?variable.changeValue+"":undefined  '[disable]'!=variable.readonly ?""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+"" '[data]'=variable.itemsLang?""+variable.itemsLang:undefined '[separator]'=variable.separator?"'"+variable.separator+"'":undefined  '[uri]'=variable.uri?"'"+variable.uri+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
+  farris-checkboxgroup(id=variable.replacedId "input-end-edit" '(setCheckboxData)'=variable.setCheckboxData?variable.setCheckboxData+"":undefined   '(changeValue)'=variable.changeValue?variable.changeValue+"":undefined  '[disable]'!=variable.readonly ?""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+"" '[data]'=variable.itemsLang?""+variable.itemsLang:undefined '[separator]'=variable.separator?"'"+variable.separator+"'":undefined  '[uri]'=variable.uri?"'"+variable.uri+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
   if (variable.needValid && variable.binding && variable.binding.path)
     -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
     validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
@@ -37,9 +37,9 @@ div('class'='farris-input-wrap')
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    farris-text('[type]'="'enum'" '[data]'=variable.itemsLang?""+variable.itemsLang:undefined '[enumDelimiter]'=variable.separator?"'"+variable.separator+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined )&attributes(areaAttrs)
+    farris-text('[type]'="'enum'" '[data]'=variable.itemsLang?""+variable.itemsLang:undefined '[enumDelimiter]'=variable.separator?"'"+variable.separator+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined '[inputAppendControlType]'="'StaticText'" '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined )&attributes(areaAttrs)
 if(variable.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")