@farris/jit-engine 1.3.231 → 1.3.233

package/README.md

@@ -1,3 +1,11 @@
+1.3.233
+    表格编辑支持过滤排序
+    增加枚举项禁用
+
+1.3.228
+
+    section、tab工具栏按钮支持下级显示
+
 1.3.226
 
     支持基路径

package/lib/domstructure/devkit/section-toolbar/farris-section-toolbar.js.map

@@ -1 +1 @@
-{"version":3,"file":"farris-section-toolbar.js","sourceRoot":"","sources":["../../../../src/domstructure/devkit/section-toolbar/farris-section-toolbar.ts"],"names":[],"mappings":";;;AAAA,8CAA6G;AAC7G,iCAAyC;AAGzC,MAAa,cAAe,SAAQ,kBAAa;IAQ7C,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,mBAAmB,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,KAAK,UAAU,EAAE;oBACpB,MAAM,gBAAgB,GAAG,sCAA4B,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,EAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;oBAC3K,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;iBAC3C;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QAGH,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,WAAW,GAAG,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAU,CAAC,KAAK,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,UAAU,GAAG,6BAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC/F,CAAC;CACJ;AAvCD,wCAuCC"}
+{"version":3,"file":"farris-section-toolbar.js","sourceRoot":"","sources":["../../../../src/domstructure/devkit/section-toolbar/farris-section-toolbar.ts"],"names":[],"mappings":";;;AACA,8CAA6G;AAC7G,iCAAyC;AAGzC,MAAa,cAAe,SAAQ,kBAAa;IAU7C,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,mBAAmB,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,KAAK,UAAU,EAAE;oBACpB,MAAM,gBAAgB,GAAG,sCAA4B,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,EAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;oBAC3K,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;iBAC3C;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QAGH,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,WAAW,GAAG,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAU,CAAC,KAAK,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,UAAU,GAAG,6BAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC/F,CAAC;CACJ;AAzCD,wCAyCC"}

package/lib/domstructure/devkit/tab-toolbar/farris-tab-toolbar.js.map

@@ -1 +1 @@
-{"version":3,"file":"farris-tab-toolbar.js","sourceRoot":"","sources":["../../../../src/domstructure/devkit/tab-toolbar/farris-tab-toolbar.ts"],"names":[],"mappings":";;;AACA,8CAA6G;AAC7G,iCAAyC;AAEzC,MAAa,UAAW,SAAQ,kBAAa;IAQzC,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,mBAAmB,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,KAAK,UAAU,EAAE;oBACpB,MAAM,gBAAgB,GAAG,sCAA4B,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,EAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;oBAC3K,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;iBAC3C;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QAGH,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,WAAW,GAAG,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAU,CAAC,KAAK,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,UAAU,GAAG,6BAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC/F,CAAC;CACJ;AAvCD,gCAuCC"}
+{"version":3,"file":"farris-tab-toolbar.js","sourceRoot":"","sources":["../../../../src/domstructure/devkit/tab-toolbar/farris-tab-toolbar.ts"],"names":[],"mappings":";;;AACA,8CAA6G;AAC7G,iCAAyC;AAGzC,MAAa,UAAW,SAAQ,kBAAa;IAUzC,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,mBAAmB,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,KAAK,UAAU,EAAE;oBACpB,MAAM,gBAAgB,GAAG,sCAA4B,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,EAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;oBAC3K,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;iBAC3C;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QAGH,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,WAAW,GAAG,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAU,CAAC,KAAK,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,UAAU,GAAG,6BAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC/F,CAAC;CACJ;AAzCD,gCAyCC"}

package/lib/domstructure/ui/common/appearance.js

@@ -14,7 +14,7 @@ class Appearance {
         if (!obj) {
             return;
         }
-        const keys = 'class,style';
+        const keys = 'class,style,dropdownCls';
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
                 this[key] = obj[key];
@@ -24,7 +24,8 @@ class Appearance {
     toJSON() {
         return {
             "class": this.class,
-            "style": this.style
+            "style": this.style,
+            "dropdownCls": this.dropdownCls
         };
     }
     toString() {

package/lib/domstructure/ui/common/appearance.js.map

@@ -1 +1 @@
-{"version":3,"file":"appearance.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/appearance.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAE9C,MAAa,UAAU;IAKrB,YAAY,KAAmB;QAC7B,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAChD;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QAED,MAAM,IAAI,GAAG,aAAa,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;aACtB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QACJ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,KAAK;YACnB,OAAO,EAAE,IAAI,CAAC,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AAnCD,gCAmCC"}
+{"version":3,"file":"appearance.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/appearance.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAE9C,MAAa,UAAU;IAMrB,YAAY,KAAmB;QAC7B,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAChD;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QAED,MAAM,IAAI,GAAG,yBAAyB,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;aACtB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QACJ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,KAAK;YACnB,OAAO,EAAE,IAAI,CAAC,KAAK;YACnB,aAAa,EAAE,IAAI,CAAC,WAAW;SAChC,CAAC;IACJ,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AArCD,gCAqCC"}

package/lib/domstructure/ui/data/fields/form/combo-list.js

@@ -17,7 +17,7 @@ class ComboList extends input_field_1.InputField {
         if (!obj) {
             return;
         }
-        const keys = 'id,type,controlSource,selectedValues,editable,panelWidth,panelHeight,idField,valueField,textField,uri,enableClear,multiSelect,onClear,valueChanged,onShown,onHidden,data,enumData,autoWidth,mappingField,beforeShow,beforeHide,viewType,dataSourceType,bindDataSource,enableCancelSelected,noSearch,maxSearchLength';
+        const keys = 'id,type,controlSource,selectedValues,editable,panelWidth,panelHeight,idField,valueField,textField,uri,enableClear,multiSelect,onClear,valueChanged,onShown,onHidden,data,enumData,autoWidth,mappingField,beforeShow,beforeHide,viewType,dataSourceType,bindDataSource,enableCancelSelected,noSearch,maxSearchLength,showDisabledItem';
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
                 if (key == "valueChanged") {
@@ -40,6 +40,9 @@ class ComboList extends input_field_1.InputField {
                         this[key] = utility_2.ToolHelper.createBindingWithoutDefaultValue(obj[key], this.externalComponentNameSpace, this.id);
                     }
                 }
+                else if (key == 'showDisabledItem') {
+                    this[key] = utility_2.ToolHelper.createBindingWithoutDefaultValue(obj[key], this.externalComponentNameSpace, this.id);
+                }
                 else if (key == "noSearch") {
                     this.noSearch = utility_2.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
                 }

package/lib/domstructure/ui/data/fields/form/combo-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"combo-list.js","sourceRoot":"","sources":["../../../../../../src/domstructure/ui/data/fields/form/combo-list.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"combo-list.js","sourceRoot":"","sources":["../../../../../../src/domstructure/ui/data/fields/form/combo-list.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAC3D,oDAAgE;AAEhE,oDAAsF;AAUtF,MAAa,SAAU,SAAQ,wBAAU;IAqCrC,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,sUAAsU,CAAC;QACpV,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,cAAc,EAAE;oBACvB,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,gCAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAW,CAAC,uBAAuB,CAAC,CAAC;qBAC/G;iBACJ;qBAAM,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,IAAI,UAAU,EAAE;oBAClE,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,gCAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;qBACpE;iBACJ;qBAAM,IAAI,GAAG,IAAI,YAAY,IAAI,GAAG,IAAI,YAAY,EAAE;oBACnD,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,gCAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;qBACrE;iBACJ;qBAAM,IAAI,GAAG,IAAI,gBAAgB,EAAE;oBAChC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,gCAAgC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;qBAC/G;iBACJ;qBAAM,IAAI,GAAG,IAAI,kBAAkB,EAAE;oBAClC,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,gCAAgC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAC/G;qBAAM,IAAI,GAAG,IAAI,UAAU,EAAE;oBAC1B,IAAI,CAAC,QAAQ,GAAG,oBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBACvG;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,qBAAqB,GAAG,6BAAmB,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAGxH,IAAI,oBAAU,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;SAC7B;QAED,IAAI,CAAC,YAAY,GAAG,oBAAU,CAAC,iCAAiC,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC;QAEvF,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE;YAC1D,IAAI,IAAI,CAAC,cAAc,EAAE;gBACrB,MAAM,uBAAuB,GAAG,oBAAU,CAAC,gCAAgC,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC3I,IAAI,uBAAuB,EAAE;oBACzB,IAAI,CAAC,YAAY,GAAG,uBAAuB,CAAC,KAAK,CAAC;iBACrD;aACJ;iBAAM;gBAEH,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;aAC1B;SACJ;QAGD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACxB;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,EAAE;YACrE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;SAC/B;IACL,CAAC;IAED,MAAM;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,EAAE,WAAW;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAC;IACP,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAGD,aAAa;QACT,MAAM,WAAW,GAAgB;YAC7B,MAAM,EAAE,WAAW;SACtB,CAAC;QACF,MAAM,IAAI,GAAG,iMAAiM,CAAC;QAC/M,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;gBACnE,QAAQ,GAAG,EAAE;oBACT;wBACI,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;wBAC7B,MAAM;iBACb;aACJ;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,aAAa,EAAE,EAAE,WAAW,CAAC,CAAC;IACjE,CAAC;CACJ;AA7JD,8BA6JC"}

package/lib/domstructure/ui/data/fields/form/editable/inputs/value/approval-comments.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApprovalComments = void 0;
+const value_fields_1 = require("./value_fields");
+const utility_1 = require("../../../../../../../../utility");
+class ApprovalComments extends value_fields_1.ValueField {
+    constructor(param) {
+        super(param);
+        let obj;
+        if (typeof param === 'string') {
+            obj = utility_1.ToolHelper.convertToJsonOrDefault(param);
+        }
+        else {
+            obj = param;
+        }
+        if (!obj) {
+            return;
+        }
+        const keys = '';
+        Object.keys(obj).forEach(key => {
+            if (keys.includes(key)) {
+                this[key] = obj[key];
+            }
+        });
+        this.placeHolderResourceId = utility_1.I18nResourceManager.generatePlaceHolderResourceId("ApprovalComments", this.id, this.resourcePrefix);
+    }
+    toJSON() {
+        return Object.assign({}, super.toJSON(), {
+            "type": "ApprovalComments"
+        });
+    }
+    toString() {
+        return JSON.stringify(this.toJSON());
+    }
+}
+exports.ApprovalComments = ApprovalComments;
+//# sourceMappingURL=approval-comments.js.map

package/lib/domstructure/ui/data/fields/form/editable/inputs/value/approval-comments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-comments.js","sourceRoot":"","sources":["../../../../../../../../../src/domstructure/ui/data/fields/form/editable/inputs/value/approval-comments.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAC5C,6DAAkF;AAElF,MAAa,gBAAiB,SAAQ,yBAAU;IAI5C,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;aACxB;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,qBAAqB,GAAG,6BAAmB,CAAC,6BAA6B,CAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrI,CAAC;IAED,MAAM;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,EAAE,kBAAkB;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;CACJ;AArCD,4CAqCC"}

package/lib/domstructure/ui/data/fields/form/editable/inputs/value/employeeorg-selector.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmployeeOrgSelector = void 0;
+const value_fields_1 = require("./value_fields");
+const utility_1 = require("../../../../../../../../utility");
+const component_employeeorg_selector_parameter_helper_1 = require("../../../../../../../../utility/component-employeeorg-selector-parameter-helper");
+class EmployeeOrgSelector extends value_fields_1.ValueField {
+    constructor(param) {
+        super(param);
+        let obj;
+        if (typeof param === 'string') {
+            obj = utility_1.ToolHelper.convertToJsonOrDefault(param);
+        }
+        else {
+            obj = param;
+        }
+        if (!obj) {
+            return;
+        }
+        const keys = `multiSelect,editable,searchPlaceholder,primaryField,displayField,layer,cascadeCheck,cascadeDown,cascadeUp,showAllCheckBox,busNum,orgIds,enableHierarchicalLoading,showTabIds,activeTabId,mapFields,selectionsChange,tagRemoved,inputClear,expandLevel,formatter`;
+        Object.keys(obj).forEach(key => {
+            if (keys.includes(key)) {
+                if (key == "selectionsChange" || key == "tagRemoved" || key == "inputClear") {
+                    this[key] = utility_1.EventViewModelModifier.modify(obj[key], true, true, true, utility_1.JITConstant.defaultCommandParamName);
+                }
+                else if (key == "multiSelect" || key == 'editable' || key == 'cascadeCheck' || key == 'cascadeDown' || key == 'cascadeUp' || key == 'showAllCheckBox' || key == 'enableHierarchicalLoading') {
+                    this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
+                }
+                else {
+                    this[key] = obj[key];
+                }
+            }
+        });
+        if (!this.multiSelect) {
+            this.multiSelect = utility_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace, this.id);
+        }
+        this.type = "EmployeeOrgSelector";
+        if (this.formatter) {
+            this.formatterName = component_employeeorg_selector_parameter_helper_1.ComponentEmployeeOrgSelectorParameterHelper.generateFormatterName(this.id);
+        }
+        this.placeHolderResourceId = utility_1.I18nResourceManager.generatePlaceHolderResourceId(this.type, this.id, this.resourcePrefix);
+    }
+}
+exports.EmployeeOrgSelector = EmployeeOrgSelector;
+//# sourceMappingURL=employeeorg-selector.js.map

package/lib/domstructure/ui/data/fields/form/editable/inputs/value/employeeorg-selector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"employeeorg-selector.js","sourceRoot":"","sources":["../../../../../../../../../src/domstructure/ui/data/fields/form/editable/inputs/value/employeeorg-selector.ts"],"names":[],"mappings":";;;AACA,iDAA4C;AAC5C,6DAAuH;AACvH,qJAA8I;AAK9I,MAAa,mBAAoB,SAAQ,yBAAU;IAuB/C,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,iQAAiQ,CAAC;QAC/Q,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,kBAAkB,IAAI,GAAG,IAAI,YAAY,IAAI,GAAG,IAAI,YAAY,EAAE;oBACzE,IAAI,CAAC,GAAG,CAAC,GAAG,gCAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,qBAAW,CAAC,uBAAuB,CAAC,CAAC;iBAC9G;qBAAM,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG,IAAI,UAAU,IAAI,GAAG,IAAI,cAAc,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG,IAAI,WAAW,IAAI,GAAG,IAAI,iBAAiB,IAAI,GAAG,IAAI,2BAA2B,EAAE;oBAC3L,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBACnG;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,WAAW,GAAG,oBAAU,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACtG;QACD,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAGlC,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,aAAa,GAAG,6FAA2C,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACnG;QAED,IAAI,CAAC,qBAAqB,GAAG,6BAAmB,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC5H,CAAC;CACJ;AA7DD,kDA6DC"}

package/lib/domstructure/ui/farris-dynamic-control-group/farris-dynamic-control-group.js

@@ -20,14 +20,9 @@ class FarrisDynamicControlGroup extends common_1.BaseComponent {
         const keys = 'controls,uri,formData,form,isControlInline,isEmbedded,extraClassNames,isGrouped';
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
-                if (key == "controls") {
+                if (key == "form" || key == "controls" || key == "formData") {
                     if (obj[key]) {
-                        if (utility_1.ToolHelper.isString(obj[key])) {
-                            this[key] = utility_1.ToolHelper.viewModelReplaceToThisViewModel(obj[key]);
-                        }
-                        else {
-                            this[key] = obj[key];
-                        }
+                        this[key] = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], this.externalComponentNameSpace, this.id);
                     }
                 }
                 else {

package/lib/domstructure/ui/farris-dynamic-control-group/farris-dynamic-control-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"farris-dynamic-control-group.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/farris-dynamic-control-group/farris-dynamic-control-group.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,sCAA0C;AAE1C,MAAa,yBAA0B,SAAQ,sBAAa;IAWxD,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAXjB,SAAI,GAAG,2BAA2B,CAAC;QAY/B,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,iFAAiF,CAAC;QAC/F,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,UAAU,EAAE;oBACnB,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,oBAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;4BAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,+BAA+B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;yBACpE;6BAAM;4BACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;yBACxB;qBACJ;iBACJ;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAzCD,8DAyCC"}
+{"version":3,"file":"farris-dynamic-control-group.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/farris-dynamic-control-group/farris-dynamic-control-group.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,sCAAmD;AAEnD,MAAa,yBAA0B,SAAQ,sBAAa;IAWxD,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAXjB,SAAI,GAAG,2BAA2B,CAAC;QAY/B,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,iFAAiF,CAAC;QAC/F,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,EAAE;oBACzD,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,gCAAgC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;qBAC/G;iBACJ;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AArCD,8DAqCC"}

package/lib/index.js

@@ -1,29 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.jit = void 0;
-const utility_1 = require("./utility");
-const entity_1 = require("./entity");
-const jit_engine_executor_1 = require("./utility/jit-engine-executor");
-const delete_sourcecode_executor_1 = require("./utility/source-code-delete/delete-sourcecode-executor");
-function jit(options) {
-    const jitConsoleLabel = "jit";
-    try {
-        const jitInputOptions = entity_1.JitInputOptionsConvertor.convert(options);
-        console.time(jitConsoleLabel);
-        utility_1.LoggerHelper.log(`${utility_1.JITConstant.JitEngineName} begin execute! `, utility_1.LoggerLevel.Info);
-        if (jitInputOptions.deleteSourceCodeBeforeGenerate) {
-            delete_sourcecode_executor_1.DeleteSourceCodeExecutor.execute(jitInputOptions.publishPath);
-        }
-        const jitEngineExecutorRequest = jit_engine_executor_1.JitEngineExecutorManager.createExecutorRequestWithOptions(jitInputOptions);
-        jit_engine_executor_1.JitEngineExecutorManager.execute(jitEngineExecutorRequest);
-        utility_1.LoggerHelper.log(`${utility_1.JITConstant.JitEngineName} execute success. end!`, utility_1.LoggerLevel.Success);
-        console.timeEnd(jitConsoleLabel);
-    }
-    catch (e) {
-        console.timeEnd(jitConsoleLabel);
-        utility_1.LoggerHelper.logWithError(`${utility_1.JITConstant.JitEngineName} execute failed. error message is ${e}. end!`, e, utility_1.LoggerLevel.Error);
-        throw e;
-    }
-}
-exports.jit = jit;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jit = void 0;
+const utility_1 = require("./utility");
+const entity_1 = require("./entity");
+const jit_engine_executor_1 = require("./utility/jit-engine-executor");
+const delete_sourcecode_executor_1 = require("./utility/source-code-delete/delete-sourcecode-executor");
+function jit(options) {
+    const jitConsoleLabel = "jit";
+    try {
+        const jitInputOptions = entity_1.JitInputOptionsConvertor.convert(options);
+        console.time(jitConsoleLabel);
+        utility_1.LoggerHelper.log(`${utility_1.JITConstant.JitEngineName} begin execute! `, utility_1.LoggerLevel.Info);
+        if (jitInputOptions.deleteSourceCodeBeforeGenerate) {
+            delete_sourcecode_executor_1.DeleteSourceCodeExecutor.execute(jitInputOptions.publishPath);
+        }
+        const jitEngineExecutorRequest = jit_engine_executor_1.JitEngineExecutorManager.createExecutorRequestWithOptions(jitInputOptions);
+        jit_engine_executor_1.JitEngineExecutorManager.execute(jitEngineExecutorRequest);
+        utility_1.LoggerHelper.log(`${utility_1.JITConstant.JitEngineName} execute success. end!`, utility_1.LoggerLevel.Success);
+        console.timeEnd(jitConsoleLabel);
+    }
+    catch (e) {
+        console.timeEnd(jitConsoleLabel);
+        utility_1.LoggerHelper.logWithError(`${utility_1.JITConstant.JitEngineName} execute failed. error message is ${e}. end!`, e, utility_1.LoggerLevel.Error);
+        throw e;
+    }
+}
+exports.jit = jit;
 //# sourceMappingURL=index.js.map

package/lib/mobileapp/index.js

@@ -1,22 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MobileEngineExecutor = void 0;
-const jit_engine_executor_1 = require("./vue/jit-engine-executor");
-const jit_engine_executor_2 = require("./vue2/jit-engine-executor");
-class MobileEngineExecutor {
-    execute(jitEngineExecutorRequest) {
-        const jitInputOptions = jitEngineExecutorRequest.jitInputOptions;
-        let executor;
-        switch (jitInputOptions.frameworkType) {
-            case 'vue2':
-                executor = new jit_engine_executor_2.MobileVueEngineExecutor();
-                break;
-            default:
-                executor = new jit_engine_executor_1.MobileVueEngineExecutor();
-                break;
-        }
-        return executor.execute(jitEngineExecutorRequest);
-    }
-}
-exports.MobileEngineExecutor = MobileEngineExecutor;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MobileEngineExecutor = void 0;
+const jit_engine_executor_1 = require("./vue/jit-engine-executor");
+const jit_engine_executor_2 = require("./vue2/jit-engine-executor");
+class MobileEngineExecutor {
+    execute(jitEngineExecutorRequest) {
+        const jitInputOptions = jitEngineExecutorRequest.jitInputOptions;
+        let executor;
+        switch (jitInputOptions.frameworkType) {
+            case 'vue2':
+                executor = new jit_engine_executor_2.MobileVueEngineExecutor();
+                break;
+            default:
+                executor = new jit_engine_executor_1.MobileVueEngineExecutor();
+                break;
+        }
+        return executor.execute(jitEngineExecutorRequest);
+    }
+}
+exports.MobileEngineExecutor = MobileEngineExecutor;
 //# sourceMappingURL=index.js.map

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.js

@@ -40,13 +40,13 @@ class VueAppExpressionGenerator extends abstract_file_generator_1.AbstractFileGe
                     };
                 })
                 : [];
-            generateString += `
-{
-    "path": "${path.replace(/\./g, '/')}",
-    "ns": "",
-    "type": "Field",
-    "viewModelId":"${viewModelId}",
-    "expressions": ${JSON.stringify(_expressions)}
+            generateString += `
+{
+    "path": "${path.replace(/\./g, '/')}",
+    "ns": "",
+    "type": "Field",
+    "viewModelId":"${viewModelId}",
+    "expressions": ${JSON.stringify(_expressions)}
 }`;
         });
         generateString += ']';

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-filter-generator.js

@@ -7,14 +7,14 @@ class VueAppFilterGenerator extends abstract_file_generator_1.AbstractFileGenera
     generate(context) {
         let generateString = "";
         generateString +=
-            `
-// Vue.filter("lang", function(value, langCode, defaultValue) {
-//     const translatedValue = lang["zh-CHS"][value];
-//     if (!translatedValue && translatedValue != "") {
-//         return defaultValue;
-//     }
-//     return translatedValue;
-// });
+            `
+// Vue.filter("lang", function(value, langCode, defaultValue) {
+//     const translatedValue = lang["zh-CHS"][value];
+//     if (!translatedValue && translatedValue != "") {
+//         return defaultValue;
+//     }
+//     return translatedValue;
+// });
 `;
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         response.fileContent = generateString;

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-resource-generator.js

@@ -9,8 +9,8 @@ class VueAppIndexResourceGenerator extends abstract_file_generator_1.AbstractFil
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         let generateString = "";
         generateString +=
-            `
-const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
+            `
+const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
 `;
         response.fileContent = generateString;
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js

@@ -28,68 +28,65 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
         }
         const path = "./services/" + formCode + "_state_interceptor";
         let generateString = '';
-        generateString += `
-<template>
-  <router-view v-slot="{ Component }">
-    <transition :name="transitionName">
+        generateString += `
+<template>
+  <router-view v-slot="{ Component }">
+    <transition :name="transitionName">
       ${keepAlive
             ? '<keep-alive><component :is="Component" /></keep-alive>'
-            : '<component :is="Component" />'}
-    </transition>
-  </router-view>
-</template>
-
-<script>
-import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN} from '@farris/mobile-devkit';
-import { FrameworkSessionService } from '@farris/mobile-bef';
-import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN, ProcessUiControlStateInterceptor,ProcessConfigStateInterceptor, ProcessUiControlStateViewOnlyInterceptor } from '@farris/mobile-command-services';
-import { DevkitPlugin } from '@farris/mobile-vue-adapter';
-import { ModelProviders } from './models/model.provider';
-import { validationRule } from './validation';
-${extraImportsString}
-${resourceString}
-${className ? `import { ${className} } from '${path}'` : ''}
-
-
-export default{
-    name: '${formCode}',
-    components:{${_imports}},
-    data() {
-      return {
-        transitionName: '',
-      };
-    },
-    watch: {
-      $route(to, from) {
-        if (to.query.routeType === 'Back') {
-          this.transitionName = 'fm-slide-out';
-        } else if (to.query.routeType === 'Forward') {
-          this.transitionName = 'fm-slide-in';
-        } else {
-          this.transitionName = '';
-        }
-      },
-    },
-    beforeCreate(){
-      const appOptions = {
-        id: '${formCode}',
-        providers: [
-          ...ModelProviders,
-          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
-          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
-          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
-          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
-          ...COMMAND_SERVICES_APP_PROVIDERS,
-          { provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ProcessUiControlStateInterceptor, deps: [],multi: true  },
-          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
-          { provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ProcessConfigStateInterceptor, deps: [],multi: true  },
-          { provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ProcessUiControlStateViewOnlyInterceptor, deps: [],multi: true },
-        ]
-      };
-      this.$createApp(appOptions);
-    }
-};
-</script>
+            : '<component :is="Component" />'}
+    </transition>
+  </router-view>
+</template>
+
+<script>
+import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN} from '@farris/mobile-devkit';
+import { FrameworkSessionService } from '@farris/mobile-bef';
+import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN} from '@farris/mobile-command-services';
+import { DevkitPlugin } from '@farris/mobile-vue-adapter';
+import { ModelProviders } from './models/model.provider';
+import { validationRule } from './validation';
+${extraImportsString}
+${resourceString}
+${className ? `import { ${className} } from '${path}'` : ''}
+
+
+export default{
+    name: '${formCode}',
+    components:{${_imports}},
+    data() {
+      return {
+        transitionName: '',
+      };
+    },
+    watch: {
+      $route(to, from) {
+        if (to.query.routeType === 'Back') {
+          this.transitionName = 'fm-slide-out';
+        } else if (to.query.routeType === 'Forward') {
+          this.transitionName = 'fm-slide-in';
+        } else {
+          this.transitionName = '';
+        }
+      },
+    },
+    beforeCreate(){
+      const appOptions = {
+        id: '${formCode}',
+        providers: [
+          ...ModelProviders,
+          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
+          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
+          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
+          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
+          ...COMMAND_SERVICES_APP_PROVIDERS,
+          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
+        ]
+      };
+      this.$createApp(appOptions);
+    }
+};
+</script>
 `;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAWlE,MAAa,uBAAwB,SAAQ,+CAAqB;IAQhE,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,oBAAoB,GAA4B,OAAO,CAAC,iBAAiB,CAAA;QAC/E,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,cAAc,EACd,kBAAkB,EACnB,GAAG,oBAAoB,CAAA;QACxB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,cAAc,CAAA;QAClF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACzE,MAAM,2BAA2B,GAAG,cAAc,IAAI,eAAe;YACnE,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,GAAG,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA,CAAC,CAAC,EAAE,IAAI,QAAQ,GAAG;YAChK,CAAC,CAAC,EAAE,CAAA;QAEJ,IAAI,SAAa,CAAE;QACnB,IAAI,wBAAwB,GAAW,KAAK,CAAE;QAE9C,IAAG,kBAAkB,IAAK,kBAAkB,CAAC,MAAM,EAAC;YAClD,wBAAwB,GAAG,IAAI,CAAC;YAChC,IAAG,kBAAkB,CAAC,WAAW,EAAC;gBAChC,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAA;gBAClD,MAAM,QAAQ,GAAG,4BAA4B,CAAC;gBAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;gBACjD,IAAG,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAC;oBAC3C,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;iBAC9B;aACF;SACF;QACD,MAAM,IAAI,GAAI,aAAa,GAAC,QAAQ,GAAC,oBAAoB,CAAA;QAG3D,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;;QAKd,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACN;;;;;;;;;;;;EAYJ,kBAAkB;EAClB,cAAc;EACd,SAAS,CAAA,CAAC,CAAA,YAAY,SAAS,YAAY,IAAI,GAAG,CAAA,CAAC,CAAA,EAAE;;;;aAI1C,QAAQ;kBACH,QAAQ;;;;;;;;;;;;;;;;;;;eAmBX,QAAQ;;;;;YAKV,2BAA2B,CAAC,CAAC,CAAC,yCAAyC,2BAA2B,KAAK,CAAC,CAAC,CAAC,EAAG;;;;YAI7G,SAAS,CAAC,CAAC,CAAC,yDAAyD,SAAS,4BAA4B,CAAA,CAAC,CAAC,EAAE;;;;;;;;;CAS1H,CAAA;QAGG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AAnHD,0DAmHC"}
+{"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAWlE,MAAa,uBAAwB,SAAQ,+CAAqB;IAQhE,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,oBAAoB,GAA4B,OAAO,CAAC,iBAAiB,CAAA;QAC/E,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,cAAc,EACd,kBAAkB,EACnB,GAAG,oBAAoB,CAAA;QACxB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,cAAc,CAAA;QAClF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACzE,MAAM,2BAA2B,GAAG,cAAc,IAAI,eAAe;YACnE,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,GAAG,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA,CAAC,CAAC,EAAE,IAAI,QAAQ,GAAG;YAChK,CAAC,CAAC,EAAE,CAAA;QAEJ,IAAI,SAAa,CAAE;QACnB,IAAI,wBAAwB,GAAW,KAAK,CAAE;QAE9C,IAAG,kBAAkB,IAAK,kBAAkB,CAAC,MAAM,EAAC;YAClD,wBAAwB,GAAG,IAAI,CAAC;YAChC,IAAG,kBAAkB,CAAC,WAAW,EAAC;gBAChC,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAA;gBAClD,MAAM,QAAQ,GAAG,4BAA4B,CAAC;gBAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;gBACjD,IAAG,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAC;oBAC3C,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;iBAC9B;aACF;SACF;QACD,MAAM,IAAI,GAAI,aAAa,GAAC,QAAQ,GAAC,oBAAoB,CAAA;QAG3D,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;;QAKd,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACN;;;;;;;;;;;;EAYJ,kBAAkB;EAClB,cAAc;EACd,SAAS,CAAA,CAAC,CAAA,YAAY,SAAS,YAAY,IAAI,GAAG,CAAA,CAAC,CAAA,EAAE;;;;aAI1C,QAAQ;kBACH,QAAQ;;;;;;;;;;;;;;;;;;;eAmBX,QAAQ;;;;;YAKV,2BAA2B,CAAC,CAAC,CAAC,yCAAyC,2BAA2B,KAAK,CAAC,CAAC,CAAC,EAAG;;;YAG7G,SAAS,CAAC,CAAC,CAAC,yDAAyD,SAAS,4BAA4B,CAAA,CAAC,CAAC,EAAE;;;;;;;CAO1H,CAAA;QAGG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AAhHD,0DAgHC"}