@farris/jit-engine 1.3.223 → 1.3.227

package/lib/template/devkit/viewmodel.pug

@@ -1,84 +1,84 @@
-//- -var variable = {name: 'SaleOrderDetailViewModel', bindTo: "/edus", children: [{name:'name1',class:'Class'},{name:'name2',class:'Class'}], commands: [{code: 'formLoad'}, {code: 'removeItem', params: [{name: 'listPath', value: 'WLList'}, {name: 'listPath', value: 'WLList'}]}, {code: 'removeItem', params: [{name: 'listPath', value: 'WLList'}]}, {code: 'removeItem', params: [{name: 'listPath', value: 'WLList'}], paramDescriptions:[{name: 'listPath', type: 'string'}]}]};
-
-| import { Injectable } from '@angular/core';
-| import { ViewModel, NgCommand } from '@farris/devkit';
-| import { Observable } from 'rxjs';
-= '\n'
-if (variable.children && variable.children.length)
-  each item, index in variable.children
-    | import { #{variable.externalPrefix}#{item.class} } from './#{item.class.toLowerCase()}';
-    = '\n'
-|
-| @Injectable()
-| export class #{variable.externalPrefix}#{variable.name} extends ViewModel {
-= '\n'
-|   public bindingPath = '#{variable.bindTo}';
-= '\n'
-= '\n'
-|   public dom = !{variable.dom};
-= '\n'
-= '\n'
-if (variable.children && variable.children.length)
-  | public childViewModels={
-  = '\n'
-  each item, index in variable.children
-    |    '#{variable.externalPrefix}#{item.class}' : '#{item.name}'
-    if (index < variable.children.length-1)
-      | ,
-    = '\n'
-  | }
-= '\n'
-if (variable.children && variable.children.length)
-  each item, index in variable.children
-    |   public #{item.name}: #{variable.externalPrefix}#{item.class};
-    = '\n'
-= '\n'
-if (variable.commands && variable.commands.length)
-  each command in variable.commands
-    |   @NgCommand({
-    |     name: '#{command.code}'
-    if command.params
-      |,
-      = '\n'
-    if command.params
-      |     params: {
-      = '\n'
-      each param, index in command.params
-        |       #{param.name}: '!{param.value}'
-        if (index<(command.params.length-1))
-          | ,
-          = '\n'
-      = '\n'
-      |     }
-      if command.paramDescriptions
-        | ,
-        = '\n'
-        |     paramDescriptions: {
-        ='\n'
-        each paramDesc, index in command.paramDescriptions
-          |       #{paramDesc.name}: { type: '!{paramDesc.type}' }
-          if (index<(command.paramDescriptions.length-1))
-            | ,
-          = '\n'
-        |     }
-    = '\n'
-    if(command.shortcut)
-      |  ,
-      |  keyBinding:{
-      = '\n'
-      |  ctrlKey:#{command.shortcut.ctrl},
-      = '\n'
-      |  altKey:#{command.shortcut.alt},
-      = '\n'
-      |  shiftKey:#{command.shortcut.shift},
-      = '\n'
-      |  key:'#{command.shortcut.key}'
-      = '\n'
-      |}
-    |})
-    |   public #{command.code}(commandParam?: any): Observable<any> { return; }
-    = '\n'
-    = '\n'
-| }
-= '\n'
+//- -var variable = {name: 'SaleOrderDetailViewModel', bindTo: "/edus", children: [{name:'name1',class:'Class'},{name:'name2',class:'Class'}], commands: [{code: 'formLoad'}, {code: 'removeItem', params: [{name: 'listPath', value: 'WLList'}, {name: 'listPath', value: 'WLList'}]}, {code: 'removeItem', params: [{name: 'listPath', value: 'WLList'}]}, {code: 'removeItem', params: [{name: 'listPath', value: 'WLList'}], paramDescriptions:[{name: 'listPath', type: 'string'}]}]};
+
+| import { Injectable } from '@angular/core';
+| import { ViewModel, NgCommand } from '@farris/devkit';
+| import { Observable } from 'rxjs';
+= '\n'
+if (variable.children && variable.children.length)
+  each item, index in variable.children
+    | import { #{variable.externalPrefix}#{item.class} } from './#{item.class.toLowerCase()}';
+    = '\n'
+|
+| @Injectable()
+| export class #{variable.externalPrefix}#{variable.name} extends ViewModel {
+= '\n'
+|   public bindingPath = '#{variable.bindTo}';
+= '\n'
+= '\n'
+|   public dom = !{variable.dom};
+= '\n'
+= '\n'
+if (variable.children && variable.children.length)
+  | public childViewModels={
+  = '\n'
+  each item, index in variable.children
+    |    '#{variable.externalPrefix}#{item.class}' : '#{item.name}'
+    if (index < variable.children.length-1)
+      | ,
+    = '\n'
+  | }
+= '\n'
+if (variable.children && variable.children.length)
+  each item, index in variable.children
+    |   public #{item.name}: #{variable.externalPrefix}#{item.class};
+    = '\n'
+= '\n'
+if (variable.commands && variable.commands.length)
+  each command in variable.commands
+    |   @NgCommand({
+    |     name: '#{command.code}'
+    if command.params
+      |,
+      = '\n'
+    if command.params
+      |     params: {
+      = '\n'
+      each param, index in command.params
+        |       #{param.name}: '!{param.value}'
+        if (index<(command.params.length-1))
+          | ,
+          = '\n'
+      = '\n'
+      |     }
+      if command.paramDescriptions
+        | ,
+        = '\n'
+        |     paramDescriptions: {
+        ='\n'
+        each paramDesc, index in command.paramDescriptions
+          |       #{paramDesc.name}: { type: '!{paramDesc.type}' }
+          if (index<(command.paramDescriptions.length-1))
+            | ,
+          = '\n'
+        |     }
+    = '\n'
+    if(command.shortcut)
+      |  ,
+      |  keyBinding:{
+      = '\n'
+      |  ctrlKey:#{command.shortcut.ctrl},
+      = '\n'
+      |  altKey:#{command.shortcut.alt},
+      = '\n'
+      |  shiftKey:#{command.shortcut.shift},
+      = '\n'
+      |  key:'#{command.shortcut.key}'
+      = '\n'
+      |}
+    |})
+    |   public #{command.code}(commandParam?: any): Observable<any> { return; }
+    = '\n'
+    = '\n'
+| }
+= '\n'
 = '\n'

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

@@ -52,7 +52,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
           if(variable.focusState)
             -attrs["[focusState]"]=variable.focusState+"";
         -attrs['#'+variable.replacedId] = "";
-        farris-lookup-grid(id=variable.replacedId "input-end-edit" 'lookupGridRef'  '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)?"'" + variable.dataSource.uri + "'":undefined  '[idField]'=(variable.dataSource && variable.dataSource.idField)?"'" + variable.dataSource.idField + "'":undefined '[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 '[treeTableOptions]'=variable.treeTableOptions?variable.treeTableOptions:undefined  '[showCheckAll]'=variable.showCheckAll?""+variable.showCheckAll.value:undefined '[quickSelect]'=variable.quickSelectName?""+variable.quickSelectName:undefined '[treeToList]'=variable.treeToList?""+variable.treeToList.value:undefined '[navTreeToList]'=variable.navTreeToList?""+variable.navTreeToList.value:undefined  '[showNavigation]'=variable.showNavigation?""+variable.showNavigation.value:undefined  '[showCascadeControl]'=variable.showCascadeControl?""+variable.showCascadeControl.value:undefined )&attributes(attrs)
+        farris-lookup-grid(id=variable.replacedId "input-end-edit" 'lookupGridRef'  '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)?"'" + variable.dataSource.uri + "'":undefined  '[idField]'=(variable.dataSource && variable.dataSource.idField)?"'" + variable.dataSource.idField + "'":undefined '[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 '[treeTableOptions]'=variable.treeTableOptions?variable.treeTableOptions:undefined  '[showCheckAll]'=variable.showCheckAll?""+variable.showCheckAll.value:undefined '[quickSelect]'=variable.quickSelectName?""+variable.quickSelectName:undefined '[treeToList]'=variable.treeToList?""+variable.treeToList.value:undefined '[navTreeToList]'=variable.navTreeToList?""+variable.navTreeToList.value:undefined  '[showNavigation]'=variable.showNavigation?""+variable.showNavigation.value:undefined  '[showCascadeControl]'=variable.showCascadeControl?""+variable.showCascadeControl.value:undefined  '[showSelected]'=variable.showSelected?""+variable.showSelected.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" )

package/lib/template/ui/kendo/multi-select.pug

@@ -9,7 +9,7 @@ if(variable.hasDefaultFocus)
   -attrs["farris-set-focus"]="";
   if(variable.focusState)
     -attrs["[focusState]"]=variable.focusState+"";
-multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectRef' 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[enableTargetSort]'= (variable.enableTargetSort || variable.enableTargetSort==false)?""+variable.enableTargetSort:undefined  '[showCascadeControl]'=(variable.showCascadeControl||variable.showCascadeControl==false)?""+variable.showCascadeControl:undefined )&attributes(attrs)
+multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectRef' 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[enableTargetSort]'= (variable.enableTargetSort || variable.enableTargetSort==false)?""+variable.enableTargetSort:undefined  '[showCascadeControl]'=(variable.showCascadeControl||variable.showCascadeControl==false)?""+variable.showCascadeControl:undefined   '[wordWrap]'=variable.wordWrap?""+variable.wordWrap.value:undefined   '[enableMoveMore]'=variable.enableMoveMore?""+variable.enableMoveMore.value:undefined )&attributes(attrs)
   ng-template(farrisTemplate="text" let-data 'let-ms'="instance")
     if(variable.content)
       | !{variable.content}

package/lib/template/ui/kendo/table/farris-datepicker.pug

@@ -34,6 +34,7 @@ div(class="farris-input-wrap")
                         '[hourStep]'=(variable.hourStep || variable.hourStep==0)?""+variable.hourStep:undefined   
                         '[minuteStep]'=(variable.minuteStep || variable.minuteStep==0)?""+variable.minuteStep:undefined 
                         '[secondStep]'=(variable.secondStep || variable.secondStep==0)?""+variable.secondStep:undefined
+                        '[firstDayOfWeek]'=variable.firstDayOfWeek?"'"+variable.firstDayOfWeek+"'":undefined
                     )&attributes(attrs)
   div(class="farris-feedback")
   if(variable.isTextArea)

package/lib/template/ui/kendo/table/farris-static-text.pug

@@ -1,5 +1,4 @@
 div(class="farris-label-wrap")
     label(class="col-form-label")
         span(class="farris-label-info text-danger" '*ngIf'=variable.require?""+variable.require.value:undefined) *
-        span(class="farris-label-text")
-            |#{variable.text}
+        span(class="farris-label-text") {{'!{variable.textLang}'|lang:lang:'!{variable.text}'}}            

package/lib/template/ui/kendo/table/farris-time-picker.pug

@@ -25,7 +25,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
-  farris-time-picker(id=variable.replacedId "input-end-edit" '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined  '[editable]'=(variable.editable||variable.editable==false)?variable.editable.toString():undefined '[hourStep]'=variable.hourStep?variable.hourStep.toString():undefined '[minuteStep]'=variable.minuteStep?variable.minuteStep.toString():undefined '[secondStep]'=variable.secondStep?variable.secondStep.toString():undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined      '[hideDisabledOptions]'=(variable.hideDisabledOptions || variable.hideDisabledOptions==false)?variable.hideDisabledOptions.toString():undefined '(clear)'=variable.clear?variable.clear:undefined  '(valueChanged)'=variable.valueChanged?variable.valueChanged.toString():undefined '(openChange)'=variable.openChange?variable.openChange.toString():undefined '[use12Hours]'=(variable.use12Hours || variable.use12Hours==false)?variable.use12Hours+"":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)
+  farris-time-picker(id=variable.replacedId "input-end-edit" '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined  '[editable]'=(variable.editable||variable.editable==false)?variable.editable.toString():undefined '[hourStep]'=variable.hourStep?variable.hourStep.toString():undefined '[minuteStep]'=variable.minuteStep?variable.minuteStep.toString():undefined '[secondStep]'=variable.secondStep?variable.secondStep.toString():undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined      '[hideDisabledOptions]'=(variable.hideDisabledOptions || variable.hideDisabledOptions==false)?variable.hideDisabledOptions.toString():undefined '(clear)'=variable.clear?variable.clear:undefined  '(valueChanged)'=variable.valueChanged?variable.valueChanged.toString():undefined '(openChange)'=variable.openChange?variable.openChange.toString():undefined '[use12Hours]'=(variable.use12Hours || variable.use12Hours==false)?variable.use12Hours+"":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   '[showHeader]'=variable.showHeader?""+variable.showHeader.value:undefined)&attributes(attrs)
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};

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

@@ -30,7 +30,7 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   -attrs['#'+variable.replacedId] = "";
-  farris-lookup-grid(id=variable.replacedId "input-end-edit" 'lookupGridRef' '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  '[quickSelect]'=variable.quickSelectName?""+variable.quickSelectName:undefined)&attributes(attrs)
+  farris-lookup-grid(id=variable.replacedId "input-end-edit" 'lookupGridRef' '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  '[quickSelect]'=variable.quickSelectName?""+variable.quickSelectName:undefined '[showSelected]'=variable.showSelected?""+variable.showSelected.value:undefined )&attributes(attrs)
   div(class="farris-feedback")
   if(variable.isTextArea)
     -var areaAttrs = {};

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

@@ -9,7 +9,7 @@ if(variable.hasDefaultFocus)
   -attrs["farris-set-focus"]="";
   if(variable.focusState)
     -attrs["[focusState]"]=variable.focusState+"";
-multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex: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)
+multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex: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  '[wordWrap]'=variable.wordWrap?""+variable.wordWrap.value:undefined  '[enableMoveMore]'=variable.enableMoveMore?""+variable.enableMoveMore.value:undefined )&attributes(attrs)
   ng-template(farrisTemplate="text" let-data 'let-ms'="instance")
     if(variable.content)
       | !{variable.content}

package/lib/template/ui/mobileapprove/attachment-panel-for-mobileapprove.pug

@@ -1,15 +1,15 @@
--var stringTitle = String(variable.title)
--var localTitle = /[\s\S]*?\{\{=([\s\S]+?)\}\}[\s\S]*?/g.test(stringTitle) ? variable.title : `{{= translate('${stringTitle}') || '${stringTitle}'}}`
-div(
-class="attach-preview-container"
-data-role="attach-preview-panel"
-data-attach-panel-title=""+(localTitle)+""
-data-attach-table= ""+(variable.bindTo)+""
-data-attach-id-field=""+(variable.attachmentIdField &&variable.attachmentIdField.bindingPath)+""
-data-attach-name-field=""+(variable.attachmentNameField &&variable.attachmentNameField.bindingPath)+""
-data-attach-rootId= ""+(variable.attachmentRootId)+""
-data-attach-enableDownload= ""+(variable.enableDownloadAttachment?variable.enableDownloadAttachment:false)
-data-attach-enablePreviewFileConfig=""+(variable.enablePreviewFileConfig?variable.enablePreviewFileConfig:"")
-data-attach-titleIcon = ""+(variable.headerIcon&& variable.headerIcon.icon ? "fm-icon-" + ""+variable.headerIcon.icon+"": "")
-data-attach-titleIconColor = ""+(variable.headerIcon && variable.headerIcon.color?"fm-bg-icon-"+""+variable.headerIcon.color+"":"")
+-var stringTitle = String(variable.title)
+-var localTitle = /[\s\S]*?\{\{=([\s\S]+?)\}\}[\s\S]*?/g.test(stringTitle) ? variable.title : `{{= translate('${stringTitle}') || '${stringTitle}'}}`
+div(
+class="attach-preview-container"
+data-role="attach-preview-panel"
+data-attach-panel-title=""+(localTitle)+""
+data-attach-table= ""+(variable.bindTo)+""
+data-attach-id-field=""+(variable.attachmentIdField &&variable.attachmentIdField.bindingPath)+""
+data-attach-name-field=""+(variable.attachmentNameField &&variable.attachmentNameField.bindingPath)+""
+data-attach-rootId= ""+(variable.attachmentRootId)+""
+data-attach-enableDownload= ""+(variable.enableDownloadAttachment?variable.enableDownloadAttachment:false)
+data-attach-enablePreviewFileConfig=""+(variable.enablePreviewFileConfig?variable.enablePreviewFileConfig:"")
+data-attach-titleIcon = ""+(variable.headerIcon&& variable.headerIcon.icon ? "fm-icon-" + ""+variable.headerIcon.icon+"": "")
+data-attach-titleIconColor = ""+(variable.headerIcon && variable.headerIcon.color?"fm-bg-icon-"+""+variable.headerIcon.color+"":"")
 )

package/lib/template/ui/mobileapprove/content-container.pug

@@ -1,7 +1,7 @@
-//- -var variable={"appearance": {"class": "p-2", "style": "width:'20px'"}}; 
-if(variable.parentIsFrameComponent)
-    div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class)+" fm-page-approveformat fm-page-approveformat-like-card"    'data-enableMainCollapse'="{{isMainCollapse}}" 'data-isMainDefaultCollapse'="{{isMainDefaultCollapse}}" style=(variable.appearance && variable.appearance.style)  )
-        | {{content}}
-else
-    div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )
+//- -var variable={"appearance": {"class": "p-2", "style": "width:'20px'"}}; 
+if(variable.parentIsFrameComponent)
+    div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class)+" fm-page-approveformat fm-page-approveformat-like-card"    'data-enableMainCollapse'="{{isMainCollapse}}" 'data-isMainDefaultCollapse'="{{isMainDefaultCollapse}}" style=(variable.appearance && variable.appearance.style)  )
+        | {{content}}
+else
+    div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )
         | {{content}}

package/lib/template/ui/mobileapprove/detailheader-for-mobileapprove.pug

@@ -1,17 +1,17 @@
-div(class="fm-approve--detail-header "+(variable.customTemplateClass?""+variable.customTemplateClass:"") )
-  if(variable.useCustomTemplate)
-    |!{variable.customTemplateHtml}
-  else
-    div(class="fm-approve--detail-header-inner")
-      div(class="detail-header--avatar")
-        div(class="fm-round-bg")
-          if(variable.enablePersonAvatar)
-            div(class="fm-avatar-img-wrapper-container")
-          else
-            span(class="fm-round-bg-text")
-              |{{=!{variable.personAvatar.bindingModelName}}}
-      div(class="detail-header---info")
-        div(class="detail-header---info-title")
-          |{{=!{variable.person.bindingModelName}}}的【{{=!{variable.applyType.bindingModelName}}}】
-        div(class="detail-header---info-subtitle")
+div(class="fm-approve--detail-header "+(variable.customTemplateClass?""+variable.customTemplateClass:"") )
+  if(variable.useCustomTemplate)
+    |!{variable.customTemplateHtml}
+  else
+    div(class="fm-approve--detail-header-inner")
+      div(class="detail-header--avatar")
+        div(class="fm-round-bg")
+          if(variable.enablePersonAvatar)
+            div(class="fm-avatar-img-wrapper-container")
+          else
+            span(class="fm-round-bg-text")
+              |{{=!{variable.personAvatar.bindingModelName}}}
+      div(class="detail-header---info")
+        div(class="detail-header---info-title")
+          |{{=!{variable.person.bindingModelName}}}的【{{=!{variable.applyType.bindingModelName}}}】
+        div(class="detail-header---info-subtitle")
           |{{=!{variable.personDepartment.bindingModelName}}}

package/lib/template/ui/mobileapprove/fieldset-for-mobileapprove.pug

@@ -1,7 +1,7 @@
-fieldset(class=variable.panelCollapseVisible?"fm-panel-list-items-group fm-state-visible":"fm-panel-list-items-group"  'data-enableGroupCollapse'=(variable.enableCollapse || variable.enableCollapse==false)?""+variable.enableCollapse:undefined  'data-isDefaultGroupCollapse'=(variable.collapse || variable.collapse==false)?""+variable.collapse:undefined )
-  legend(class="items-group--legend")
-    div(class="items-group--header")
-      h6(class="items-group--header-title")
-        | !{variable.title}
-  div(class="items-group--items")
+fieldset(class=variable.panelCollapseVisible?"fm-panel-list-items-group fm-state-visible":"fm-panel-list-items-group"  'data-enableGroupCollapse'=(variable.enableCollapse || variable.enableCollapse==false)?""+variable.enableCollapse:undefined  'data-isDefaultGroupCollapse'=(variable.collapse || variable.collapse==false)?""+variable.collapse:undefined )
+  legend(class="items-group--legend")
+    div(class="items-group--header")
+      h6(class="items-group--header-title")
+        | !{variable.title}
+  div(class="items-group--items")
     | {{content}}

package/lib/template/ui/mobileapprove/html-panel-for-mobileapprove.pug

@@ -1,23 +1,23 @@
--var stringTitle = String(variable.title)
--var localTitle = /[\s\S]*?\{\{=([\s\S]+?)\}\}[\s\S]*?/g.test(stringTitle) ? variable.title : `{{= translate('${stringTitle}') || '${stringTitle}'}}`
-if(variable.showTitle&&variable.headerIcon)
-  div(class="fm-apply-panel-list")
-    div(class="panel-list--header")
-      h5(class="panel-list--header-title  header-title--with-icon")
-        span(class="img-round--wrapper "+(variable.headerIcon && variable.headerIcon.color?"fm-bg-icon-"+""+variable.headerIcon.color+"":""))
-          i(class="fm-icon "+(variable.headerIcon && variable.headerIcon.icon ? "fm-icon-" + ""+variable.headerIcon.icon+"": ""))
-        |!{localTitle}
-    div(class="fm-apply-panel")
-      if(variable.contents && variable.contents.length > 0)
-      | {{content}}
-else if(variable.showTitle&&!variable.headerIcon)
-  div(class="fm-apply-panel-list")
-    div(class="panel-list--header")
-       h5(class="panel-list--header-title  header-title--with-icon")
-        |!{localTitle}
-  if(variable.contents && variable.contents.length > 0)
-    div(class="fm-apply-panel")
-    |{{content}}
-else
-    if(variable.contents && variable.contents.length > 0)
+-var stringTitle = String(variable.title)
+-var localTitle = /[\s\S]*?\{\{=([\s\S]+?)\}\}[\s\S]*?/g.test(stringTitle) ? variable.title : `{{= translate('${stringTitle}') || '${stringTitle}'}}`
+if(variable.showTitle&&variable.headerIcon)
+  div(class="fm-apply-panel-list")
+    div(class="panel-list--header")
+      h5(class="panel-list--header-title  header-title--with-icon")
+        span(class="img-round--wrapper "+(variable.headerIcon && variable.headerIcon.color?"fm-bg-icon-"+""+variable.headerIcon.color+"":""))
+          i(class="fm-icon "+(variable.headerIcon && variable.headerIcon.icon ? "fm-icon-" + ""+variable.headerIcon.icon+"": ""))
+        |!{localTitle}
+    div(class="fm-apply-panel")
+      if(variable.contents && variable.contents.length > 0)
+      | {{content}}
+else if(variable.showTitle&&!variable.headerIcon)
+  div(class="fm-apply-panel-list")
+    div(class="panel-list--header")
+       h5(class="panel-list--header-title  header-title--with-icon")
+        |!{localTitle}
+  if(variable.contents && variable.contents.length > 0)
+    div(class="fm-apply-panel")
+    |{{content}}
+else
+    if(variable.contents && variable.contents.length > 0)
     | {{content}}

package/lib/template/ui/mobileapprove/html-template.pug

@@ -1,2 +1,2 @@
-if(variable.html)
-    |!{variable.html}
+if(variable.html)
+    |!{variable.html}

package/lib/template/ui/mobileapprove/panel-for-mobileapprove.pug

@@ -1,10 +1,10 @@
-if(variable.isDetail)
-  div(class="fm-apply-list")
-    if(variable.contents && variable.contents.length>0)
-      |{{content}}
-else
-  div(class="fm-apply-panel-list" )
-    div(class="fm-apply-panel")
-      div(class="fm-apply-list")
-        if(variable.contents && variable.contents.length>0)
-          |{{content}}
+if(variable.isDetail)
+  div(class="fm-apply-list")
+    if(variable.contents && variable.contents.length>0)
+      |{{content}}
+else
+  div(class="fm-apply-panel-list" )
+    div(class="fm-apply-panel")
+      div(class="fm-apply-list")
+        if(variable.contents && variable.contents.length>0)
+          |{{content}}

package/lib/template/ui/mobileapprove/statictext-for-mobileapprove.pug

@@ -1,22 +1,22 @@
--var stringTitle = String(variable.title)
--var localTitle = /[\s\S]*?\{\{=([\s\S]+?)\}\}[\s\S]*?/g.test(stringTitle) ? variable.title : `{{= translate('${stringTitle}') || '${stringTitle}'}}`
-if(variable.hideFunc)
-  div(class=variable.panelCollapseVisible?"fm-apply-list-item fm-state-visible":"fm-apply-list-item" style != variable.hideFunc)
-    div(class="fm-apply-list-item-label")
-      |!{localTitle}
-    if(variable.highlight)
-      div(class="fm-apply-list-item-text fm-text-warning fm-weight")
-        |{{=!{variable.bindingModelName}}}
-    else
-      div(class="fm-apply-list-item-text ")
-        |{{=!{variable.bindingModelName}}}
-else
-  div(class=variable.panelCollapseVisible?"fm-apply-list-item fm-state-visible":"fm-apply-list-item")
-    div(class="fm-apply-list-item-label")
-      |!{localTitle}
-    if(variable.highlight)
-      div(class="fm-apply-list-item-text fm-text-warning fm-weight")
-        |{{=!{variable.bindingModelName}}}
-    else
-      div(class="fm-apply-list-item-text ")
-        |{{=!{variable.bindingModelName}}}
+-var stringTitle = String(variable.title)
+-var localTitle = /[\s\S]*?\{\{=([\s\S]+?)\}\}[\s\S]*?/g.test(stringTitle) ? variable.title : `{{= translate('${stringTitle}') || '${stringTitle}'}}`
+if(variable.hideFunc)
+  div(class=variable.panelCollapseVisible?"fm-apply-list-item fm-state-visible":"fm-apply-list-item" style != variable.hideFunc)
+    div(class="fm-apply-list-item-label")
+      |!{localTitle}
+    if(variable.highlight)
+      div(class="fm-apply-list-item-text fm-text-warning fm-weight")
+        |{{=!{variable.bindingModelName}}}
+    else
+      div(class="fm-apply-list-item-text ")
+        |{{=!{variable.bindingModelName}}}
+else
+  div(class=variable.panelCollapseVisible?"fm-apply-list-item fm-state-visible":"fm-apply-list-item")
+    div(class="fm-apply-list-item-label")
+      |!{localTitle}
+    if(variable.highlight)
+      div(class="fm-apply-list-item-text fm-text-warning fm-weight")
+        |{{=!{variable.bindingModelName}}}
+    else
+      div(class="fm-apply-list-item-text ")
+        |{{=!{variable.bindingModelName}}}

package/lib/utility/devkit/component-external-container-parameter-creator.js.map

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

package/lib/utility/devkit/component-parameter-collector/farris-section-collector.js

@@ -45,7 +45,7 @@ class FarrisSectionCollector extends abstract_component_parameter_collector_1.Ab
             }
             const sectionToolbarId = component.toolbar.id || component.id;
             const sectionToolbar = {
-                id: sectionToolbarId,
+                id: toolhepler_1.ToolHelper.toCamelCase(toolhepler_1.ToolHelper.tf(sectionToolbarId)),
                 position: component.toolbar.position,
                 visible: toolhepler_1.ToolHelper.createBinding(component.toolbar.visible, true, externalComponentNameSpace, sectionToolbarId),
                 readonly: toolhepler_1.ToolHelper.createBinding(component.toolbar.readonly, false, externalComponentNameSpace, sectionToolbarId),
@@ -63,13 +63,15 @@ class FarrisSectionCollector extends abstract_component_parameter_collector_1.Ab
                 replacedId: toolhepler_1.ToolHelper.replaceHengXianAndDotToXiaHuaXian(sectionToolbarId),
                 controlIndex: null,
                 contents: [],
-                viewModel: viewModel
+                viewModel: viewModel,
+                states: {},
+                visibleStates: {}
             };
-            this.collectFarrisSectionToolbarItems(component.toolbar, sectionToolbar.contents, i18nResourcePrefix, externalComponentNameSpace, viewModel);
+            this.collectFarrisSectionToolbarItems(component.toolbar, sectionToolbar.contents, sectionToolbar.states, sectionToolbar.visibleStates, i18nResourcePrefix, externalComponentNameSpace, viewModel);
             return sectionToolbar;
         }
     }
-    collectFarrisSectionToolbarItems(component, tabToolbarItems, i18nResourceKeyPrefix, externalComponentNameSpace, viewModel) {
+    collectFarrisSectionToolbarItems(component, tabToolbarItems, states, visibleState, i18nResourceKeyPrefix, externalComponentNameSpace, viewModel) {
         const tabToolBarItems = component.contents;
         if (toolhepler_1.ToolHelper.isArray(tabToolBarItems, false)) {
             tabToolBarItems.forEach((element) => {
@@ -107,8 +109,15 @@ class FarrisSectionCollector extends abstract_component_parameter_collector_1.Ab
                     split: barItemConfig.split,
                     click: barItemConfig.click ? `${barItemConfig.click}` : "",
                     controlIndex: null,
-                    viewModel: viewModel
+                    viewModel: viewModel,
+                    isDP: !!(element.items && element.items.length)
                 };
+                states[barItemConfig.id] = (barItemConfig.disable || barItemConfig.disable == false) ? (typeof (barItemConfig.disable) == "boolean" ? "" + barItemConfig.disable : barItemConfig.disable) : 'false';
+                visibleState[barItemConfig.id] = toolhepler_1.ToolHelper.createBinding(barItemConfig.visible, true, externalComponentNameSpace, barItemConfig.id).value;
+                if (element.items && element.items.length) {
+                    element.contents = element.items;
+                    this.collectFarrisSectionToolbarItems(element, farrisToolbarItem.contents, states, visibleState, i18nResourceKeyPrefix, externalComponentNameSpace, viewModel);
+                }
                 tabToolbarItems.push(farrisToolbarItem);
             });
         }