@farris/jit-engine 1.3.283 → 1.3.285

package/lib/mobileapp/vue2/utility/vue-event-viewmodel-modifier.js

@@ -1,104 +1,104 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VueEventViewModelModifier = void 0;
-const toolhepler_1 = require("../../../utility/toolhepler");
-class VueEventViewModelModifier {
-    constructor() { }
-    static modify(eventValue, includeBracket = true, includeSemicolon = true, hasEventName = false, eventName = "$event") {
-        let eventModelValue;
-        let declarationTriggerValue = "";
-        let generalEventValue = "";
-        if (eventValue) {
-            const eventValueIncludeDeclaration = eventValue.split(";");
-            eventValueIncludeDeclaration.forEach((item, index) => {
-                if (item) {
-                    if (item.indexOf("this.trigger") != -1) {
-                        declarationTriggerValue = declarationTriggerValue + item + ";";
-                    }
-                    else {
-                        const ary = item.split('.');
-                        for (let i = 0; i < ary.length; i++) {
-                            if ((i + 1) == ary.length)
-                                continue;
-                            if (i == 0) {
-                                {
-                                    const viewModelPrefix = "this.$viewModel";
-                                    ary[i] = viewModelPrefix;
-                                }
-                            }
-                            else {
-                                ary[i] = toolhepler_1.ToolHelper.tf(ary[i], toolhepler_1.TfTypeEnum.Camel);
-                                if (i > 0 && i < (ary.length - 1)) {
-                                    ary[i] = toolhepler_1.ToolHelper.toLowerCase(ary[i][0]) + ary[i].substring(1);
-                                }
-                            }
-                        }
-                        let bracketEventName = "()";
-                        if (hasEventName) {
-                            bracketEventName = "(" + eventName + ")";
-                        }
-                        if (ary.length == 1) {
-                            const viewModelPrefix = "this.$viewModel.";
-                            if (includeBracket) {
-                                if (item.endsWith(bracketEventName) == false) {
-                                    if (item.endsWith("()") == true) {
-                                        item = item.substring(0, item.length - 2);
-                                    }
-                                    eventModelValue = viewModelPrefix + item + bracketEventName;
-                                }
-                                else {
-                                    eventModelValue = viewModelPrefix + ary.join('.');
-                                }
-                            }
-                            else {
-                                eventModelValue = viewModelPrefix + ary.join('.');
-                            }
-                        }
-                        else {
-                            if (includeBracket) {
-                                if (item.endsWith(bracketEventName) == false) {
-                                    let joinEventValue = ary.join('.');
-                                    if (joinEventValue.endsWith("()") == true) {
-                                        joinEventValue = joinEventValue.substring(0, joinEventValue.length - 2);
-                                    }
-                                    eventModelValue = joinEventValue + bracketEventName;
-                                }
-                                else {
-                                    eventModelValue = ary.join('.');
-                                }
-                            }
-                            else {
-                                eventModelValue = ary.join('.');
-                            }
-                        }
-                        if (includeBracket) {
-                            generalEventValue = generalEventValue + eventModelValue;
-                            if (includeSemicolon) {
-                                if (generalEventValue.lastIndexOf(";") !== generalEventValue.length - 1) {
-                                    generalEventValue = generalEventValue + ";";
-                                }
-                            }
-                        }
-                        else {
-                            generalEventValue = generalEventValue + eventModelValue;
-                        }
-                        if (index < (eventValueIncludeDeclaration.length - 1)) {
-                            if (generalEventValue.lastIndexOf(";") !== generalEventValue.length - 1) {
-                                generalEventValue += ";";
-                            }
-                        }
-                    }
-                }
-            });
-        }
-        if (generalEventValue && declarationTriggerValue && generalEventValue.lastIndexOf(";") != generalEventValue.length - 1) {
-            generalEventValue = generalEventValue + ";";
-        }
-        if (includeBracket == false && declarationTriggerValue.lastIndexOf(";") == declarationTriggerValue.length - 1) {
-            declarationTriggerValue = declarationTriggerValue.substring(0, declarationTriggerValue.length - 1);
-        }
-        return generalEventValue + declarationTriggerValue;
-    }
-}
-exports.VueEventViewModelModifier = VueEventViewModelModifier;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VueEventViewModelModifier = void 0;
+const toolhepler_1 = require("../../../utility/toolhepler");
+class VueEventViewModelModifier {
+    constructor() { }
+    static modify(eventValue, includeBracket = true, includeSemicolon = true, hasEventName = false, eventName = "$event") {
+        let eventModelValue;
+        let declarationTriggerValue = "";
+        let generalEventValue = "";
+        if (eventValue) {
+            const eventValueIncludeDeclaration = eventValue.split(";");
+            eventValueIncludeDeclaration.forEach((item, index) => {
+                if (item) {
+                    if (item.indexOf("this.trigger") != -1) {
+                        declarationTriggerValue = declarationTriggerValue + item + ";";
+                    }
+                    else {
+                        const ary = item.split('.');
+                        for (let i = 0; i < ary.length; i++) {
+                            if ((i + 1) == ary.length)
+                                continue;
+                            if (i == 0) {
+                                {
+                                    const viewModelPrefix = "this.$viewModel";
+                                    ary[i] = viewModelPrefix;
+                                }
+                            }
+                            else {
+                                ary[i] = toolhepler_1.ToolHelper.tf(ary[i], toolhepler_1.TfTypeEnum.Camel);
+                                if (i > 0 && i < (ary.length - 1)) {
+                                    ary[i] = toolhepler_1.ToolHelper.toLowerCase(ary[i][0]) + ary[i].substring(1);
+                                }
+                            }
+                        }
+                        let bracketEventName = "()";
+                        if (hasEventName) {
+                            bracketEventName = "(" + eventName + ")";
+                        }
+                        if (ary.length == 1) {
+                            const viewModelPrefix = "this.$viewModel.";
+                            if (includeBracket) {
+                                if (item.endsWith(bracketEventName) == false) {
+                                    if (item.endsWith("()") == true) {
+                                        item = item.substring(0, item.length - 2);
+                                    }
+                                    eventModelValue = viewModelPrefix + item + bracketEventName;
+                                }
+                                else {
+                                    eventModelValue = viewModelPrefix + ary.join('.');
+                                }
+                            }
+                            else {
+                                eventModelValue = viewModelPrefix + ary.join('.');
+                            }
+                        }
+                        else {
+                            if (includeBracket) {
+                                if (item.endsWith(bracketEventName) == false) {
+                                    let joinEventValue = ary.join('.');
+                                    if (joinEventValue.endsWith("()") == true) {
+                                        joinEventValue = joinEventValue.substring(0, joinEventValue.length - 2);
+                                    }
+                                    eventModelValue = joinEventValue + bracketEventName;
+                                }
+                                else {
+                                    eventModelValue = ary.join('.');
+                                }
+                            }
+                            else {
+                                eventModelValue = ary.join('.');
+                            }
+                        }
+                        if (includeBracket) {
+                            generalEventValue = generalEventValue + eventModelValue;
+                            if (includeSemicolon) {
+                                if (generalEventValue.lastIndexOf(";") !== generalEventValue.length - 1) {
+                                    generalEventValue = generalEventValue + ";";
+                                }
+                            }
+                        }
+                        else {
+                            generalEventValue = generalEventValue + eventModelValue;
+                        }
+                        if (index < (eventValueIncludeDeclaration.length - 1)) {
+                            if (generalEventValue.lastIndexOf(";") !== generalEventValue.length - 1) {
+                                generalEventValue += ";";
+                            }
+                        }
+                    }
+                }
+            });
+        }
+        if (generalEventValue && declarationTriggerValue && generalEventValue.lastIndexOf(";") != generalEventValue.length - 1) {
+            generalEventValue = generalEventValue + ";";
+        }
+        if (includeBracket == false && declarationTriggerValue.lastIndexOf(";") == declarationTriggerValue.length - 1) {
+            declarationTriggerValue = declarationTriggerValue.substring(0, declarationTriggerValue.length - 1);
+        }
+        return generalEventValue + declarationTriggerValue;
+    }
+}
+exports.VueEventViewModelModifier = VueEventViewModelModifier;
 //# sourceMappingURL=vue-event-viewmodel-modifier.js.map

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

@@ -1,35 +1,35 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VueObjectCreator = void 0;
-const Dom = __importStar(require("../domstructure"));
-class VueObjectCreator {
-    static createObjectByType(type, i18nResourcePrefix) {
-        const dom = Dom;
-        const domValue = eval(`dom.${type}`);
-        if (domValue) {
-            domValue["resourcePrefix"] = i18nResourcePrefix;
-        }
-        return domValue;
-    }
-}
-exports.VueObjectCreator = VueObjectCreator;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VueObjectCreator = void 0;
+const Dom = __importStar(require("../domstructure"));
+class VueObjectCreator {
+    static createObjectByType(type, i18nResourcePrefix) {
+        const dom = Dom;
+        const domValue = eval(`dom.${type}`);
+        if (domValue) {
+            domValue["resourcePrefix"] = i18nResourcePrefix;
+        }
+        return domValue;
+    }
+}
+exports.VueObjectCreator = VueObjectCreator;
 //# sourceMappingURL=vue-object-creator.js.map

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

@@ -4,13 +4,7 @@ if(variable.hasDefaultFocus)
   -attrs["farris-set-focus"]="";
   if(variable.focusState)
     -attrs["[focusState]"]=variable.focusState+"";
-button(id=variable.replacedId class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  '(click)'=variable.click?variable.click:undefined
-  '[disabled]'!=variable.disable?variable.disableButtonPipeSuffix?variable.disable.toString()+variable.disableButtonPipeSuffix:variable.disable.toString():undefined
-  '*ngIf'!=variable.visible?variable.visibleButtonPipeSuffix?variable.visible.value+variable.visibleButtonPipeSuffix+'':variable.visible.value+'':undefined
-  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
-  '[style.height]'=(variable.size && variable.size.height)?"'"+variable.size.height+"px'":undefined)&attributes(attrs)
+button(id=variable.replacedId class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '(click)'=variable.click?variable.click:undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined '*ngIf'!=variable.visible?variable.visible.value+'':undefined  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[style.height]'=(variable.size && variable.size.height)?"'"+variable.size.height+"px'":undefined)&attributes(attrs)
   if(variable.icon)
     span('class'=variable.icon?""+variable.icon:undefined)
   | {{!{variable.bindingName}}}

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

@@ -2,10 +2,10 @@
 -var holdPlaceInnerAttrs = {};
 -var holdPlaceEmptyAttrs = {};
 if(variable.holdPlace)
-  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
-  -holdPlaceEmptyAttrs['*ngIf']=variable.visible?variable.visiblePipeSuffix?'!'+variable.visible.value+variable.visiblePipeSuffix+'':'!'+variable.visible.value+'':undefined;
+  -holdPlaceInnerAttrs['*ngIf']=variable.visible?variable.visible.value+'':undefined;
+  -holdPlaceEmptyAttrs['*ngIf']=variable.visible?'!'+variable.visible.value+'':undefined;
 else
-  -holdPlaceOuterAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+  -holdPlaceOuterAttrs['*ngIf']=variable.visible?variable.visible.value+'':undefined;
 div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
   if(variable.holdPlace)
     div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
@@ -16,12 +16,12 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
           label(class="col-form-label" '*ngIf'="viewModel.stateMachine['editable']" '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined )
             span(class="farris-label-text")
             if (variable.require)
-              span(class="farris-label-info text-danger" "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger" "*ngIf"=""+variable.require.value) *
         else
           label(class="col-form-label"   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
             span(class="farris-label-text")
             if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
       div(class="farris-input-wrap")
         if(variable.isTextArea)
           -var divAttr = {};
@@ -60,20 +60,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
               -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.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":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
-              '[inputAppendScene]'=variable.inputAppendScene?"'"+variable.inputAppendScene+"'":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.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+            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}'}}
@@ -102,14 +89,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
         label(class="col-form-label"  )&attributes(areaLabelAttrs)
           span(class="farris-label-text")
             | {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-        farris-text('[type]'="'boolean'" '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined
-          '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined
-          '[inputAppendControlType]'=variable.enableAppend?"'StaticText'":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)&attributes(areaAttrs)
+        farris-text('[type]'="'boolean'" '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight: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/checkboxgroup.pug

@@ -3,10 +3,10 @@
 -var holdPlaceInnerAttrs = {};
 -var holdPlaceEmptyAttrs = {};
 if(variable.holdPlace)
-  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
-  -holdPlaceEmptyAttrs['*ngIf']=variable.visible?variable.visiblePipeSuffix?'!'+variable.visible.value+variable.visiblePipeSuffix+'':'!'+variable.visible.value+'':undefined;
+  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;
+  -holdPlaceEmptyAttrs['*ngIf']=variable.visible?'!'+variable.visible.value+'':undefined;
 else
-  -holdPlaceOuterAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+  -holdPlaceOuterAttrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;
 div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
   if(variable.holdPlace)
     div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
@@ -17,12 +17,12 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
         if(variable.linkedLabelEnabled)
           label(class="col-form-label f-pretend-link f-cursor-pointer " title="{{"+titleValue+"}}" for=variable.replacedId  '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
             if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
             span(class="farris-label-text") {{#{titleValue}}}
         else
           label(class="col-form-label" title="{{"+titleValue+"}}" for=variable.replacedId   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
             if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
             span(class="farris-label-text") {{#{titleValue}}}
       div(class="farris-input-wrap")
         if (variable.items)
@@ -39,19 +39,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
                 -attrs["farris-set-focus"]="";
                 if(variable.focusState)
                   -attrs["[focusState]"]=variable.focusState+"";
-              input(class="custom-control-input" "input-end-edit" type="checkbox" id=item.id
-                disabled!=item.disable?item.disable.toString():undefined
-                readonly!=item.readonly?""+item.readonly.value: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
-                '[inputAppendScene]'=variable.inputAppendScene?"'"+variable.inputAppendScene+"'":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.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+              input(class="custom-control-input" "input-end-edit" type="checkbox" id=item.id disabled!=item.disable?item.disable.toString():undefined readonly!=item.readonly?""+item.readonly.value: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 (item.title)
                 label(class="custom-control-label" for=item.id) !{item.title}
       if(variable.titleTipsTemplate)

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

@@ -2,10 +2,10 @@
 -var holdPlaceInnerAttrs = {};
 -var holdPlaceEmptyAttrs = {};
 if(variable.holdPlace)
-  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
-  -holdPlaceEmptyAttrs['*ngIf']=variable.visible?variable.visiblePipeSuffix?'!'+variable.visible.value+variable.visiblePipeSuffix+'':'!'+variable.visible.value+'':undefined;
+  -holdPlaceInnerAttrs["*ngIf"]=variable.visible ?variable.visible.value+'':undefined;
+  -holdPlaceEmptyAttrs['*ngIf']=variable.visible ?'!'+variable.visible.value+'':undefined;
 else
-  -holdPlaceOuterAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+  -holdPlaceOuterAttrs["*ngIf"]=variable.visible ?variable.visible.value+'':undefined;
 div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
   if(variable.holdPlace)
     div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
@@ -16,12 +16,12 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
         if(variable.linkedLabelEnabled)
           label('class'='col-form-label f-pretend-link f-cursor-pointer' title="{{"+titleValue+"}}" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
             if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
             span('class'="farris-label-text") {{#{titleValue}}}
         else
           label('class'='col-form-label'  title="{{"+titleValue+"}}" for=variable.replacedId   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
             if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
             span('class'="farris-label-text") {{#{titleValue}}}
       -var attrs = {};
       if (variable.binding && variable.binding.type == 'Variable')
@@ -40,25 +40,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
         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.readonlyPipeSuffix?""+variable.readonly.value+variable.readonlyPipeSuffix:""+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
-          '[inputAppendScene]'=variable.inputAppendScene?"'"+variable.inputAppendScene+"'":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.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined: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 )&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" )
@@ -74,18 +56,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
             -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
           else
             -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-          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
-            '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined
-            '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined
-            '[inputAppendControlType]'=variable.enableAppend?"'StaticText'":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)&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  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight: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/farris-combo-list.pug

@@ -4,10 +4,10 @@
 -var holdPlaceInnerAttrs = {};
 -var holdPlaceEmptyAttrs = {};
 if(variable.holdPlace)
-  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
-  -holdPlaceEmptyAttrs['*ngIf']=variable.visible ?'!'+variable.visible.value+variable.visiblePipeSuffix+'':undefined;  
+  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;
+  -holdPlaceEmptyAttrs['*ngIf']=variable.visible ?'!'+variable.visible.value+'':undefined;  
 else
-  -holdPlaceOuterAttrs["*ngIf"]=variable.visible ?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+  -holdPlaceOuterAttrs["*ngIf"]=variable.visible ?variable.visible.value+'':undefined;
 div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
   if(variable.holdPlace)
     div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
@@ -18,12 +18,12 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
         if(variable.linkedLabelEnabled)
           label(class="col-form-label f-pretend-link f-cursor-pointer" title="{{"+titleValue+"}}" for=variable.replacedId  '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
             if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
             span(class="farris-label-text") {{#{titleValue}}}
         else
           label(class="col-form-label" title="{{"+titleValue+"}}" for=variable.replacedId   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
             if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
             span(class="farris-label-text") {{#{titleValue}}}
       div(class="farris-input-wrap")
         -var attrs = {};
@@ -35,7 +35,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
         if (variable.valueChanged)
           -attrs['(valueChange)'] = variable.valueChanged + '';
         if (variable.readonly)
-          -attrs['[readonly]'] = variable.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":variable.readonly.value+"";
+          -attrs['[readonly]'] = variable.readonly.value+"";
         if(variable.isTextArea)
           if(variable.readonly && variable.readonly.isComposite)
             -attrs["*ngIf"]="!"+variable.readonly.value;
@@ -46,37 +46,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
           -attrs["farris-set-focus"]="";
           if(variable.focusState)
             -attrs["[focusState]"]=variable.focusState+"";
-        farris-combo-list(id=variable.replacedId "input-end-edit" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined
-          '(selectedValues)'=variable.selectedValues?variable.selectedValues:undefined
-          '[disabled]'!=(variable.disable||variable.disable==false)?variable.disable.toString():undefined
-          '[enableCancelSelected]'=(variable.enableCancelSelected || variable.enableCancelSelected==false)?""+variable.enableCancelSelected:undefined
-          '[editable]'=(variable.editable||variable.editable==false)?variable.editable.toString():undefined
-          '[panelWidth]'=variable.panelWidth?"'"+variable.panelWidth+"'":undefined
-          '[panelHeight]'=variable.panelHeight?"'"+variable.panelHeight+"'":undefined
-          '[idField]'=variable.idField?"'"+variable.idField+"'":undefined '[valueField]'=variable.idField?"'"+variable.idField+"'":undefined
-          '[textField]'=variable.textField?"'"+variable.textField+"'":undefined '[uri]'=variable.uri?"'"+variable.uri+"'":undefined
-          '[multiSelect]'=(variable.multiSelect || variable.multiSelect==false)?variable.multiSelect.toString():undefined
-          '(showPanel)'=variable.onShown?variable.onShown:undefined '(hidePanel)'=variable.onHidden?variable.onHidden:undefined
-          '(clear)'=variable.onClear?variable.onClear:undefined
-          '[autoWidth]'=(variable.autoWidth||variable.autoWidth==false)?variable.autoWidth.toString():undefined
-          '[mappingField]'=variable.mappingField?"'"+variable.mappingField+"'":undefined
-          '[beforeShow]'=variable.beforeShow?""+variable.beforeShow:undefined
-          '[beforeHide]'=variable.beforeHide?""+variable.beforeHide:undefined
-          '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
-          '[enableClear]'=(variable.enableClear || variable.enableClear==false)?""+variable.enableClear:undefined
-          '[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined
-          '[requiredOn]'=(variable.isCustomRequire && variable.require  && !variable.require.isExpression)?""+variable.require.value:undefined
-          'comboListRef' 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined
-          '[nosearch]'=variable.noSearch?""+variable.noSearch.value:undefined
-          '[maxLength]'=variable.maxSearchLength?""+variable.maxSearchLength:undefined
-          '[showDisabledItem]'=variable.showDisabledItem?""+variable.showDisabledItem.value:undefined
-          '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined
-          '[inputAppendScene]'=variable.inputAppendScene?"'"+variable.inputAppendScene+"'":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.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+        farris-combo-list(id=variable.replacedId "input-end-edit" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined  '(selectedValues)'=variable.selectedValues?variable.selectedValues:undefined   '[disabled]'!=(variable.disable||variable.disable==false)?variable.disable.toString():undefined '[enableCancelSelected]'=(variable.enableCancelSelected || variable.enableCancelSelected==false)?""+variable.enableCancelSelected:undefined  '[editable]'=(variable.editable||variable.editable==false)?variable.editable.toString():undefined '[panelWidth]'=variable.panelWidth?"'"+variable.panelWidth+"'":undefined '[panelHeight]'=variable.panelHeight?"'"+variable.panelHeight+"'":undefined '[idField]'=variable.idField?"'"+variable.idField+"'":undefined '[valueField]'=variable.idField?"'"+variable.idField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined '[uri]'=variable.uri?"'"+variable.uri+"'":undefined  '[multiSelect]'=(variable.multiSelect || variable.multiSelect==false)?variable.multiSelect.toString():undefined  '(showPanel)'=variable.onShown?variable.onShown:undefined '(hidePanel)'=variable.onHidden?variable.onHidden:undefined '(clear)'=variable.onClear?variable.onClear:undefined '[autoWidth]'=(variable.autoWidth||variable.autoWidth==false)?variable.autoWidth.toString():undefined '[mappingField]'=variable.mappingField?"'"+variable.mappingField+"'":undefined  '[beforeShow]'=variable.beforeShow?""+variable.beforeShow:undefined  '[beforeHide]'=variable.beforeHide?""+variable.beforeHide:undefined    '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[enableClear]'=(variable.enableClear || variable.enableClear==false)?""+variable.enableClear:undefined   '[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined   '[requiredOn]'=(variable.isCustomRequire && variable.require  && !variable.require.isExpression)?""+variable.require.value:undefined 'comboListRef' 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[nosearch]'=variable.noSearch?""+variable.noSearch.value:undefined  '[maxLength]'=variable.maxSearchLength?""+variable.maxSearchLength:undefined   '[showDisabledItem]'=variable.showDisabledItem?""+variable.showDisabledItem.value: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" )
@@ -92,17 +62,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
             -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
           else
             -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-          farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined
-            '[valueField]'=variable.idField?"'"+variable.idField+"'":undefined
-            '[textField]'=variable.textField?"'"+variable.textField+"'":undefined
-            '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined
-            '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined
-            '[inputAppendControlType]'=variable.enableAppend?"'StaticText'":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)&attributes(areaAttrs)
+          farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined '[valueField]'=variable.idField?"'"+variable.idField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight: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")