diff --git a/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue b/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue
index cc1d739c..8e609868 100644
--- a/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue
+++ b/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue
@@ -255,23 +255,23 @@
             form: {
               colsNum: 1,
               fields: [
-                { name: 'parent', label: $t('parent'), type: 'text', hidden: true },
-                { name: 'type', label: $t('type'), type: 'text', hidden: true },
+                { name: 'parent', label: $t('parent'), type: 'w-text', hidden: true },
+                { name: 'type', label: $t('type'), type: 'w-text', hidden: true },
                 {
                   name: 'code',
                   label: $t('code'),
-                  type: 'text',
+                  type: 'w-text',
                   showIf: (arg) => {
                     const type = arg.form.getFieldValue('type');
                     return type !== 'FOLDER';
                   },
                 },
-                { name: 'name', label: $t('name'), type: 'text', required: true },
-                { name: 'description', label: $t('description'), type: 'text' },
+                { name: 'name', label: $t('name'), type: 'w-text', required: true },
+                { name: 'description', label: $t('description'), type: 'w-text' },
                 {
                   name: 'javaClassName',
                   label: $t('re.dictionary.grid.entity.javaClassName'),
-                  type: 'text',
+                  type: 'w-text',
                   showIf: (arg) => {
                     const type = arg.form.getFieldValue('type');
                     return type === 'JAVA_CLASS';
@@ -356,8 +356,8 @@
           sort-by="order"
           :query-form-cols-num="3"
           :query-form-fields="[
-            { name: 'code', label: $t('code'), type: 'text', clearable: true },
-            { name: 'name', label: $t('name'), type: 'text', clearable: true },
+            { name: 'code', label: $t('code'), type: 'w-text', clearable: true },
+            { name: 'name', label: $t('name'), type: 'w-text', clearable: true },
           ]"
           :toolbar-configure="{ noIcon: false }"
           :toolbar-actions="['query', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view']"
@@ -400,15 +400,15 @@
             form: {
               colsNum: 1,
               fields: [
-                { name: 'dictionary', label: $t('dictionary'), type: 'text', hidden: true, defaultValue: currentSelectedDictionaryIdRef },
-                { name: 'code', label: $t('code'), type: 'text' },
-                { name: 'name', label: $t('name'), type: 'text', required: true },
-                { name: 'description', label: $t('description'), type: 'text' },
+                { name: 'dictionary', label: $t('dictionary'), type: 'w-text', hidden: true, defaultValue: currentSelectedDictionaryIdRef },
+                { name: 'code', label: $t('code'), type: 'w-text' },
+                { name: 'name', label: $t('name'), type: 'w-text', required: true },
+                { name: 'description', label: $t('description'), type: 'w-text' },
                 {
                   name: 'valueType',
                   label: $t('re.dictionary.field.grid.entity.valueType'),
                   required: true,
-                  type: 'select',
+                  type: 'w-select',
                   options: ValueTypeList,
                   'onUpdate:modelValue': (value) => {
                     const valueType = fieldGridRef.getEditorForm().getFieldValue('valueType');
@@ -425,7 +425,7 @@
                 {
                   name: 'valueTypeVersion',
                   label: $t('re.resources.designer.parameter.grid.entity.valueTypeVersion'),
-                  type: 'select',
+                  type: 'w-select',
                   clearable: true,
                   options: valueTypeVersionOptionsRef,
                   showIf: (arg) => {
@@ -445,13 +445,13 @@
                 {
                   name: 'valueTypeIsList',
                   label: $t('re.dictionary.field.grid.entity.valueTypeIsList'),
-                  type: 'checkbox',
+                  type: 'w-checkbox',
                 },
-                { name: 'defaultValue', label: $t('defaultValue'), type: 'text' },
+                { name: 'defaultValue', label: $t('defaultValue'), type: 'w-text' },
                 {
                   name: 'valueCalculation',
                   label: $t('re.dictionary.field.grid.entity.valueCalculation'),
-                  type: 'code-mirror',
+                  type: 'w-code-mirror',
                   lang: 'java',
                   rows: 3,
                   placeholder: true,
@@ -459,7 +459,7 @@
                   autoCompletionOptions: autoCompletionOptionsRef,
                   extAutoCompletionOptions: GroovyFunctions,
                 },
-                { name: 'order', label: $t('order'), type: 'number' },
+                { name: 'order', label: $t('order'), type: 'w-number' },
               ],
             },
           }"
@@ -571,15 +571,15 @@
             form: {
               colsNum: 1,
               fields: [
-                { name: 'dictionary', label: $t('dictionary'), type: 'text', hidden: false, defaultValue: currentSelectedDictionaryIdRef },
-                { name: 'value', label: $t('value'), type: 'text', hidden: false },
+                { name: 'dictionary', label: $t('dictionary'), type: 'w-text', hidden: false, defaultValue: currentSelectedDictionaryIdRef },
+                { name: 'value', label: $t('value'), type: 'w-text', hidden: false },
                 {
                   name: 'title',
                   label: $t('title'),
                   type: 'text',
                 },
-                { name: 'description', label: $t('description'), type: 'text' },
-                { name: 'order', label: $t('order'), type: 'number' },
+                { name: 'description', label: $t('description'), type: 'w-text' },
+                { name: 'order', label: $t('order'), type: 'w-number' },
               ],
             },
           }"
diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Testcase.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Testcase.vue
index f1419e40..a0bee4a7 100644
--- a/io.sc.engine.rule.frontend/src/views/resources/designer/Testcase.vue
+++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Testcase.vue
@@ -104,13 +104,13 @@
         form: {
           colsNum: 1,
           fields: [
-            { name: 'id', label: $t('id'), type: 'text', hidden: true },
-            { name: 'ownerType', label: $t('ownerType'), type: 'text', defaultValue: 'MODEL', hidden: true },
-            { name: 'owner', label: $t('owner'), type: 'text', defaultValue: model.resource, hidden: true },
-            { name: 'ownerId', label: $t('ownerId'), type: 'text', defaultValue: model.resource, hidden: true },
-            { name: 'name', label: $t('name'), type: 'text', required: true },
-            { name: 'description', label: $t('description'), type: 'text' },
-            { name: 'order', label: $t('order'), type: 'number' },
+            { name: 'id', label: $t('id'), type: 'w-text', hidden: true },
+            { name: 'ownerType', label: $t('ownerType'), type: 'w-text', defaultValue: 'MODEL', hidden: true },
+            { name: 'owner', label: $t('owner'), type: 'w-text', defaultValue: model.resource, hidden: true },
+            { name: 'ownerId', label: $t('ownerId'), type: 'w-text', defaultValue: model.resource, hidden: true },
+            { name: 'name', label: $t('name'), type: 'w-text', required: true },
+            { name: 'description', label: $t('description'), type: 'w-text' },
+            { name: 'order', label: $t('order'), type: 'w-number' },
           ],
         },
       }"
@@ -133,8 +133,8 @@
         },
       }"
       @row-click="
-        (evt, row, index) => {
-          emit('rowClick', evt, row, index);
+        (args) => {
+          emit('rowClick', args.evt, args.row, args.index);
         }
       "
       @before-request-data="