@farris/jit-engine 1.3.185 → 1.3.187-dev

package/lib/mobileapp/vue2/pug-generator/index.js

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

package/lib/mobileapp/vue2/pug-template/config/ui-template-config.js

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

package/lib/mobileapp/vue2/utility/index.js

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

package/lib/mobileapp/vue2/utility/parameter-collector/page-component-collector/index.js

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

package/lib/mobileapp/vue2/utility/type-convert.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDataFieldType = void 0;
-exports.getDataFieldType = (str) => {
+const getDataFieldType = (str) => {
     if (!str) {
         return "any";
     }
@@ -30,4 +30,5 @@ exports.getDataFieldType = (str) => {
     }
     return dataFieldType;
 };
+exports.getDataFieldType = getDataFieldType;
 //# sourceMappingURL=type-convert.js.map

package/lib/mobileapp/vue2/utility/type-convert.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-convert.js","sourceRoot":"","sources":["../../../../src/mobileapp/vue2/utility/type-convert.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,CAAC,GAAQ,EAAW,EAAE;IACpD,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,KAAK,CAAC;KAChB;IACD,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACxB,IAAI,aAAqB,CAAC;IAC1B,QAAQ,GAAG,EAAE;QACT,KAAK,QAAQ;YACT,aAAa,GAAG,QAAQ,CAAC;YACzB,MAAM;QACV,KAAK,SAAS,CAAC;QACf,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK;YACN,aAAa,GAAG,QAAQ,CAAC;YACzB,MAAM;QACV,KAAK,MAAM;YACP,aAAa,GAAG,SAAS,CAAC;YAC1B,MAAM;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU;YACX,aAAa,GAAG,MAAM,CAAC;YACvB,MAAM;QACV;YACI,aAAa,GAAG,KAAK,CAAC;YACtB,MAAM;KACb;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAA"}
+{"version":3,"file":"type-convert.js","sourceRoot":"","sources":["../../../../src/mobileapp/vue2/utility/type-convert.ts"],"names":[],"mappings":";;;AAAO,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAW,EAAE;IACpD,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,KAAK,CAAC;KAChB;IACD,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACxB,IAAI,aAAqB,CAAC;IAC1B,QAAQ,GAAG,EAAE;QACT,KAAK,QAAQ;YACT,aAAa,GAAG,QAAQ,CAAC;YACzB,MAAM;QACV,KAAK,SAAS,CAAC;QACf,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK;YACN,aAAa,GAAG,QAAQ,CAAC;YACzB,MAAM;QACV,KAAK,MAAM;YACP,aAAa,GAAG,SAAS,CAAC;YAC1B,MAAM;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU;YACX,aAAa,GAAG,MAAM,CAAC;YACvB,MAAM;QACV;YACI,aAAa,GAAG,KAAK,CAAC;YACtB,MAAM;KACb;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAA;AA5BY,QAAA,gBAAgB,oBA4B5B"}

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

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

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

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

package/lib/task/index.js

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

package/lib/task/kendo-task.js

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

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

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

package/lib/task/recursiveGenerateDevkit.js

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

package/lib/template/ui/kendo/approval-comments.pug

@@ -9,5 +9,6 @@ farris-approval-comments(
     id=variable.replacedId
     '[sortOrder]'=variable.sortOrder?""+variable.sortOrder:undefined
     '[procInstId]'=variable.procInstId?""+variable.procInstId:undefined
-    '[displayType]'=variable.displayType?""+variable.displayType:undefined
+    '[displayType]'!=variable.displayType?""+variable.displayType.value:undefined
+    '[attachmentVisible]'!=variable.attachmentVisible?""+variable.attachmentVisible.value:undefined
     '[domains]'!=variable.domains?variable.domains:undefined)

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

@@ -33,6 +33,7 @@ f-file-upload-and-preview(id=variable.replacedId class=(variable.appearance && v
   '[customInfo]'=variable.customInfoLangName?""+variable.customInfoLangName:undefined
   '[editfile]'=variable.previewEnableEditFile?""+variable.previewEnableEditFile.value:undefined
   '[contentFill]'=variable.contentFill?""+variable.contentFill.value:undefined
+  '[previewShowComments]'=variable.previewShowComments?""+variable.previewShowComments.value:undefined
   '(afterOrdered)'=variable.afterOrdered?""+variable.afterOrdered:undefined
 	'[enableOrder]'=variable.enableOrder?""+variable.enableOrder.value:undefined
   '[docMode]'=variable.previewEditFileDocMode?"'"+variable.previewEditFileDocMode+"'":undefined

package/lib/template/ui/kendo/oa-relation.pug

@@ -1,7 +1,17 @@
+-var holdPlaceOuterAttrs = {};
+-var holdPlaceInnerAttrs = {};
+-var holdPlaceEmptyAttrs = {};
+if(variable.holdPlace)
+  -holdPlaceInnerAttrs['*ngIf']=variable.visible?variable.visible.value+'':undefined;
+  -holdPlaceEmptyAttrs['*ngIf']=variable.visible?'!'+variable.visible.value+'':undefined;
+else
+  -holdPlaceOuterAttrs['*ngIf']=variable.visible?variable.visible.value+'':undefined;
 div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style))
     div(class="farris-group-wrap")
         div(class="form-group farris-form-group" '[ngClass]'="{'form-group--has-tips':"+(variable.enableTitleTips?variable.enableTitleTips:false)+"}")
             label(class="col-form-label" title="{{'"+variable.title+"'}}" for=variable.replacedId  '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
+                if (variable.require)
+                  span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
                 span(class="farris-label-text") {{'#{variable.title}'}}
             div(class="farris-input-wrap")
                 farris-oa-relation(
@@ -9,7 +19,8 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
                     input-end-edit
                     id=variable.replacedId
                     '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined
-                                        '[taskCategoryIds]'!=variable.taskCategoryIds?variable.taskCategoryIds+"":undefined
+                    '[taskCategoryIds]'!=variable.taskCategoryIds?variable.taskCategoryIds+"":undefined
+                    '[mapFields]'=variable.mapFields?""+variable.mapFields:undefined
                     'formControlName'=variable.formControlName?""+variable.formControlName:undefined
                     )
             if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/adminorganization-selector.pug

@@ -37,6 +37,7 @@ div(class="farris-input-wrap")
     '[showTabIds]'=variable.showTabIds?"'"+variable.showTabIds+"'":undefined
     '[activeTabId]'=variable.activeTabId?"'"+variable.activeTabId+"'":undefined
     '[enableHierarchicalLoading]'=variable.enableHierarchicalLoading?""+variable.enableHierarchicalLoading.value:undefined
+    '[isTableTemplate]'!=variable.isTableTemplate?""+variable.isTableTemplate.value:undefined
     '[showCheckAll]'=variable.showAllCheckBox?""+variable.showAllCheckBox.value:undefined
     '[cascadeCheck]'=variable.cascadeCheck?""+variable.cascadeCheck.value:undefined
     '[cascadeDown]'=variable.cascadeDown?""+variable.cascadeDown.value:undefined

package/lib/template/ui/kendo/table/city-selector.pug

@@ -0,0 +1,44 @@
+div(class="farris-input-wrap")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  if (variable.valueChange)
+    -attrs['(valueChange)'] = variable.valueChange ;
+  
+  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+"";
+  lib-city-selector()&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
+      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+    lib-city-selector()&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/employee-selector.pug

@@ -36,6 +36,7 @@ div(class="farris-input-wrap")
     "[displayField]"=variable.textField?"'"+variable.textField+"'":undefined
     '[enableQuick]'=variable.enableQuick?""+variable.enableQuick.value:undefined
     '[enableHierarchicalLoading]'=variable.enableHierarchicalLoading?""+variable.enableHierarchicalLoading.value:undefined
+    '[isTableTemplate]'=variable.isTableTemplate?""+variable.isTableTemplate:undefined
     '[filterId]'=variable.filterId?"'"+variable.filterId+"'":undefined
     "[formatFn]"=variable.formatterName?""+variable.formatterName:undefined
     '(inputClear)'!=variable.inputClear?variable.inputClear+"":undefined

package/lib/template/ui/kendo/table/farris-ext-intergration.pug

@@ -0,0 +1,54 @@
+div(class="farris-input-wrap")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  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+"";
+  web-external-integration(
+      id=variable.replacedId 
+      extIntegration-dataMapping
+      '[serviceCode]'=variable.serviceCode?"'"+variable.serviceCode+"'":undefined
+      '[mapFields]'!=variable.mapFields?""+variable.mapFields:undefined
+      '[externalParams]'=variable.externalParams?""+variable.externalParams:undefined
+      'tab-index'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined 
+      '[extTableSchemas]'!=variable.extTableSchemas?""+variable.extTableSchemas: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
+      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+    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/image-upload.pug

@@ -0,0 +1,57 @@
+div(class="farris-input-wrap")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  if (variable.valueChange)
+    -attrs['(valueChange)'] = variable.valueChange ;
+            
+  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-image-list(
+    id=variable.replacedId
+    class=(variable.appearance && variable.appearance.class)?variable.appearance.class:undefined
+    input-end-edit
+    '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined
+    '[maxUploads]'=variable.maxUploads?""+variable.maxUploads:undefined
+    '[maxSize]'=variable.maxSize?""+variable.maxSize:undefined
+    '[storeType]'=variable.storeType?"'"+variable.storeType+"'":undefined
+    '[extendServerConfig]'!=variable.serializedExtendServerConfig?variable.serializedExtendServerConfig+"":undefined
+    '[requiredOn]'=(variable.isCustomRequire && variable.require  && !variable.require.isExpression)?""+variable.require.value:undefined
+    '[type]'=variable.imgType?"'"+variable.imgType+"'":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
+      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+    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/oa-relation.pug

@@ -0,0 +1,16 @@
+div(class="farris-input-wrap")
+  farris-oa-relation(
+    'farrisOaRelationDataMapping'
+    input-end-edit
+    id=variable.replacedId
+    '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined
+    '[taskCategoryIds]'!=variable.taskCategoryIds?variable.taskCategoryIds+"":undefined
+    'formControlName'=variable.formControlName?""+variable.formControlName:undefined
+    )
+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}N

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

@@ -1,43 +1,28 @@
-//- -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 
--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 
+-variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
 
-div(
-  v-if=visible
-  class="fm-input-wrapper" 
-)
+div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
   fm-area-picker(
-    v-model=binding
-    :required=require
-    :readonly=readonly
-    :disabled=disable
-    :modelValue=variable.modelValue ? variable.modelValue+"":undefined 
-    direction=variable.direction?variable.direction+"":undefined
+    style!=(variable.appearance && variable.appearance.style)  
+    class!=(variable.appearance && variable.appearance.class)  
+    inputClass=variable.direction === 'vertical' ? "fm-input-vertical" : undefined
+    v-if!=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
+    id=variable.title?""+variable.id:undefined 
+    label=variable.title?""+variable.title:undefined 
     title=variable.title?""+variable.title:undefined
+    disable=variable.disable?""+variable.disable:undefined  
+    :readonly!=variable.readonly?""+variable.readonly:undefined
+    :required!=variable.require?variable.require+"":undefined
+    placeholder=variable.placeholder?""+variable.placeholder:undefined
+    v-model!=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":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
-  )&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}

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

@@ -1,22 +1,16 @@
--var attrs = {};
--attrs.className = variable.appearance && variable.appearance.class;
--attrs.style = variable.appearance && variable.appearance.style;
--var visible = variable.visible ? String(variable.visible.value) : 'false';
--var disabled = variable.disabled ? String(variable.disabled.value) : undefined;
-
 fm-button(
-  v-if=visible
-  id=variable.replacedId ? String(variable.replacedId) : undefined  
-  type=variable.displayType ? String(variable.displayType) : "info"
-  :disabled=disabled
-  :block=variable.block ? String(variable.block) : undefined
-  :round=variable.round ? String(variable.round) : undefined
-  :plain=variable.plain ? String(variable.plain) : undefined 
-  :noBorder=variable.noBorder ? String(variable.noBorder) : undefined 
-  size=variable.buttonSize ? String(variable.buttonSize) : undefined 
-  icon=variable.icon ? String(variable.icon) : undefined 
-  @click=variable.click ? String(variable.click) : undefined 
-)&attributes(attrs)
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  className=(variable.appearance && variable.appearance.class)  
+  id=variable.id?"" + variable.id:undefined 
+  type=variable.displayType?"" + variable.displayType:"info"
+  :block="true"
+  :round="true"
+  :plain=variable.plain?"" + variable.plain:undefined 
+  :noBorder=variable.noBorder?"" + variable.noBorder:undefined 
+  :disabled=variable.disabled?"" + variable.disabled:undefined 
+  @click=variable.click?"" + variable.click:undefined 
+)
   if variable.template
     | !{variable.template}
   else 

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

@@ -1,29 +1,16 @@
-//- -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 
--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" 
-)
+div(class="fm-input-wrapper" v-if!=variable.visible?variable.visible+"":"false")
   fm-calendar-input(
-    v-model=binding
-    :required=require
-    :readonly=readonly
-    :disabled=disable
+    style=(variable.appearance && variable.appearance.style)
+    class=variable.className
+    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
     :modelValue=variable.modelValue ?variable.modelValue+"":undefined 
+    label=variable.title?variable.title:undefined 
+    placeholder=variable.placeholder?""+variable.placeholder:undefined 
+    :readonly!=variable.readonly?variable.readonly+"":undefined
+    :required!=variable.require?variable.require+"":undefined
+    :disabled!=variable.disabled?variable.disabled+"":undefined
     :clearable!=variable.clearable?variable.clearable+"":undefined
     input-align="right"
-    direction=variable.direction?variable.direction+"":undefined
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
     :error-message!=variable.errorMessage
     error-message-align=variable.errorMessage ? "right" : undefined
@@ -39,22 +26,4 @@ div(
     :useLunar=variable.useLunar
     @dayClick=variable.dayClick?""+variable.dayClick:undefined 
     @render=variable.render?""+variable.render: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.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/card.pug

@@ -1,15 +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-card(
-  v-if=visible
-  icon=variable.icon?String(variable.icon):undefined
-  title=variable.title?String(variable.title):undefined
-  :collapsible=variable.collapsible?String(variable.collapsible) : 'false'
-  :actions=variable.actions?String(variable.actions):undefined
-)&attributes(attrs)
+  v-if=variable.visible?variable.visible+"":"false"
+  class=(variable.appearance && variable.appearance.class)
+  style=(variable.appearance && variable.appearance.style)
+  title=variable.title ?""+variable.title:undefined
+  :collapsible=variable.collapse ?""+variable.collapse:undefined
+  icon=variable.icon ?""+variable.icon:undefined
+  :actions=variable.actions ?""+variable.actions:undefined
+)
   if(variable.headerTemplate)
     template(#header)
       | !{variable.headerTemplate}