@farris/jit-engine 1.3.127 → 1.3.130-dev01

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

@@ -0,0 +1,74 @@
+
+div(class="farris-input-wrap")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(UIStateBinding)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+  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}";
+  if (variable.valueChange)
+    -attrs['(valueChange)'] = variable.valueChange ;
+
+  -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
+
+  if(variable.isTextArea)
+    if(variable.readonly && variable.readonly.isComposite)
+      -attrs["*ngIf"]="!"+variable.readonly.value;
+    else
+      -attrs["*ngIf"]="viewModel.stateMachine['editable']";
+  if(variable.hasDefaultFocus)
+    -attrs["farris-set-focus"]="";
+    if(variable.focusState)
+      -attrs["[focusState]"]=variable.focusState+"";
+  farris-personnel-selector(
+    personnel-selector-data-mapping
+    input-end-edit
+    '[disabled]'!=variable.disable?variable.disable.toString():undefined  
+    '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined
+    '[viewType]'!=variable.viewType?"'"+variable.viewType+"'":undefined
+    '[busNum]'!=variable.busNum?"'"+variable.busNum+"'":undefined
+    '[absOrgType]'=variable.absOrgType?"'"+variable.absOrgType+"'":undefined
+    '[multiSelect]'!=variable.multiSelect?""+variable.multiSelect.value:undefined
+    '[mapFields]'=variable.mapFields?variable.mapFields:undefined
+    '(tagRemoved)'!=variable.tagRemoved?variable.tagRemoved+"":undefined
+    '(selectionsChange)'!=variable.selectionsChange?variable.selectionsChange+"":undefined
+    "[idField]"=variable.idField?"'"+variable.idField+"'":undefined
+    '[showTabIds]'=variable.showTabIds?"'"+variable.showTabIds+"'":undefined
+    "[displayField]"=variable.textField?"'"+variable.textField+"'":undefined
+    "[formatFn]"=variable.formatterName?""+variable.formatterName:undefined
+    '(inputClear)'!=variable.inputClear?variable.inputClear+"":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" )
+  div(class="farris-feedback")
+  if(variable.isTextArea)
+    -var areaAttrs = {};
+    if(variable.readonly && variable.readonly.isComposite)
+      -areaAttrs["*ngIf"]=variable.readonly.value;
+    else
+      -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}";
+    farris-text('[type]'="'string'"  '[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")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
+    | !{variable.titleTipsTemplate}

package/lib/template/ui/kendo/table/lookup.pug

@@ -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.lookupPicking)
@@ -31,9 +31,6 @@ div(class="farris-input-wrap")
       -attrs["[focusState]"]=variable.focusState+"";
   -attrs['#'+variable.replacedId] = "";
   farris-lookup-grid(id=variable.replacedId "input-end-edit"   'data-mapping' '[useTip]'=(variable.useTip || variable.useTip==false)?variable.useTip+"":undefined '[useFavorite]'=(variable.useFavorite || variable.useFavorite==false)?variable.useFavorite+"":undefined '[nosearch]'=variable.noSearch?""+variable.noSearch.value:undefined  '[editable]'=(variable.editable || variable.editable==false)?""+variable.editable:undefined   '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[displayType]'="'" + variable.displayType+ "'" '[uri]'="'" + (variable.dataSource && variable.dataSource.uri) + "'" '[idField]'="'" + (variable.dataSource && variable.dataSource.idField) + "'" '[mapFields]'=variable.mapFields?variable.mapFields:undefined '[singleSelect]'=(!variable.multiSelect) + "" '[pageSize]'=(variable.pageSize || 20) '[pageList]'=variable.arrPageList?variable.arrPageList:undefined '[pageIndex]'=(variable.pageIndex || 1) '[pagination]'=(variable.pagination == null | variable.pagination == undefined)?"true":variable.pagination + "" '[textField]'="'" + variable.textField + "'" '[valueField]'="'" + variable.valueField + "'"   '[title]'=variable.dialogTitleLang?""+variable.dialogTitleLang:undefined '[showMaxButton]'=(variable.showMaxButton == null | variable.showMaxButton == undefined)?"true":variable.showMaxButton + "" '[showCloseButton]'=(variable.showCloseButton == null | variable.showCloseButton == undefined)?"true":variable.showCloseButton + "" '[resizable]'=(variable.resizable == null | variable.resizable == undefined)?"true":variable.resizable + ""  '(clear)'=variable.clear?variable.clear:undefined  '[context]'=variable.context?variable.context:undefined  '[enableToSelect]'=(variable.enableToSelect || variable.enableToSelect == false)?""+variable.enableToSelect:undefined  '[expandLevel]'=""+variable.expandLevel   '[isRecordSize]'=(variable.isRecordSize || variable.isRecordSize == false)?""+variable.isRecordSize:undefined  '[enableFullTree]'=(variable.enableFullTree || variable.enableFullTree == false)?""+variable.enableFullTree:undefined  '[loadTreeDataType]'=variable.loadTreeDataType ?"'"+variable.loadTreeDataType+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '[enableClear]'=(variable.enableClear || variable.enableClear==false)?""+variable.enableClear:undefined   '[dialogWidth]'=variable.panelWidth?""+variable.panelWidth:undefined '[dialogHeight]'=variable.panelHeight?""+variable.panelHeight:undefined    '[enableCascade]'=variable.enableCascade?""+variable.enableCascade:undefined    '[cascadeStatus]'=variable.cascadeStatus?"'"+variable.cascadeStatus+"'":undefined  '[useExtendInfo]'=(variable.useExtendInfo || variable.useExtendInfo==false)?""+variable.useExtendInfo:undefined '[extInfoFields]'=variable.extInfoFields?"'"+variable.extInfoFields+"'":undefined '[extInfoFormatter]'=variable.extInfoFormatterName?""+variable.extInfoFormatterName: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 '[customFormatter]'=variable.customFormatterName?""+variable.customFormatterName:undefined   '[selectFirstInNav]'=variable.selectFirstInNav?""+variable.selectFirstInNav.value:undefined  '[loadDataWhenOpen]'=variable.loadDataWhenOpen?""+variable.loadDataWhenOpen.value:undefined  '[customNavFormatter]'=variable.customNavFormatterName?""+variable.customNavFormatterName:undefined '[treeInfo]'=variable.treeInfo?variable.treeInfo:undefined  '[maxLength]'=variable.maxSearchLength?""+variable.maxSearchLength:undefined  '[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined '[target]'="row" '[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" )
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};
@@ -47,7 +44,7 @@ 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]'="'string'"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight: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)

package/lib/template/ui/kendo/table/multitextbox.pug

@@ -8,7 +8,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.isTextArea)
@@ -23,9 +23,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   textarea(id=variable.replacedId '[style.height]'=(variable.size&&variable.size.height)?"'"+variable.size.height+"px"+"'":undefined '[maxHeight]'= variable.maxHeight?""+variable.maxHeight:undefined  '[style.width]'=(variable.size&&variable.size.width)?"'"+variable.size.width+"px"+"'":undefined class="form-control" "input-end-edit" 'kendoTextArea' '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.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  '[auto-size]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[textarea-zoom]'=variable.enableDialog+"" '[title]'=variable.enableDialog?""+titleValue:undefined   '[dialogWidth]'=variable.enableDialog?variable.dialogWidth+"":undefined  '[dialogHeight]'=variable.enableDialog?variable.dialogHeight+"":undefined 'maxlength'=(variable.maxLength && variable.maxLength!=0)?""+variable.maxLength:undefined   '[word-count]'=(variable.enableWordCount || variable.enableWordCount==false)?""+variable.enableWordCount:undefined  '[countType]'=variable.countType?"'"+variable.countType+"'":undefined  '[onlyShowInDialog]'=(variable.onlyShowInDialog||variable.onlyShowInDialog==false)?""+variable.onlyShowInDialog: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" )
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};
@@ -39,7 +36,7 @@ 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]'="'string'"  '[isTextArea]'="true"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[maxHeight]'= variable.maxHeight?""+variable.maxHeight:undefined  '[textarea-zoom]'=variable.enableDialog+"" '[title]'=variable.enableDialog?""+titleValue:undefined   '[dialogWidth]'=variable.enableDialog?variable.dialogWidth+"":undefined  '[dialogHeight]'=variable.enableDialog?variable.dialogHeight+"":undefined   '[attr.maxLength]'=variable.maxLength?""+variable.maxLength: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)

package/lib/template/ui/kendo/table/numericbox.pug

@@ -8,7 +8,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}";
 
@@ -24,9 +24,6 @@ div(class="farris-input-wrap")
       -attrs["[focusState]"]=variable.focusState+"";
   kendo-numerictextbox(id=variable.replacedId "input-end-edit" class="form-control k-widget k-numerictextbox" '[format]'=variable.format?"'"+variable.format+"'":undefined '[decimals]'=(variable.precision || variable.precision==0)? variable.precision+'':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 '[step]'=variable.step?variable.step:undefined '[min]'=variable.minValue!=null?variable.minValue:undefined '[max]'=variable.maxValue!=null?variable.maxValue:undefined '[autoCorrect]'="true"  '[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)
     kendo-numerictextbox-messages('[decrement]'="'减少'" '[increment]'="'增加'")
-  if (variable.needValid)
-    -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-    validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};
@@ -40,7 +37,7 @@ 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]'="'number'" '[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)

package/lib/template/ui/kendo/table/radiobox.pug

@@ -9,7 +9,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.hasDefaultFocus)

package/lib/template/ui/kendo/table/radioboxgroup.pug

@@ -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)
@@ -21,9 +21,6 @@ if(variable.hasDefaultFocus)
     -attrs["[focusState]"]=variable.focusState+"";
 div('class'='farris-input-wrap')
   farris-radiogroup(id=variable.replacedId?""+variable.replacedId:undefined "input-end-edit" '[disabled]'!=variable.readonly?""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+"" '[data]'=variable.enumDataLang?""+variable.enumDataLang:undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '(setRadioData)'=variable.setRadioData?""+variable.setRadioData:undefined     '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":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" )
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};
@@ -37,7 +34,7 @@ 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.enumDataLang?""+variable.enumDataLang: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)

package/lib/template/ui/kendo/table/richtextbox.pug

@@ -8,7 +8,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}";
 
@@ -19,9 +19,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-html-editor(id=variable.replacedId "html-editor-end-edit" class="form-control"   '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.value:undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined '[theme]'=variable.theme?"'"+variable.theme+"'":undefined  '[maxLength]'=variable.maxLength?"'"+variable.maxLength+"'":undefined '[minLength]'=variable.minLength?"'"+variable.minLength+"'":undefined  '[required]'=variable.require?""+variable.require.value:undefined  '[customToolbarPosition]'=variable.customToolbarPosition?"'"+variable.customToolbarPosition+"'":undefined  '(onEditorCreated)'=variable.onEditorCreated?variable.onEditorCreated+"(param)":undefined '(onContentChanged)'=variable.onContentChanged?variable.onContentChanged+"(param)":undefined  '(onSelectionChanged)'=variable.onSelectionChanged?variable.onSelectionChanged+"":undefined  '(onFocus)'=variable.onFocus?variable.onFocus+"(param)":undefined  '(onBlur)'=variable.onBlur?variable.onBlur+"(param)":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[styles]'=variable.customEditorStyle?""+variable.customEditorStyle:undefined   '[showBorder]'=(variable.isTextArea ||variable.isTextArea==false)?""+variable.isTextArea: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" )
   div(class="farris-feedback")
 if(variable.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)

package/lib/template/ui/kendo/table/select.pug

@@ -4,9 +4,6 @@ div(class="farris-input-wrap")
     kendo-multiselect(id=variable.replacedId "input-end-edit" class="form-control k-widget k-multiselect k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":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)
   else
     kendo-dropdownlist(id=variable.replacedId "input-end-edit" class="form-control k-widget k-dropdown k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":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" )
   div(class="farris-feedback")
 if(variable.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)

package/lib/template/ui/kendo/table/switch.pug

@@ -8,7 +8,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.isTextArea)
@@ -21,9 +21,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   kendo-switch(id=variable.replacedId "input-end-edit" class="form-control k-widget k-switch" '[disabled]'!=variable.disable?variable.disable:undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":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" )
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};
@@ -37,7 +34,7 @@ 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]'="'string'" '[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)

package/lib/template/ui/kendo/table/textbox.pug

@@ -9,7 +9,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['[ngModelOptions]'] = "{standalone:true}";
     -attrs['name'] = variable.replacedId;
 
@@ -29,9 +29,6 @@ div(class="farris-input-wrap")
     if(variable.isPassword)
       -attrs["type"]="password";
     input(id=variable.replacedId class="form-control" "input-end-edit"  '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.value:undefined tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  'maxlength'=(variable.maxLength && variable.maxLength!=0)?""+variable.maxLength:undefined  'minlength'=(variable.minLength && variable.minLength!=0)?""+variable.minLength: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  '[f-input-tips]'=variable.enableTips?""+variable.enableTips.value: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" )
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};
@@ -45,7 +42,7 @@ 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]'="'string'" '[isPassword]'=variable.isPassword?""+variable.isPassword: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)

package/lib/template/ui/kendo/table/timebox.pug

@@ -8,7 +8,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.hasDefaultFocus)
@@ -16,9 +16,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   kendo-timepicker(id=variable.replacedId "input-end-edit" class="form-control k-widget k-timepicker k-header" '[format]'=variable.format?variable.format:undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined  '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined  '[value]'=variable.value?variable.value: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" )
   div(class="farris-feedback")
 if(variable.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)

package/lib/template/ui/kendo/table/timepicker.pug

@@ -9,7 +9,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
   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.hasDefaultFocus)

package/lib/template/ui/kendo/table/tinymcerichtextbox.pug

@@ -8,7 +8,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}";
 
@@ -17,9 +17,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-editor(id=variable.replacedId  'farris-editor-bind'   '[readOnly]'!=variable.readonly?variable.readonly.value+"":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 '[height]'=(variable.size && variable.size.height) '[showBorder]'=(variable.isTextArea ||variable.isTextArea==false)?""+variable.isTextArea:undefined  '[fontFamilyList]'!=variable.fontFamilyList?variable.fontFamilyList:undefined  '[defaultFontFamily]'!=variable.defaultFontFamily?"'"+variable.defaultFontFamily+"'":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" )
   div(class="farris-feedback")
 if(variable.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)

package/lib/template/ui/mobilevue/attachment-file.pug

@@ -4,6 +4,7 @@ fm-attachment-file(
   class=(variable.appearance && variable.appearance.class)  
   v-if=variable.visible?variable.visible+"":"false"
   :fileList=fileList
+  :title=variable.title?"" + variable.title:undefined
   :disabled=variable.disabled?"" + variable.disabled:undefined
   :removable=variable.removable?"" + variable.removable:undefined
   :maxSize=variable.maxSize?"" + variable.maxSize:undefined

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

@@ -19,6 +19,8 @@ div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
     view=variable.view?""+variable.view:undefined 
     :firstDay=variable.firstDay?""+variable.firstDay:undefined 
     :mark=variable.mark?""+variable.mark:undefined 
+    :minDate!=variable.minValue?""+variable.minValue:undefined 
+    :maxDate!=variable.maxValue?""+variable.maxValue:undefined 
     :event=variable.event?""+variable.event:undefined 
     :events=variable.events?""+variable.events:undefined 
     :useLunar=variable.useLunar

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

@@ -1,18 +1,20 @@
 fm-calendar(
   class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  v-if=variable.visible?variable.visible+"":"false"
+  style!=(variable.appearance && variable.appearance.style)
+  v-if!=variable.visible?variable.visible+"":"false"
   title=variable.title?""+variable.title:undefined 
   prevText=variable.prevText?""+variable.prevText:undefined 
   nextText=variable.nextText?""+variable.nextText:undefined 
-  :modelValue=variable.value?""+variable.value:undefined 
-  :firstDay=variable.firstDay?""+variable.firstDay:undefined 
+  :modelValue!=variable.value?""+variable.value:undefined 
+  :firstDay!=variable.firstDay?""+variable.firstDay:undefined 
   view=variable.view?""+variable.view:undefined 
   type=variable.valueType?""+variable.valueType:undefined 
   theme=variable.theme?""+variable.theme:undefined 
-  :mark=variable.mark?""+variable.mark:undefined 
-  :event=variable.event?""+variable.event:undefined 
-  :events=variable.events?""+variable.events:undefined 
-  @dayClick=variable.dayClick?""+variable.dayClick:undefined 
-  @render=variable.render?""+variable.render:undefined 
+  :mark!=variable.mark?""+variable.mark:undefined 
+  :minDate!=variable.minValue?""+variable.minValue:undefined 
+  :maxDate!=variable.maxValue?""+variable.maxValue:undefined 
+  :event!=variable.event?""+variable.event:undefined 
+  :events!=variable.events?""+variable.events:undefined 
+  @dayClick!=variable.dayClick?""+variable.dayClick:undefined 
+  @render!=variable.render?""+variable.render:undefined 
 )

package/lib/utility/devkit/component-parameter-collector/component-button-collector.js

@@ -4,6 +4,7 @@ exports.ComponentButtonCollector = void 0;
 const abstract_component_parameter_collector_1 = require("./abstract-component-parameter-collector");
 const component_button_parameter_1 = require("../component-button-parameter");
 const i18n_1 = require("../../i18n");
+const utility_1 = require("../../../utility");
 class ComponentButtonCollector extends abstract_component_parameter_collector_1.AbstractComponentParameterCollector {
     collect(value, options) {
         const buttonParameters = [];
@@ -25,6 +26,23 @@ class ComponentButtonCollector extends abstract_component_parameter_collector_1.
                 }
             });
         }
+        if (utility_1.ToolHelper.isArray(component.rows, false)) {
+            component.rows.forEach((element) => {
+                if (utility_1.ToolHelper.isArray(element.columns, false)) {
+                    element.columns.forEach((elementColumn) => {
+                        if (elementColumn.editor) {
+                            this.collectionComponentButton(elementColumn.editor, componentButtons, i18nResourcePrefix);
+                        }
+                    });
+                }
+            });
+        }
+        const inputTemplate = component.inputTemplate;
+        if (inputTemplate && inputTemplate.length && component.type == 'QdpFramework') {
+            inputTemplate.forEach((field) => {
+                this.collectionComponentButton(field, componentButtons, i18nResourcePrefix);
+            });
+        }
         if (component && component.type == "Button") {
             const componentButtonParameter = new component_button_parameter_1.ComponentButtonParameter();
             componentButtonParameter.bindingName = component_button_parameter_1.ComponentButtonCreator.createBindingName(component.id);

package/lib/utility/devkit/component-parameter-collector/component-button-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-button-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-button-collector.ts"],"names":[],"mappings":";;;AAAA,qGAA+F;AAG/F,8EAAiG;AACjG,qCAAiD;AASjD,MAAa,wBAAyB,SAAQ,4EAAmC;IAC7E,OAAO,CAAC,KAAU,EAAE,OAA4C;QAC5D,MAAM,gBAAgB,GAA+B,EAAE,CAAC;QACxD,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACnG,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAWO,yBAAyB,CAAC,SAAc,EAAE,gBAA4C,EAAE,kBAA0B;QACtH,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC9B,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;YAClF,CAAC,CAAC,CAAC;SACN;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;oBACvB,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;iBACtF;YACL,CAAC,CAAC,CAAC;SACN;QACD,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE;YACzC,MAAM,wBAAwB,GAA6B,IAAI,qDAAwB,EAAE,CAAC;YAC1F,wBAAwB,CAAC,WAAW,GAAG,mDAAsB,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC9F,wBAAwB,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;YAE3C,IAAI,CAAC,SAAS,CAAC,cAAc,IAAI,SAAS,CAAC,cAAc,IAAI,QAAQ,EAAE;gBACnE,wBAAwB,CAAC,UAAU,GAAG,KAAK,CAAC;gBAC5C,MAAM,eAAe,GAAG,0BAAmB,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;gBACrG,wBAAwB,CAAC,YAAY,GAAG,0BAAmB,CAAC,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrH,gBAAgB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;aACnD;SACJ;IACL,CAAC;CAEJ;AA7CD,4DA6CC"}
+{"version":3,"file":"component-button-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-button-collector.ts"],"names":[],"mappings":";;;AAAA,qGAA+F;AAG/F,8EAAiG;AACjG,qCAAiD;AACjD,8CAA8C;AAS9C,MAAa,wBAAyB,SAAQ,4EAAmC;IAC7E,OAAO,CAAC,KAAU,EAAE,OAA4C;QAC5D,MAAM,gBAAgB,GAA+B,EAAE,CAAC;QACxD,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACnG,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAWO,yBAAyB,CAAC,SAAc,EAAE,gBAA4C,EAAE,kBAA0B;QACtH,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC9B,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;YAClF,CAAC,CAAC,CAAC;SACN;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;oBACvB,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;iBACtF;YACL,CAAC,CAAC,CAAC;SACN;QAED,IAAI,oBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YAC3C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAEpC,IAAI,oBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;oBAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,aAAkB,EAAE,EAAE;wBAC3C,IAAI,aAAa,CAAC,MAAM,EAAE;4BACtB,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;yBAC9F;oBACL,CAAC,CAAC,CAAC;iBACN;YACL,CAAC,CAAC,CAAC;SACN;QACD,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC;QAC9C,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,IAAI,cAAc,EAAE;YAC3E,aAAa,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBACjC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;YAChF,CAAC,CAAC,CAAC;SACN;QACD,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE;YACzC,MAAM,wBAAwB,GAA6B,IAAI,qDAAwB,EAAE,CAAC;YAC1F,wBAAwB,CAAC,WAAW,GAAG,mDAAsB,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC9F,wBAAwB,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;YAE3C,IAAI,CAAC,SAAS,CAAC,cAAc,IAAI,SAAS,CAAC,cAAc,IAAI,QAAQ,EAAE;gBACnE,wBAAwB,CAAC,UAAU,GAAG,KAAK,CAAC;gBAC5C,MAAM,eAAe,GAAG,0BAAmB,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;gBACrG,wBAAwB,CAAC,YAAY,GAAG,0BAAmB,CAAC,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrH,gBAAgB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;aACnD;SACJ;IACL,CAAC;CAEJ;AAhED,4DAgEC"}

package/lib/utility/devkit/component-parameter-collector/component-events-collector.js

@@ -25,6 +25,17 @@ class ComponentEventsCollector extends abstract_component_parameter_collector_1.
                 }
             });
         }
+        if (toolhepler_1.ToolHelper.isArray(component.rows, false)) {
+            component.rows.forEach((element) => {
+                if (toolhepler_1.ToolHelper.isArray(element.columns, false)) {
+                    element.columns.forEach((elementColumn) => {
+                        if (elementColumn.editor) {
+                            this.collectionComponentEvents(elementColumn.editor, eventObjects);
+                        }
+                    });
+                }
+            });
+        }
         if (component) {
             if (component.lookupPicking || component.lookupPickingExpression) {
                 const lookupPicking = {

package/lib/utility/devkit/component-parameter-collector/component-events-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-events-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-events-collector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-events-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-events-collector.ts"],"names":[],"mappings":";;;AAAA,qGAA+F;AAI/F,iDAA8C;AAC9C,6EAAwE;AAQxE,MAAa,wBAAyB,SAAQ,4EAAmC;IAC7E,OAAO,CAAC,KAAU,EAAE,OAA4C;QAC5D,MAAM,eAAe,GAAqB,EAAE,CAAC;QAC7C,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACvD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAWO,yBAAyB,CAAC,SAAc,EAAE,YAA8B;QAC5E,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC9B,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;SACN;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;oBACvB,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;iBAC9D;YACL,CAAC,CAAC,CAAC;SACN;QAGD,IAAI,uBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YAC3C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAEpC,IAAI,uBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;oBAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,aAAkB,EAAE,EAAE;wBAC3C,IAAI,aAAa,CAAC,MAAM,EAAE;4BACtB,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;yBACtE;oBACL,CAAC,CAAC,CAAC;iBACN;YACL,CAAC,CAAC,CAAC;SACN;QAED,IAAI,SAAS,EAAE;YACX,IAAI,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,uBAAuB,EAAE;gBAC9D,MAAM,aAAa,GAAQ;oBACvB,SAAS,EAAE,eAAe;oBAC1B,aAAa,EAAE,SAAS,CAAC,IAAI;oBAC7B,IAAI,EAAE,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,eAAe;oBAC3E,YAAY,EAAE,iDAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC;oBAClF,WAAW,EAAE,gBAAgB;oBAC7B,YAAY,EAAE,SAAS;oBACvB,uBAAuB,EAAE,SAAS,CAAC,uBAAuB;oBAC1D,iBAAiB,EAAE,SAAS,CAAC,gCAAgC,CAAC;iBACjE,CAAC;gBACF,IAAI,SAAS,CAAC,sBAAsB,IAAI,IAAI,IAAI,SAAS,CAAC,aAAa,IAAI,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,eAAe,EAAE;oBAE9I,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC;iBACrC;gBACD,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aAEpC;YACD,IAAI,SAAS,CAAC,YAAY,EAAE;gBACxB,MAAM,YAAY,GAAG;oBACjB,SAAS,EAAE,cAAc;oBACzB,aAAa,EAAE,SAAS,CAAC,IAAI;oBAC7B,IAAI,EAAE,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,cAAc;oBAC1E,YAAY,EAAE,iDAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC;oBACjF,WAAW,EAAE,gBAAgB;oBAC7B,YAAY,EAAE,SAAS;oBACvB,iBAAiB,EAAE,SAAS,CAAC,+BAA+B,CAAC;iBAChE,CAAC;gBACF,IAAI,SAAS,CAAC,sBAAsB,IAAI,IAAI,IAAI,SAAS,CAAC,YAAY,IAAI,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,cAAc,EAAE;oBAE5I,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC;iBACpC;gBACD,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACnC;YACD,IAAI,SAAS,CAAC,gBAAgB,EAAE;gBAC5B,MAAM,gBAAgB,GAAG;oBACrB,SAAS,EAAE,kBAAkB;oBAC7B,aAAa,EAAE,SAAS,CAAC,IAAI;oBAC7B,IAAI,EAAE,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,kBAAkB;oBAC9E,YAAY,EAAE,iDAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC;oBACrF,WAAW,EAAE,gBAAgB;oBAC7B,YAAY,EAAE,SAAS;oBACvB,iBAAiB,EAAE,SAAS,CAAC,yCAAyC,CAAC;iBAC1E,CAAC;gBACF,IAAI,SAAS,CAAC,sBAAsB,IAAI,IAAI,IAAI,SAAS,CAAC,gBAAgB,IAAI,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,kBAAkB,EAAE;oBAEpJ,gBAAgB,CAAC,YAAY,GAAG,IAAI,CAAC;iBACxC;gBACD,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACvC;YACD,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,SAAS,CAAC,4BAA4B,EAAE;gBACtG,MAAM,WAAW,GAAG;oBAChB,SAAS,EAAE,aAAa;oBACxB,aAAa,EAAE,SAAS,CAAC,IAAI;oBAC7B,IAAI,EAAE,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,cAAc;oBAC1E,YAAY,EAAE,iDAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC;oBAChF,WAAW,EAAE,gBAAgB;oBAC7B,YAAY,EAAE,SAAS;oBACvB,iBAAiB,EAAE,SAAS,CAAC,8BAA8B,CAAC;iBAC/D,CAAC;gBACF,IAAI,SAAS,CAAC,sBAAsB,IAAI,IAAI,IAAI,SAAS,CAAC,WAAW,IAAI,GAAG,uBAAU,CAAC,WAAW,CAAC,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,cAAc,EAAE;oBAE3I,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC;iBACnC;gBAED,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,uBAAU,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,KAAK,CAAC,EAAE;oBACvF,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;iBAC5D;gBACD,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAClC;SACJ;IACL,CAAC;CAEJ;AAxHD,4DAwHC"}

package/lib/utility/devkit/component-parameter-collector/component-header-parameter-collector.js

@@ -25,8 +25,15 @@ class ComponentHeaderParameterCollector extends abstract_component_parameter_col
             });
         }
         if (component && (component.type == 'Header' || component.type == "ModalFooter")) {
+            let mainTitle = "";
+            if (component.mainTitle && component.mainTitle.type == "Variable") {
+                mainTitle = toolhepler_1.ToolHelper.createBinding(component.mainTitle, "", externalComponentNameSpace, component.id).value;
+            }
+            else {
+                mainTitle = `${component_header_helper_1.ComponentHeaderHelper.generateMainTitleResource(component.id, i18nResourceKeyPrefix, component.mainTitle)}`;
+            }
             const componentHeaderParameter = {
-                mainTitle: `${component_header_helper_1.ComponentHeaderHelper.generateMainTitleResource(component.id, i18nResourceKeyPrefix, component.mainTitle)}`,
+                mainTitle: mainTitle,
                 subTitle: `${component_header_helper_1.ComponentHeaderHelper.generateSubTitleResource(component.id, i18nResourceKeyPrefix, component.subTitle)}`,
                 id: component.id,
                 showIcon: toolhepler_1.ToolHelper.createBinding(component.showIcon, false, externalComponentNameSpace, component.id).value,

package/lib/utility/devkit/component-parameter-collector/component-header-parameter-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-header-parameter-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-header-parameter-collector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-header-parameter-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-header-parameter-collector.ts"],"names":[],"mappings":"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"}

package/lib/utility/devkit/component-parameter-collector/component-readonly-parameter-collector.js

@@ -26,6 +26,18 @@ class ComponentReadonlyParameterCollector extends abstract_component_parameter_c
                 }
             });
         }
+        if (toolhepler_1.ToolHelper.isArray(component.rows, false)) {
+            component.rows.forEach((element) => {
+                if (toolhepler_1.ToolHelper.isArray(element.columns, false)) {
+                    element.columns.forEach((elementColumn) => {
+                        if (elementColumn.editor) {
+                            this.collectionComponentReadonlyAttribute(elementColumn.editor, componentReadonlyParameters, i18nResourcePrefix, externalComponentNameSpace);
+                        }
+                    });
+                }
+            });
+        }
+        ;
         if (component && component.readonly && toolhepler_1.ToolHelper.isArray(component.readonly, false)) {
             const readonlyParameter = new component_readonly_parameter_1.ComponentReadonlyParameter();
             readonlyParameter.value = toolhepler_1.ToolHelper.createBinding(component.readonly, null, externalComponentNameSpace, component.id);

package/lib/utility/devkit/component-parameter-collector/component-readonly-parameter-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-readonly-parameter-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-readonly-parameter-collector.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAC9C,kFAA6E;AAC7E,kGAA4F;AAC5F,qGAA+F;AAG/F,MAAa,mCAAoC,SAAQ,4EAAmC;IACxF,OAAO,CAAC,KAAU,EAAE,OAA4C;QAC5D,MAAM,kBAAkB,GAAiC,EAAE,CAAC;QAC5D,IAAI,CAAC,oCAAoC,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,0BAA0B,CAAC,CAAC;QACrJ,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAWO,oCAAoC,CAAC,SAAc,EAAE,2BAAyD,EAAE,kBAA0B,EAAE,0BAAkC;QAClL,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC9B,IAAI,CAAC,oCAAoC,CAAC,OAAO,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,0BAA0B,CAAC,CAAC;YACpI,CAAC,CAAC,CAAC;SACN;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;oBACvB,IAAI,CAAC,oCAAoC,CAAC,KAAK,CAAC,MAAM,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,0BAA0B,CAAC,CAAC;iBACxI;YACL,CAAC,CAAC,CAAC;SACN;QACD,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,IAAI,uBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YAClF,MAAM,iBAAiB,GAA+B,IAAI,yDAA0B,EAAE,CAAC;YACvF,iBAAiB,CAAC,KAAK,GAAG,uBAAU,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,0BAA0B,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACvH,iBAAiB,CAAC,OAAO,GAAG,wEAAiC,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAE1F,2BAA2B,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACvD;IACL,CAAC;CACJ;AAvCD,kFAuCC"}
+{"version":3,"file":"component-readonly-parameter-collector.js","sourceRoot":"","sources":["../../../../src/utility/devkit/component-parameter-collector/component-readonly-parameter-collector.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAC9C,kFAA6E;AAC7E,kGAA4F;AAC5F,qGAA+F;AAG/F,MAAa,mCAAoC,SAAQ,4EAAmC;IACxF,OAAO,CAAC,KAAU,EAAE,OAA4C;QAC5D,MAAM,kBAAkB,GAAiC,EAAE,CAAC;QAC5D,IAAI,CAAC,oCAAoC,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,0BAA0B,CAAC,CAAC;QACrJ,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAWO,oCAAoC,CAAC,SAAc,EAAE,2BAAyD,EAAE,kBAA0B,EAAE,0BAAkC;QAClL,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC9B,IAAI,CAAC,oCAAoC,CAAC,OAAO,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,0BAA0B,CAAC,CAAC;YACpI,CAAC,CAAC,CAAC;SACN;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;oBACvB,IAAI,CAAC,oCAAoC,CAAC,KAAK,CAAC,MAAM,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,0BAA0B,CAAC,CAAC;iBACxI;YACL,CAAC,CAAC,CAAC;SACN;QAGD,IAAI,uBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YAC3C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAEpC,IAAI,uBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;oBAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,aAAkB,EAAE,EAAE;wBAC3C,IAAI,aAAa,CAAC,MAAM,EAAE;4BACtB,IAAI,CAAC,oCAAoC,CAAC,aAAa,CAAC,MAAM,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,0BAA0B,CAAC,CAAC;yBAChJ;oBACL,CAAC,CAAC,CAAC;iBACN;YACL,CAAC,CAAC,CAAA;SACL;QAAA,CAAC;QAEF,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,IAAI,uBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YAClF,MAAM,iBAAiB,GAA+B,IAAI,yDAA0B,EAAE,CAAC;YACvF,iBAAiB,CAAC,KAAK,GAAG,uBAAU,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,0BAA0B,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACvH,iBAAiB,CAAC,OAAO,GAAG,wEAAiC,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAE1F,2BAA2B,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACvD;IACL,CAAC;CACJ;AAtDD,kFAsDC"}