@farris/jit-engine 1.4.96 → 1.4.98

package/README.md

@@ -1,3 +1,11 @@
+1.4.98
+
+    特性整合版本
+    
+1.4.97
+
+    修复可编辑列表文本列最大长度问题
+    
 1.4.96
 
     修复筛选条智能输入框国际化问题

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

@@ -1,36 +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 && stringTitle && variable.showTitleType === "custom")
-  div(class="fm-apply-panel-list" data-navigable="true")
-    div(class="panel-list--header")
-      h5(class="panel-list--header-title  header-title--with-icon")
-        i(class="fm-icon fm-icon-triangle")
-        span(class="header-title-text")
-          | !{localTitle}
-    div(class="fm-apply-panel fm-apply-html-panel")
-      if(variable.contents && variable.contents.length > 0)
-      | {{content}}
-else if(variable.showTitle && variable.headerIcon && variable.showTitleType !== "custom")
-  div(class="fm-apply-panel-list" data-navigable="true")
+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 fm-apply-html-panel")
+        |!{localTitle}
+    div(class="fm-apply-panel")
       if(variable.contents && variable.contents.length > 0)
       | {{content}}
-else if(variable.showTitle && stringTitle && !variable.headerIcon && variable.showTitleType !== "custom")
-  div(class="fm-apply-panel-list" data-navigable="true")
+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}
-    div(class="fm-apply-panel fm-apply-html-panel")
-      if(variable.contents && variable.contents.length > 0)
-      | {{content}}
+        |!{localTitle}
+  if(variable.contents && variable.contents.length > 0)
+    div(class="fm-apply-panel")
+    |{{content}}
 else
-  div(class="fm-apply-panel-list")
-    div(class="fm-apply-panel fm-apply-html-panel fm-apply-html-panel--no-header")
-      if(variable.contents && variable.contents.length > 0)
-      | {{content}}
+    if(variable.contents && variable.contents.length > 0)
+    | {{content}}

package/lib/template/ui/mobilevue/approval-info.pug

@@ -11,6 +11,3 @@ fm-approval-info(
   releaseDate=variable.releaseDate?""+variable.releaseDate:undefined 
   description=variable.description?""+variable.description:undefined 
 )&attributes(attrs)
-  if(variable.description)
-    template(#description)
-      | !{variable.description}

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

@@ -0,0 +1,55 @@
+//- -variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-attrs.placeholder = variable.placeholder? String(variable.placeholder) : undefined 
+-attrs.label = variable.title? String(variable.title) : undefined 
+-attrs.ref = variable.replacedId? String(variable.replacedId) : undefined 
+-attrs.bindingpath = variable.binding && variable.binding.path ? variable.binding.path : undefined 
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var require = variable.require ? String(variable.require.value) : undefined;
+-var readonly = variable.readonly ? String(variable.readonly.value) : undefined;
+-var disable = variable.disable ? String(variable.disable.value) : undefined;
+-var binding = variable.binding && variable.binding.path ? "form."+variable.binding.path+".value" : undefined 
+
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+)
+  fm-area-picker(
+    v-model=binding
+    :required=require
+    :readonly=readonly
+    :disabled=disable
+    :modelValue=variable.modelValue ? variable.modelValue+"":undefined 
+    direction=variable.direction?variable.direction+"":undefined
+    title=variable.title?""+variable.title:undefined
+    input-align="right"
+    :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
+    :columns-num!=variable.displayType?variable.displayType+"":undefined
+    :error-message!=variable.errorMessage
+    error-message-align=variable.errorMessage ? "right" : undefined
+    @change=variable.change ? String(variable.change) : undefined 
+  )&attributes(attrs)
+    if(variable.leftTemplate)
+      template(#left-icon)
+        | !{variable.leftTemplate}
+    if(variable.rightTemplate)
+      template(#right-icon)
+        | !{variable.rightTemplate}
+    if(variable.extraTemplate)
+      template(#extra)
+        | !{variable.extraTemplate}
+    if(variable.valueTemplate)
+      template(v-slot:value="slotProps")
+        | !{variable.valueTemplate}
+    if(variable.labelTips) 
+      template(#title)
+        <span>!{variable.title}</span>
+        <fm-popover :hasMask="false" placement="topLeft" className="fm-input-label-tips" :offset="{left: -5}">
+          <fm-icon name="s-illustrate-o"/>
+          <template #content>
+            <div class="fm-input-label-tips-content"><span>!{variable.labelTips}</span></div>
+          </template>
+        </fm-popover>

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

@@ -0,0 +1,19 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+div(
+ v-if!=""+visible
+)
+	fm-avatar(
+	  fit!=variable.fit?"" + variable.fit:undefined 
+	  border!=variable.border?"" + variable.border:undefined
+	  srcMode!=variable.srcMode?"" + variable.srcMode:undefined
+	  :sysUserId!=variable.sysUserId?"" + variable.sysUserId:undefined
+	  :dynamicSrc!=variable.dynamicSrc?"" + variable.dynamicSrc:undefined 
+	  :attachId!=variable.attachId?"" + variable.attachId:undefined 
+	  rootId!=variable.rootId?"" + variable.rootId:undefined
+	  :avatarText !=variable.avatarText?"" + variable.avatarText:undefined 
+	  width!=variable.width?"" + variable.width:undefined 
+	  height!=variable.height?"" + variable.height:undefined 
+	)&attributes(attrs)

package/lib/template/ui/mobilevue/common/text-common.pug

@@ -0,0 +1,80 @@
+mixin getData(variable,isLabel)
+    -var attrs = {};
+    -attrs.class = isLabel?'fm-common-label ':'';
+    -attrs.class += variable.appearance && variable.appearance.class ?variable.appearance.class:'';
+    -attrs.style = variable.appearance && variable.appearance.style?variable.appearance.style:'';
+    -attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+    -var visible = variable.visible ? String(variable.visible.value) : 'false';
+    -var binding = variable.binding? variable.binding : undefined
+    -var fontSize = variable.fontSize? String(variable.fontSize) : undefined 
+    -var lineHeight = variable.lineHeight? String(variable.lineHeight) : undefined 
+    -var semanticColor = variable.semanticColor? String(variable.semanticColor) : undefined 
+    -var formatter = variable.formatter ? variable.formatter:{}
+    -var displayType = variable.displayType? String(variable.displayType) : undefined 
+    -var formatterType = 'string'
+    -var valueStr = ''
+    -var textBindingPrefix = variable.textBindingPrefix? String(variable.textBindingPrefix):undefined
+
+
+    //--样式class
+    if(displayType)
+        if(displayType.startsWith('title-'))
+            -attrs.class = `fm-common-title fm-${displayType} ${attrs.class}`
+        if(displayType.startsWith('text-'))
+            -attrs.class = `fm-common-text fm-${displayType} ${attrs.class}`
+
+    if(semanticColor)
+        -attrs.class += ` fm-text-color-${semanticColor}`
+
+        //--内容
+    if(!isLabel)
+        if(binding && binding.type)
+            if(binding.type === 'Const')
+                -valueStr = `'${binding.value}'`;
+            if(binding.type === 'Form')
+                -valueStr = `${textBindingPrefix}${binding.bindingPath}`;
+            if(binding.type === 'LocaleVariable' || binding.type === 'RemoteVariable')
+                -valueStr = `uiState.${binding.code}`;
+    else
+        if(typeof binding==='string')
+            -valueStr = `'${binding}'`;
+        else
+            -valueStr = `uiState.${binding.fullPath}`;
+
+    if(formatter && formatter.type)
+        -formatterType = formatter.type
+        -delete formatter.type
+    -var content = `{{$formatUtils.${formatterType}(${valueStr},${JSON.stringify(formatter)})}}`
+
+
+    //--样式
+    if(attrs.style)
+        -attrs.style += `;`
+
+    if(variable.size && variable.size.width)
+        -attrs.style += `width:${variable.size.width}px;`
+
+
+    if(variable.size && variable.size.height)
+        -attrs.style += `height:${variable.size.height}px;`
+
+    if(fontSize)
+        -attrs.style += `font-size:${fontSize}px;`
+
+    if(lineHeight)
+        -attrs.style += `line-height:${lineHeight}px;`
+
+    if(isLabel)
+        label()&attributes(attrs)
+            | !{content}
+    else if(displayType && displayType.startsWith('title-'))
+        div(
+        v-if=visible
+        )&attributes(attrs)
+            | !{content}
+    else 
+        span(
+        v-if=visible
+        )&attributes(attrs)
+            | !{content}
+

package/lib/template/ui/mobilevue/fm-staff-info.pug

@@ -0,0 +1,10 @@
+fm-staff-info(
+  v-if!=variable.visible?variable.visible+"":"false"
+  style!=(variable.appearance && variable.appearance.style)  
+  class!=(variable.appearance && variable.appearance.class)  
+  :name!=variable.staffName?"" + variable.name:undefined 
+  :title!=variable.titleText?"" + variable.titleText:undefined 
+  :sub-title!=variable.departmentName?"" + variable.department:undefined 
+  :staffId!=variable.staffId?"" + variable.staffId:undefined 
+  avatarType!=variable.avatarType?"" + variable.avatarType:undefined 
+)

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

@@ -0,0 +1,10 @@
+-variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+
+div(
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  class=(variable.appearance && variable.appearance.class)  
+  id=variable.id?"" + variable.id:undefined 
+)
+  | {{content}}
+  

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

@@ -0,0 +1,12 @@
+
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+- var visible = variable.visible ? String(variable.visible.value) : undefined;
+
+
+span(
+  v-if=visible
+)&attributes(attrs)
+  | !{variable.text}
+  

package/lib/template/ui/mobilevue/layout-container-col.pug

@@ -0,0 +1,11 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+
+fm-layout-column(
+  v-if=visible
+  id=variable.replacedId ? String(variable.replacedId) : undefined   
+  width=variable.colWidth ? String(variable.colWidth) : undefined   
+)&attributes(attrs)
+  | {{content}}

package/lib/template/ui/mobilevue/layout-container-row.pug

@@ -0,0 +1,12 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+
+fm-layout-row(
+  v-if=visible
+  id=variable.replacedId ? String(variable.replacedId) : undefined
+  height=variable.rowHeight ? String(variable.rowHeight) : undefined   
+  :gutter=variable.gutter ? String(variable.gutter) : undefined
+)&attributes(attrs)
+  | {{content}}

package/lib/template/ui/mobilevue/layout-container.pug

@@ -0,0 +1,11 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+
+fm-layout(
+  v-if=visible
+  id=variable.replacedId ? String(variable.replacedId) : undefined
+  :gutter=variable.gutter ? String(variable.gutter) : undefined
+)&attributes(attrs)
+  | {{content}}

package/lib/template/ui/mobilevue/page-content-container.pug

@@ -0,0 +1,10 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? variable.visible.value : undefined;
+
+  div(
+    v-if=visible
+    id=variable.replacedId?""+variable.replacedId:undefined   
+  )&attributes(attrs)
+    | {{content}}

package/lib/template/ui/mobilevue/page-footer-container.pug

@@ -0,0 +1,10 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? variable.visible.value : undefined;
+
+  div(
+    v-if=visible
+    id=variable.replacedId?""+variable.replacedId:undefined   
+  )&attributes(attrs)
+    | {{content}}

package/lib/template/ui/mobilevue/page-header-container.pug

@@ -0,0 +1,10 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? variable.visible.value : undefined;
+
+  div(
+    v-if=visible
+    id=variable.replacedId?""+variable.replacedId:undefined   
+  )&attributes(attrs)
+    | {{content}}

package/lib/template/ui/mobilevue/show-image.pug

@@ -0,0 +1,22 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var previewPath =`$formatUtils.imageThumbnailPath(${variable.attachId}, '${variable.rootId}')` 
+-var srcMode = variable.srcMode
+if(srcMode == "dynamicUrl") 
+	-attrs[`:src`] = variable.dynamicSrc;  
+else if(srcMode == "staticUrl")
+	-attrs.src = variable.staticSrc;  
+else
+	-attrs[`:src`] = previewPath;
+
+fm-image(
+	v-if!=""+visible
+	id!=variable.id?"" + variable.id:undefined
+	width!=variable.width?"" + variable.width:undefined 
+	height!=variable.height?"" + variable.height:undefined
+	radius!=variable.radius?"" + variable.radius:undefined
+	:fit=variable.fit?"" + variable.fit:undefined 
+  :round=variable.round?"" + variable.round:undefined 
+)&attributes(attrs)

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

@@ -0,0 +1,33 @@
+
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+- var visible = variable.visible ? String(variable.visible.value) : undefined;
+-var binding = variable.binding? variable.binding : undefined
+-var formatter = variable.formatter? variable.formatter : undefined
+-var formBindingPrefix = variable.formBindingPrefix? String(variable.formBindingPrefix):undefined
+-var formatterType = 'string'
+
+-var valueStr = ''
+
+if(binding && binding.type)
+    if(binding.type === 'Const')
+        -valueStr = `'${binding.value}'`;
+    if(binding.type === 'Form')
+        -valueStr = `${formBindingPrefix}${binding.bindingPath}`;
+    if(binding.type === 'LocaleVariable' || binding.type === 'RemoteVariable')
+        -valueStr = `uiState.${binding.code}`;
+
+if(formatter && formatter.type)
+    -formatterType = formatter.type
+    -delete formatter.type
+    
+-var content = `{{$formatUtils.${formatterType}(${valueStr},${JSON.stringify(formatter)})}}`
+
+fm-tag(
+  v-if=visible
+  type=variable.displayType ? String(variable.displayType) : undefined
+  size=variable.tagSize ? String(variable.tagSize) : undefined
+  color=variable.tagColor ? String(variable.tagColor) : undefined
+)&attributes(attrs)
+ | !{content}

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

@@ -0,0 +1,118 @@
+-var enableLabel = variable.enableLabel
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class ?variable.appearance.class:'';
+-attrs.style = variable.appearance && variable.appearance.style?variable.appearance.style:'';
+-attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var binding = variable.binding? variable.binding : undefined
+-var fontSize = variable.fontSize? String(variable.fontSize) : undefined 
+-var lineHeight = variable.lineHeight? String(variable.lineHeight) : undefined 
+-var textColor = variable.textColor? String(variable.textColor) : undefined 
+-var formatter = variable.formatter ? variable.formatter:{}
+-var displayType = variable.displayType? String(variable.displayType) : undefined 
+-var formatterType = 'string'
+-var valueStr = ''
+-var formBindingPrefix = variable.formBindingPrefix? String(variable.formBindingPrefix):undefined
+-var wrapPosition = variable.wrapPosition? variable.wrapPosition : undefined
+
+-var label = variable.label
+-var labelAppearance = variable.labelAppearance;
+-var labelSize = variable.labelSize
+-var labelFontSize = variable.labelFontSize
+-var labelLineHeight = variable.labelLineHeight
+-var labelColor = variable.labelColor
+-var labelattrs = {};
+-labelattrs.class = 'fm-common-label ';
+-labelattrs.class += variable.labelAppearance && variable.labelAppearance.class ?variable.labelAppearance.class:'';
+-labelattrs.style = variable.labelAppearance && variable.labelAppearance.style?variable.labelAppearance.style:'';
+
+
+//--启用标签时，文本的样式
+-var textCls = 'fm-common-text '
+
+//--样式class
+-attrs.class = `fm-common-field ${attrs.class} `
+-attrs.class  += displayType && displayType.startsWith('title-') ? 'fm-common-title':''
+if(displayType)
+    -attrs.class += ` fm-${displayType}`
+
+if(enableLabel && wrapPosition === 'afterLabel')
+    -attrs.class  +=   ' d-flex ';
+ 
+if(binding && binding.type)
+    if(binding.type === 'Const')
+        -valueStr = `'${binding.value}'`;
+    if(binding.type === 'Form')
+        -valueStr = `${formBindingPrefix}${binding.bindingPath}`;
+    if(binding.type === 'LocaleVariable' || binding.type === 'RemoteVariable')
+        -valueStr = `uiState.${binding.code}`;
+
+-var labelContent = ''
+if(enableLabel)
+    if(typeof label==='string')
+        -labelContent = `${label}`;
+    else if(label && typeof label==='object' && label.fullPath)
+        -labelContent = `{{ uiState.${label.fullPath} }}`;
+    else 
+        -labelContent = '';
+
+if(formatter && formatter.type)
+    -formatterType = formatter.type
+    -delete formatter.type
+
+-var content = `{{$formatUtils.${formatterType}(${valueStr},${JSON.stringify(formatter)})}}`
+
+
+//--样式
+if(attrs.style)
+    -attrs.style += `;`
+
+if(textColor)
+    -attrs.style += ` color:${textColor};`
+
+//--内容
+if(variable.size && variable.size.width)
+    -attrs.style += `width:${variable.size.width}px;`
+
+
+if(variable.size && variable.size.height)
+    -attrs.style += `height:${variable.size.height}px;`
+
+if(fontSize)
+    -attrs.style += `font-size:${fontSize}px;`
+
+if(lineHeight)
+    -attrs.style += `line-height:${lineHeight}px;`
+
+//--标签样式
+if(enableLabel)
+    if(labelattrs.style)
+        -labelattrs.style += `;`
+
+    if(labelColor)
+        -labelattrs.style += ` color:${labelColor};`
+
+    if(variable.labelSize && variable.labelSize.width)
+        -labelattrs.style += `width:${variable.labelSize.width}px;`
+
+
+    if(variable.labelSize && variable.labelSize.height)
+        -labelattrs.style += `height:${variable.labelSize.height}px;`
+
+    if(labelFontSize)
+        -labelattrs.style += `font-size:${labelFontSize}px;`
+
+    if(labelLineHeight)
+        -labelattrs.style += `line-height:${labelLineHeight}px;`
+
+div(
+    v-if=visible
+)&attributes(attrs)
+    if(enableLabel)
+        label()&attributes(labelattrs)
+            | !{labelContent}
+
+    span(
+        class=textCls
+    )
+        | !{content}

package/lib/template/ui/mobilevue/vant-tabpage.pug

@@ -0,0 +1,6 @@
+van-tab(
+  v-if=variable.visible?variable.visible+"":"false"
+  title=variable.title?""+variable.title:undefined
+  name=variable.id?""+variable.id:undefined
+  )
+  | {{content}}

package/lib/template/ui/mobilevue/vant-tabs.pug

@@ -0,0 +1,6 @@
+van-tabs(
+  class=(variable.appearance && variable.appearance.class)
+  v-if=variable.visible?variable.visible+"":"false"
+  @change=variable.tabChange?""+variable.tabChange:undefined
+  )
+  | {{content}}