@farris/jit-engine 1.3.92 → 1.3.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +64 -0
- package/lib/domstructure/devkit/viewmodel/component/component.js +1 -1
- package/lib/domstructure/devkit/viewmodel/component/component.js.map +1 -1
- package/lib/domstructure/devkit/viewmodel/form/form.js +2 -2
- package/lib/domstructure/devkit/viewmodel/form/form.js.map +1 -1
- package/lib/domstructure/devkit/viewmodel/statemachine/statemachine.js +1 -1
- package/lib/domstructure/devkit/viewmodel/statemachine/statemachine.js.map +1 -1
- package/lib/domstructure/ui/commands/button.js +1 -1
- package/lib/domstructure/ui/commands/button.js.map +1 -1
- package/lib/domstructure/ui/common/base-title-component.js +1 -1
- package/lib/domstructure/ui/common/base-title-component.js.map +1 -1
- package/lib/domstructure/ui/common/basecomponent.js +13 -8
- package/lib/domstructure/ui/common/basecomponent.js.map +1 -1
- package/lib/domstructure/ui/common/binding.js +48 -1
- package/lib/domstructure/ui/common/binding.js.map +1 -1
- package/lib/domstructure/ui/container/html_template.js +21 -0
- package/lib/domstructure/ui/container/html_template.js.map +1 -1
- package/lib/domstructure/ui/container/qdp_condition_dialog.js +6 -2
- package/lib/domstructure/ui/container/qdp_condition_dialog.js.map +1 -1
- package/lib/domstructure/ui/container/qdp_condition_dialog_tab.js +1 -1
- package/lib/domstructure/ui/container/qdp_condition_dialog_tab.js.map +1 -1
- package/lib/domstructure/ui/data/collection/farris-datagrid/farris-datagrid.js +20 -11
- package/lib/domstructure/ui/data/collection/farris-datagrid/farris-datagrid.js.map +1 -1
- package/lib/domstructure/ui/data/collection/hierarchy/tree_grid.js +1 -1
- package/lib/domstructure/ui/data/collection/hierarchy/tree_grid.js.map +1 -1
- package/lib/domstructure/ui/data/data.js +1 -1
- package/lib/domstructure/ui/data/data.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/combo-list.js +3 -3
- package/lib/domstructure/ui/data/fields/form/combo-list.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/datepicker.js +1 -1
- package/lib/domstructure/ui/data/fields/form/datepicker.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/reference/lookup_edit.js +9 -6
- package/lib/domstructure/ui/data/fields/form/editable/inputs/reference/lookup_edit.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/text/multi_text_box.js +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/text/multi_text_box.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/text/text_box.js +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/text/text_box.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/ext-intergration.js +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/ext-intergration.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/farris-combo-lookup.js +6 -3
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/farris-combo-lookup.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/farris-number-range.js +2 -2
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/farris-number-range.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/farris-number-spinner.js +3 -3
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/farris-number-spinner.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/language-textbox.js +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/language-textbox.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/lookup_employee.js +2 -2
- package/lib/domstructure/ui/data/fields/form/editable/inputs/value/lookup_employee.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/switch/checkbox-group.js +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/switch/checkbox-group.js.map +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/switch/radio_group.js +1 -1
- package/lib/domstructure/ui/data/fields/form/editable/switch/radio_group.js.map +1 -1
- package/lib/domstructure/ui/data/scrollcollapse/scroll-collapsible-area.js +1 -1
- package/lib/domstructure/ui/data/scrollcollapse/scroll-collapsible-area.js.map +1 -1
- package/lib/domstructure/ui/farris-avatar/farris-avatar.js +1 -1
- package/lib/domstructure/ui/farris-avatar/farris-avatar.js.map +1 -1
- package/lib/domstructure/ui/farris-file-preview/farris-file-preview.js +4 -4
- package/lib/domstructure/ui/farris-file-preview/farris-file-preview.js.map +1 -1
- package/lib/domstructure/ui/farris-file-upload/farris-file-upload.js +2 -2
- package/lib/domstructure/ui/farris-file-upload/farris-file-upload.js.map +1 -1
- package/lib/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.js +12 -11
- package/lib/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.js.map +1 -1
- package/lib/domstructure/ui/farris-scrollspy/farris-scrollspy.js +4 -4
- package/lib/domstructure/ui/farris-scrollspy/farris-scrollspy.js.map +1 -1
- package/lib/domstructure/ui/farrisprogressstep/farris-progress-step.js +1 -1
- package/lib/domstructure/ui/farrisprogressstep/farris-progress-step.js.map +1 -1
- package/lib/domstructure/ui/light-listfilter/farris-light-listfilter.js +3 -3
- package/lib/domstructure/ui/light-listfilter/farris-light-listfilter.js.map +1 -1
- package/lib/domstructure/ui/list-filter/farris-list-filter.js +2 -2
- package/lib/domstructure/ui/list-filter/farris-list-filter.js.map +1 -1
- package/lib/domstructure/ui/listview/list-view-contenttemplate-field.js +3 -2
- package/lib/domstructure/ui/listview/list-view-contenttemplate-field.js.map +1 -1
- package/lib/domstructure/ui/listview/list-view.js +1 -1
- package/lib/domstructure/ui/listview/list-view.js.map +1 -1
- package/lib/domstructure/ui/multi-select/multi-select.js +1 -1
- package/lib/domstructure/ui/multi-select/multi-select.js.map +1 -1
- package/lib/domstructure/ui/nav-tab/nav-tab.js +3 -3
- package/lib/domstructure/ui/nav-tab/nav-tab.js.map +1 -1
- package/lib/domstructure/ui/p-treetable/p-treetable.js +2 -2
- package/lib/domstructure/ui/p-treetable/p-treetable.js.map +1 -1
- package/lib/domstructure/ui/queryScheme/query-scheme.js +4 -4
- package/lib/domstructure/ui/queryScheme/query-scheme.js.map +1 -1
- package/lib/mobileapp/vue/domstructure/ui/list-view/vue-list-view.js +2 -1
- package/lib/mobileapp/vue/domstructure/ui/list-view/vue-list-view.js.map +1 -1
- package/lib/mobileapp/vue/domstructure/ui/text-box/text-box-external.js +1 -1
- package/lib/mobileapp/vue/domstructure/ui/text-box/text-box-external.js.map +1 -1
- package/lib/template/ui/kendo/checkbox.pug +12 -3
- package/lib/template/ui/kendo/combobox.pug +9 -3
- package/lib/template/ui/kendo/datepicker.pug +8 -2
- package/lib/template/ui/kendo/farris-checkbox-group.pug +8 -2
- package/lib/template/ui/kendo/farris-combo-list.pug +8 -2
- package/lib/template/ui/kendo/farris-datagrid.pug +1 -1
- package/lib/template/ui/kendo/farris-datepicker.pug +9 -2
- package/lib/template/ui/kendo/farris-ext-intergration.pug +8 -2
- package/lib/template/ui/kendo/farris-file-upload-preview.pug +34 -23
- package/lib/template/ui/kendo/farris-number-range.pug +8 -2
- package/lib/template/ui/kendo/farris-number-spinner.pug +8 -2
- package/lib/template/ui/kendo/farris-switch.pug +8 -2
- package/lib/template/ui/kendo/farris-tags.pug +8 -2
- package/lib/template/ui/kendo/farris-time-picker.pug +8 -2
- package/lib/template/ui/kendo/input-group.pug +8 -2
- package/lib/template/ui/kendo/language-textbox.pug +8 -2
- package/lib/template/ui/kendo/lookup-employee.pug +8 -2
- package/lib/template/ui/kendo/lookup.pug +10 -2
- package/lib/template/ui/kendo/multitextbox.pug +8 -2
- package/lib/template/ui/kendo/numericbox.pug +8 -2
- package/lib/template/ui/kendo/p-treetable.pug +7 -7
- package/lib/template/ui/kendo/primeng-edittree/farris-combo-lookup.pug +1 -1
- package/lib/template/ui/kendo/primeng-edittree/lookup.pug +2 -0
- package/lib/template/ui/kendo/qdp-condition-dialog.pug +1 -1
- package/lib/template/ui/kendo/radioboxgroup.pug +8 -2
- package/lib/template/ui/kendo/switch.pug +8 -2
- package/lib/template/ui/kendo/textbox.pug +8 -2
- package/lib/template/ui/mobilevue/list-view.pug +3 -3
- package/lib/template/ui/mobilevue/nav-bar.pug +1 -1
- package/lib/template/ui/mobilevue/text-box-external.pug +1 -0
- package/lib/utility/component-title-executor.js +1 -1
- package/lib/utility/component-title-executor.js.map +1 -1
- package/lib/utility/devkit/component-creator.js +2 -0
- package/lib/utility/devkit/component-creator.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-events-collector.js +15 -0
- package/lib/utility/devkit/component-parameter-collector/component-events-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-external-container-parameter-collector.js +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-external-container-parameter-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-file-upload-parameter-collector.js +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-file-upload-parameter-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-header-parameter-collector.js +5 -5
- package/lib/utility/devkit/component-parameter-collector/component-header-parameter-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-listview-parameter-collector.js +2 -2
- package/lib/utility/devkit/component-parameter-collector/component-listview-parameter-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-parameter-collector-manager.js +8 -0
- package/lib/utility/devkit/component-parameter-collector/component-parameter-collector-manager.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/component-parameter-collector-type.js +2 -0
- package/lib/utility/devkit/component-parameter-collector/component-parameter-collector-type.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-checkbox-group-collector.js +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-checkbox-group-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-datagrid-collector.js +9 -2
- package/lib/utility/devkit/component-parameter-collector/farris-datagrid-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-input-group-collector.js +4 -4
- package/lib/utility/devkit/component-parameter-collector/farris-input-group-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-nav-tab-parameter-collector.js +2 -2
- package/lib/utility/devkit/component-parameter-collector/farris-nav-tab-parameter-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-radiogroup-collector.js +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-radiogroup-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-section-collector.js +6 -6
- package/lib/utility/devkit/component-parameter-collector/farris-section-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-tabs-collector.js +6 -6
- package/lib/utility/devkit/component-parameter-collector/farris-tabs-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/farris-treegrid-parameter-collector.js +10 -0
- package/lib/utility/devkit/component-parameter-collector/farris-treegrid-parameter-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/primeng-tree-grid-parameter-collector.js +2 -1
- package/lib/utility/devkit/component-parameter-collector/primeng-tree-grid-parameter-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/scrollspy-collector.js +3 -3
- package/lib/utility/devkit/component-parameter-collector/scrollspy-collector.js.map +1 -1
- package/lib/utility/devkit/component-parameter-collector/toolbar-collector.js +2 -2
- package/lib/utility/devkit/component-parameter-collector/toolbar-collector.js.map +1 -1
- package/lib/utility/devkit/statemachine-creator.js +1 -1
- package/lib/utility/devkit/statemachine-creator.js.map +1 -1
- package/lib/utility/farris-datagrid/abstract-editor.js +4 -3
- package/lib/utility/farris-datagrid/abstract-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/abstract-lookup-editor.js +7 -6
- package/lib/utility/farris-datagrid/abstract-lookup-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/combo-list-editor.js +4 -4
- package/lib/utility/farris-datagrid/combo-list-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/combo-lookup-editor.js +7 -2
- package/lib/utility/farris-datagrid/combo-lookup-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/date-picker-editor.js +1 -1
- package/lib/utility/farris-datagrid/date-picker-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/enum-editor.js +1 -1
- package/lib/utility/farris-datagrid/enum-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/language-textbox-generator.js +1 -1
- package/lib/utility/farris-datagrid/language-textbox-generator.js.map +1 -1
- package/lib/utility/farris-datagrid/lookup-editor.js +5 -0
- package/lib/utility/farris-datagrid/lookup-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/number-box-editor.js +5 -5
- package/lib/utility/farris-datagrid/number-box-editor.js.map +1 -1
- package/lib/utility/farris-datagrid/personnel-selector-editor.js +1 -1
- package/lib/utility/farris-datagrid/personnel-selector-editor.js.map +1 -1
- package/lib/utility/template-generator/devkit/component-generator/component-import-generator.js +2 -2
- package/lib/utility/template-generator/devkit/component-generator/component-import-generator.js.map +1 -1
- package/lib/utility/template-generator/devkit/component-generator/component-primeng-treegrid-parameter-generator.js +23 -0
- package/lib/utility/template-generator/devkit/component-generator/component-primeng-treegrid-parameter-generator.js.map +1 -1
- package/lib/utility/template-generator/devkit/component-generator/component-queryschema-parameter-generator.js +2 -2
- package/lib/utility/template-generator/devkit/component-generator/component-queryschema-parameter-generator.js.map +1 -1
- package/lib/utility/template-generator/devkit/component-generator/component-treegrid-parameter-generator.js +9 -0
- package/lib/utility/template-generator/devkit/component-generator/component-treegrid-parameter-generator.js.map +1 -1
- package/lib/utility/template-generator/devkit/component-template-generator.js +28 -1
- package/lib/utility/template-generator/devkit/component-template-generator.js.map +1 -1
- package/lib/utility/template-generator/devkit/statemachine-template-generator.js +3 -2
- package/lib/utility/template-generator/devkit/statemachine-template-generator.js.map +1 -1
- package/lib/utility/toolhepler.js +23 -9
- package/lib/utility/toolhepler.js.map +1 -1
- package/package.json +1 -1
- package/lib/mobileapp/vue/static/.npmignore +0 -13
package/README.md
CHANGED
|
@@ -1,3 +1,67 @@
|
|
|
1
|
+
1.3.99
|
|
2
|
+
|
|
3
|
+
移动列表模板listClick事件绑定位置调整
|
|
4
|
+
1.3.98
|
|
5
|
+
|
|
6
|
+
列表指令增加disableGroupOnEditing
|
|
7
|
+
|
|
8
|
+
1.3.96
|
|
9
|
+
|
|
10
|
+
列表增加自定义选择模式
|
|
11
|
+
树列表增加单元格提示、提示内容
|
|
12
|
+
状态机增加name注解
|
|
13
|
+
|
|
14
|
+
1.3.94
|
|
15
|
+
|
|
16
|
+
qdp增加beforeQuery
|
|
17
|
+
只读支持数组类型变量解析
|
|
18
|
+
列表支持selectOnEditing、footerPosition 、showGotoInput、 scrollBarShowMode
|
|
19
|
+
附件上传预览组件增加title
|
|
20
|
+
|
|
21
|
+
1.3.86
|
|
22
|
+
|
|
23
|
+
section支持toolbar
|
|
24
|
+
|
|
25
|
+
1.3.84
|
|
26
|
+
|
|
27
|
+
零代码支持SAP数据集成
|
|
28
|
+
移动支持数据集成
|
|
29
|
+
|
|
30
|
+
1.3.83
|
|
31
|
+
|
|
32
|
+
switch控件编辑支持状态机变量
|
|
33
|
+
|
|
34
|
+
1.3.82
|
|
35
|
+
|
|
36
|
+
日期控件支持最大值、最小值
|
|
37
|
+
|
|
38
|
+
1.3.81
|
|
39
|
+
|
|
40
|
+
移动不存在表达式不再生成表达式文件
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
1.3.78
|
|
44
|
+
|
|
45
|
+
datepicker 最大值、最小值支持校验
|
|
46
|
+
移动审批修正
|
|
47
|
+
|
|
48
|
+
1.3.77
|
|
49
|
+
|
|
50
|
+
移动增加表达式
|
|
51
|
+
|
|
52
|
+
1.3.76
|
|
53
|
+
|
|
54
|
+
集成附件上传预览组件
|
|
55
|
+
|
|
56
|
+
1.3.72
|
|
57
|
+
|
|
58
|
+
筛选方案集成resetFields
|
|
59
|
+
列表集成选人组件
|
|
60
|
+
|
|
61
|
+
1.3.70
|
|
62
|
+
|
|
63
|
+
list-filter 帮助控件增加clearfields 参数
|
|
64
|
+
|
|
1
65
|
1.3.68
|
|
2
66
|
|
|
3
67
|
筛选方案single-year支持maxDate、minDate变量
|
|
@@ -30,7 +30,7 @@ class ComponentConfig {
|
|
|
30
30
|
fieldSetParameters,farrisTreeGridParameter,componentSidebarToolbar,componentSidebarTitle,farrisListNavParameters,querySchemaParameters,scrollSpyTitleParameters,qdpFrameworkQueryName,enableUnifiedSession,
|
|
31
31
|
toolTypeChangeParameters,farrisSectionParameters,wizardParameters,farrisInputGroupParameter,farrisListFilterParameter,farrisDatePickers,farrisComboLists,farrisTimePickers,farrisTextBoxs,farrisMultiTextBoxs,farrisLanguageTextBoxs,farrisNumericBoxs,
|
|
32
32
|
farrisDateBoxs,farrisTimeSpinners,footerParameters,buttonParameters,primengTreeGridParameters,navTabParameters,viewChangeParameters,tagsParameters,listViewParameters,customProviders,moduleSchemaId,customComponentClass,paramTypeTransform,externalContainerParameters,
|
|
33
|
-
personnelSelectorParameters`;
|
|
33
|
+
personnelSelectorParameters,componentConditionDialogParameter,componentReadonlyProp`;
|
|
34
34
|
Object.keys(obj).forEach(key => {
|
|
35
35
|
if (keys.includes(key)) {
|
|
36
36
|
if (key == "onInit" || key == "afterViewInit") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/component/component.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,iDAM6B;AAE7B,2DAAwD;AAKxD,yEAAoE;AACpE,6DAAyD;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ class Control extends i18n_resource_1.I18nResource {
|
|
|
48
48
|
if (keys.includes(key)) {
|
|
49
49
|
if (key === 'maxValue') {
|
|
50
50
|
if (obj[key]) {
|
|
51
|
-
const maxBindingValue = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], null);
|
|
51
|
+
const maxBindingValue = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], null, this.fieldId);
|
|
52
52
|
let canAddRule = true;
|
|
53
53
|
if (maxBindingValue.isVariable || maxBindingValue.isExpression || maxBindingValue.isForm) {
|
|
54
54
|
canAddRule = false;
|
|
@@ -64,7 +64,7 @@ class Control extends i18n_resource_1.I18nResource {
|
|
|
64
64
|
else if (key === 'minValue') {
|
|
65
65
|
if (obj[key]) {
|
|
66
66
|
let canAddRule = true;
|
|
67
|
-
const minBindingValue = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], null);
|
|
67
|
+
const minBindingValue = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], null, this.fieldId);
|
|
68
68
|
if (minBindingValue.isVariable || minBindingValue.isExpression || minBindingValue.isForm) {
|
|
69
69
|
canAddRule = false;
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/form/form.ts"],"names":[],"mappings":";;;AAAA,0DAAsD;AACtD,iDAAsE;AAGtE,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,mDAAU,CAAA;IACV,iDAAS,CAAA;AACb,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAED,MAAa,aAAa;IAStB,YAAY,KAAmB;QAC3B,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,8CAA8C,CAAC;QAC5D,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;IACP,CAAC;CACJ;AA5BD,sCA4BC;AAED,MAAa,OAAQ,SAAQ,4BAAY;IAoBrC,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;QAED,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,yNAAyN,CAAC;QACvO,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,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,MAAM,eAAe,GAAG,oBAAU,CAAC,gCAAgC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/form/form.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statemachine.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/statemachine/statemachine.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AAEjD,MAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"statemachine.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/statemachine/statemachine.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ class Button extends command_1.Command {
|
|
|
22
22
|
if (keys.includes(key)) {
|
|
23
23
|
if (key == "bindDataSource") {
|
|
24
24
|
if (obj[key]) {
|
|
25
|
-
this.bindDataSource = utility_1.ToolHelper.createBinding(obj[key], null, this.externalComponentNameSpace);
|
|
25
|
+
this.bindDataSource = utility_1.ToolHelper.createBinding(obj[key], null, this.externalComponentNameSpace, this.id);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"button.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/commands/button.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,mGAA4F;AAE5F,uCAAoC;AAEpC,MAAa,MAAO,SAAQ,iBAAO;IAKjC,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,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,oCAAoC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,GAAG,IAAI,gBAAgB,EAAE;oBAC3B,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACZ,IAAI,CAAC,cAAc,GAAG,oBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"button.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/commands/button.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,mGAA4F;AAE5F,uCAAoC;AAEpC,MAAa,MAAO,SAAQ,iBAAO;IAKjC,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,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,oCAAoC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,GAAG,IAAI,gBAAgB,EAAE;oBAC3B,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACZ,IAAI,CAAC,cAAc,GAAG,oBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;qBAC1G;iBACF;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACtB;aACF;QACH,CAAC,CAAC,CAAC;QAGH,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;SAChC;QAED,IAAI,IAAI,CAAC,cAAc,IAAI,SAAS,EAAE;YAEpC,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;aAC9C;iBAAM;gBACL,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;aACvB;SACF;aAAM,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,EAAE;YAC1C,IAAI,CAAC,WAAW,GAAG,mDAAsB,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACtE;IACH,CAAC;IAED,MAAM;QACJ,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACxG,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AAxDD,wBAwDC"}
|
|
@@ -21,7 +21,7 @@ class BaseTitleComponent extends basecomponent_1.BaseComponent {
|
|
|
21
21
|
if (keys.includes(key)) {
|
|
22
22
|
if (key == "titleDataSource") {
|
|
23
23
|
if (obj[key]) {
|
|
24
|
-
this[key] = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], this.externalComponentNameSpace);
|
|
24
|
+
this[key] = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], this.externalComponentNameSpace, this.id);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-title-component.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/base-title-component.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,mDAAgD;AAWhD,MAAa,kBAAmB,SAAQ,6BAAa;IAMjD,YAAY,KAAU;QAClB,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,uCAAuC,CAAC;QACrD,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,iBAAiB,EAAE;oBAC1B,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,gCAAgC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"base-title-component.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/base-title-component.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,mDAAgD;AAWhD,MAAa,kBAAmB,SAAQ,6BAAa;IAMjD,YAAY,KAAU;QAClB,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,uCAAuC,CAAC;QACrD,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,iBAAiB,EAAE;oBAC1B,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,gCAAgC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;qBAC9G;iBACJ;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAUS,aAAa;QACnB,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC;SACrB;QACD,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACvB,OAAO,EAAE,CAAC;SACb;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;IAEtC,CAAC;IASS,aAAa;QACnB,OAAO,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,IAAI,QAAQ,CAAC;IACrE,CAAC;CACJ;AA/DD,gDA+DC"}
|
|
@@ -10,6 +10,7 @@ const size_1 = require("./size");
|
|
|
10
10
|
const static_control_1 = require("../static-control");
|
|
11
11
|
const utility_1 = require("../../../utility");
|
|
12
12
|
const running_position_enum_1 = require("../../running-position-enum");
|
|
13
|
+
const component_readonly_parameter_creator_1 = require("../../../utility/devkit/component-readonly-parameter-creator");
|
|
13
14
|
class BaseComponent extends static_control_1.StaticControlAttribute {
|
|
14
15
|
constructor(param) {
|
|
15
16
|
super(param);
|
|
@@ -24,7 +25,8 @@ class BaseComponent extends static_control_1.StaticControlAttribute {
|
|
|
24
25
|
return;
|
|
25
26
|
}
|
|
26
27
|
this.externalComponentNameSpace = obj["externalComponentNameSpace"];
|
|
27
|
-
|
|
28
|
+
this.id = obj["id"];
|
|
29
|
+
const keys = 'visible,readonly,require,binding,appearance,border,font,margin,padding,size,tabindex,hasDefaultFocus,focusState,controlIndex,enableTitleTips,titleTipsTemplate,viewModel,useDisplayStyle';
|
|
28
30
|
Object.keys(obj).forEach(key => {
|
|
29
31
|
if (keys.includes(key)) {
|
|
30
32
|
switch (key) {
|
|
@@ -47,16 +49,16 @@ class BaseComponent extends static_control_1.StaticControlAttribute {
|
|
|
47
49
|
this[key] = new size_1.Size(obj[key]);
|
|
48
50
|
break;
|
|
49
51
|
case "visible":
|
|
50
|
-
this[key] = utility_1.ToolHelper.createBindingWithPosition(obj[key], true, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card);
|
|
52
|
+
this[key] = utility_1.ToolHelper.createBindingWithPosition(obj[key], true, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card, this.id);
|
|
51
53
|
break;
|
|
52
54
|
case "readonly":
|
|
53
|
-
this[key] = utility_1.ToolHelper.createBindingWithPosition(obj[key], false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card);
|
|
55
|
+
this[key] = utility_1.ToolHelper.createBindingWithPosition(obj[key], false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card, this.id);
|
|
54
56
|
break;
|
|
55
57
|
case "require":
|
|
56
|
-
this[key] = utility_1.ToolHelper.createBindingWithPosition(obj[key], false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card);
|
|
58
|
+
this[key] = utility_1.ToolHelper.createBindingWithPosition(obj[key], false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card, this.id);
|
|
57
59
|
break;
|
|
58
60
|
case "enableTitleTips":
|
|
59
|
-
this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
|
|
61
|
+
this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
60
62
|
break;
|
|
61
63
|
default:
|
|
62
64
|
this[key] = obj[key];
|
|
@@ -65,13 +67,16 @@ class BaseComponent extends static_control_1.StaticControlAttribute {
|
|
|
65
67
|
}
|
|
66
68
|
});
|
|
67
69
|
if (!this.visible) {
|
|
68
|
-
this.visible = utility_1.ToolHelper.createBindingWithPosition(true, true, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card);
|
|
70
|
+
this.visible = utility_1.ToolHelper.createBindingWithPosition(true, true, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card, this.id);
|
|
69
71
|
}
|
|
70
72
|
if (!this.readonly) {
|
|
71
|
-
this.readonly = utility_1.ToolHelper.createBindingWithPosition(false, false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card);
|
|
73
|
+
this.readonly = utility_1.ToolHelper.createBindingWithPosition(false, false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card, this.id);
|
|
72
74
|
}
|
|
73
75
|
if (!this.require) {
|
|
74
|
-
this.require = utility_1.ToolHelper.createBindingWithPosition(false, false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card);
|
|
76
|
+
this.require = utility_1.ToolHelper.createBindingWithPosition(false, false, this.externalComponentNameSpace, running_position_enum_1.RunningPositionEnum.card, this.id);
|
|
77
|
+
}
|
|
78
|
+
if (this.readonly.isComposite) {
|
|
79
|
+
this.readonly.value = "this.viewModel.calculateReadonlyByRules(" + component_readonly_parameter_creator_1.ComponentReadonlyParameterCreator.createTitleId(this.id) + ")";
|
|
75
80
|
}
|
|
76
81
|
if (this.id) {
|
|
77
82
|
this.replacedId = utility_1.ToolHelper.replaceDotToXiaHuaXian(this.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basecomponent.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/basecomponent.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,qCAAkC;AAClC,iCAA8B;AAC9B,qCAAkC;AAClC,uCAAoC;AACpC,iCAA8B;AAE9B,sDAA2D;AAC3D,8CAAmE;AAGnE,uEAAkE;
|
|
1
|
+
{"version":3,"file":"basecomponent.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/basecomponent.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,qCAAkC;AAClC,iCAA8B;AAC9B,qCAAkC;AAClC,uCAAoC;AACpC,iCAA8B;AAE9B,sDAA2D;AAC3D,8CAAmE;AAGnE,uEAAkE;AAClE,uHAAiH;AAUjH,MAAa,aAAc,SAAQ,uCAAsB;IA0CvD,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,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,IAAI,CAAC,0BAA0B,GAAG,GAAG,CAAC,4BAA4B,CAAC,CAAC;QACpE,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,IAAI,GAAG,0LAA0L,CAAC;QACxM,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,QAAQ,GAAG,EAAE;oBACX,KAAK,YAAY;wBACf,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,uBAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBACrC,MAAM;oBACR,KAAK,QAAQ;wBACX,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBACjC,MAAM;oBACR,KAAK,MAAM;wBACT,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,WAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC/B,MAAM;oBACR,KAAK,QAAQ;wBACX,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBACjC,MAAM;oBACR,KAAK,SAAS;wBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,iBAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBAClC,MAAM;oBACR,KAAK,MAAM;wBACT,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,WAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC/B,MAAM;oBACR,KAAK,SAAS;wBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,2CAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBACrI,MAAM;oBACR,KAAK,UAAU;wBACb,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,2CAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBACtI,MAAM;oBACR,KAAK,SAAS;wBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,oBAAU,CAAC,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,2CAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBACtI,MAAM;oBACR,KAAK,iBAAiB;wBACpB,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;wBAChG,MAAM;oBACR;wBACE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;wBACrB,MAAM;iBACT;aACF;QACH,CAAC,CAAC,CAAC;QAGH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,oBAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,2CAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACrI;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,oBAAU,CAAC,yBAAyB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,2CAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACxI;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,oBAAU,CAAC,yBAAyB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,2CAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACvI;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;YAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,0CAA0C,GAAG,wEAAiC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;SACnI;QAED,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,UAAU,GAAG,oBAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC9D;QAGD,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;YACxD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAC/B;QAED,IAAI,CAAC,UAAU,GAAG,6BAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAE3F,IAAI,CAAC,qBAAqB,GAAG,oBAAU,CAAC,iCAAiC,CAAC,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC,CAAC;IAC/G,CAAC;IAED,MAAM;QACJ,MAAM,MAAM,GAAQ;YAClB,IAAI,EAAE,IAAI,CAAC,EAAE;YACb,MAAM,EAAE,eAAe;YACvB,SAAS,EAAE,IAAI,CAAC,OAAO;YACvB,UAAU,EAAE,IAAI,CAAC,QAAQ;YACzB,SAAS,EAAE,IAAI,CAAC,OAAO;YACvB,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,IAAI,CAAC,QAAQ;YACzB,iBAAiB,EAAE,IAAI,CAAC,eAAe;YACvC,YAAY,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;QAEF,MAAM,IAAI,GAAG,qEAAqE,CAAC;QACnF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE;gBACb,IAAI;oBACF,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;iBAClC;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACjB,MAAM,CAAC,CAAC;iBACT;aACF;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,aAAa;QACX,MAAM,WAAW,GAAgB;YAC/B,MAAM,EAAE,eAAe;YACvB,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;SACvF,CAAC;QACF,MAAM,IAAI,GAAG,+BAA+B,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;gBACrE,QAAQ,GAAG,EAAE;oBAIX;wBACE,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;wBAC7B,MAAM;iBACT;aACF;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,aAAa,EAAE,EAAE,WAAW,CAAC,CAAC;IAC/D,CAAC;CACF;AAvLD,sCAuLC"}
|
|
@@ -10,7 +10,11 @@ class Binding {
|
|
|
10
10
|
this.isExpression = false;
|
|
11
11
|
this.isVariable = false;
|
|
12
12
|
this.isForm = false;
|
|
13
|
+
this.isComposite = false;
|
|
13
14
|
this.runningPosition = running_position_enum_1.RunningPositionEnum.card;
|
|
15
|
+
if (options && utility_1.ToolHelper.isNullOrUndefined(options.addThisWithViewModel)) {
|
|
16
|
+
options.addThisWithViewModel = true;
|
|
17
|
+
}
|
|
14
18
|
if (param instanceof Binding) {
|
|
15
19
|
this.value = param.value;
|
|
16
20
|
this.type = this.value.type;
|
|
@@ -24,6 +28,40 @@ class Binding {
|
|
|
24
28
|
this.isForm = param.isForm;
|
|
25
29
|
return;
|
|
26
30
|
}
|
|
31
|
+
if (utility_1.ToolHelper.isArray(param)) {
|
|
32
|
+
const bindingArr = [];
|
|
33
|
+
param.forEach((item) => {
|
|
34
|
+
if (!utility_1.ToolHelper.isNullOrUndefined(item) && (!item.source || item.source === "dom")) {
|
|
35
|
+
let itemValue = item.value;
|
|
36
|
+
if (!item.source) {
|
|
37
|
+
itemValue = item;
|
|
38
|
+
}
|
|
39
|
+
const bindindValue = new Binding(itemValue, {
|
|
40
|
+
externalComponentNameSpace: options.externalComponentNameSpace,
|
|
41
|
+
runningPosition: options.runningPosition,
|
|
42
|
+
addThisWithViewModel: false,
|
|
43
|
+
parentComponentId: options.parentComponentId
|
|
44
|
+
});
|
|
45
|
+
bindindValue.value = { source: "dom", value: bindindValue.value };
|
|
46
|
+
bindingArr.push(bindindValue);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
const bindingValue = new Binding(item, {
|
|
50
|
+
externalComponentNameSpace: options.externalComponentNameSpace,
|
|
51
|
+
runningPosition: options.runningPosition,
|
|
52
|
+
addThisWithViewModel: false,
|
|
53
|
+
parentComponentId: options.parentComponentId
|
|
54
|
+
});
|
|
55
|
+
bindingArr.push(bindingValue);
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
this.isComposite = true;
|
|
59
|
+
const compositeValue = bindingArr.map((bindingItem) => {
|
|
60
|
+
return bindingItem.value;
|
|
61
|
+
});
|
|
62
|
+
this.value = compositeValue;
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
27
65
|
const externalComponentNameSpace = options.externalComponentNameSpace;
|
|
28
66
|
this.runningPosition = options.runningPosition ? options.runningPosition : running_position_enum_1.RunningPositionEnum.card;
|
|
29
67
|
if (utility_1.ToolHelper.isNullOrUndefinedOrEmpty(param)) {
|
|
@@ -36,12 +74,21 @@ class Binding {
|
|
|
36
74
|
this.value = param;
|
|
37
75
|
return;
|
|
38
76
|
}
|
|
77
|
+
if (utility_1.ToolHelper.isObject(param) && param.source) {
|
|
78
|
+
this.value = param;
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
39
81
|
if (utility_1.ToolHelper.isString(param) && utility_1.ToolHelper.isObject(param) == false) {
|
|
40
82
|
if (param.indexOf("=>") >= 0) {
|
|
41
83
|
this.value = param;
|
|
42
84
|
}
|
|
43
85
|
else {
|
|
44
|
-
|
|
86
|
+
if (options.addThisWithViewModel) {
|
|
87
|
+
this.value = utility_1.ToolHelper.viewModelReplaceToThisViewModel(param);
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
this.value = param;
|
|
91
|
+
}
|
|
45
92
|
}
|
|
46
93
|
this.useQuote = false;
|
|
47
94
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/binding.ts"],"names":[],"mappings":";;;AAAA,sFAAkF;AAClF,8CAA8C;AAC9C,4FAAuF;AACvF,uEAAkE;
|
|
1
|
+
{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/binding.ts"],"names":[],"mappings":";;;AAAA,sFAAkF;AAClF,8CAA8C;AAC9C,4FAAuF;AACvF,uEAAkE;AAGlE,MAAa,OAAO;IA6BlB,YAAY,KAAmB,EAAE,OAKhC;QAxBD,iBAAY,GAAG,KAAK,CAAC;QAErB,eAAU,GAAG,KAAK,CAAC;QACnB,WAAM,GAAG,KAAK,CAAC;QAMf,gBAAW,GAAG,KAAK,CAAC;QAOpB,oBAAe,GAAwB,2CAAmB,CAAC,IAAI,CAAC;QAS9D,IAAI,OAAO,IAAI,oBAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YACzE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;SACrC;QACD,IAAI,KAAK,YAAY,OAAO,EAAE;YAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAC5B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;YACvB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACrC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACvC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACvC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;YACnC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YAC3B,OAAO;SACR;QAED,IAAI,oBAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAE7B,MAAM,UAAU,GAAc,EAAE,CAAC;YACjC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;gBAC1B,IAAI,CAAC,oBAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,EAAE;oBAClF,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;oBAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;wBAChB,SAAS,GAAG,IAAI,CAAC;qBAClB;oBACD,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,SAAS,EAAE;wBAC1C,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;wBAC9D,eAAe,EAAE,OAAO,CAAC,eAAe;wBACxC,oBAAoB,EAAE,KAAK;wBAC3B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;qBAC7C,CAAC,CAAC;oBACH,YAAY,CAAC,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC;oBAClE,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBAC/B;qBAAM;oBACL,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE;wBACrC,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;wBAC9D,eAAe,EAAE,OAAO,CAAC,eAAe;wBACxC,oBAAoB,EAAE,KAAK;wBAC3B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;qBAC7C,CAAC,CAAC;oBACH,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBAC/B;YAEH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,MAAM,cAAc,GAAU,UAAU,CAAC,GAAG,CAAC,CAAC,WAAoB,EAAE,EAAE;gBACpE,OAAO,WAAW,CAAC,KAAK,CAAC;YAC3B,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC;YAI5B,OAAO;SACR;QACD,MAAM,0BAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC;QACtE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,2CAAmB,CAAC,IAAI,CAAC;QAGpG,IAAI,oBAAU,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE;YAC9C,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,OAAO;SACR;QAED,IAAI,oBAAU,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,oBAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC7D,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,OAAO;SACR;QAGD,IAAI,oBAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE;YAC9C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,OAAO;SACR;QAGD,IAAI,oBAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,oBAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE;YAErE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;aACpB;iBAAM;gBAEL,IAAI,OAAO,CAAC,oBAAoB,EAAE;oBAChC,IAAI,CAAC,KAAK,GAAG,oBAAU,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC;iBAChE;qBAAM;oBACL,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;iBACpB;aACF;YACD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YAEtB,OAAO;SACR;QAED,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,oEAAoE,CAAC;QAClF,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;QAGH,IAAI,IAAI,CAAC,IAAI,IAAI,UAAU,EAAE;YAC3B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9D,IAAI,CAAC,YAAY,EAAE;gBACjB,IAAI,CAAC,KAAK,GAAG,6BAA6B,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;aAC/D;iBAAM;gBACL,MAAM,wBAAwB,GAAG,gDAAsB,CAAC,gCAAgC,CAAC,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;gBACxK,IAAI,CAAC,KAAK,GAAG,2CAA2C,GAAG,wBAAwB,GAAG,iBAAiB,GAAG,YAAY,GAAG,IAAI,CAAC;aAC/H;YACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;SACxB;aAAM,IAAI,IAAI,CAAC,IAAI,IAAI,MAAM,EAAE;YAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACpB;aAAM,IAAI,IAAI,CAAC,IAAI,IAAI,YAAY,EAAE;YAEpC,IAAI,CAAC,KAAK,GAAG,qDAAwB,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YACxF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,IAAI,2CAAmB,CAAC,IAAI,CAAC;YACjE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC1B;IACH,CAAC;IAED,MAAM;QACJ,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,QAAQ;YACzB,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,UAAU,EAAE,IAAI,CAAC,QAAQ;YACzB,cAAc,EAAE,IAAI,CAAC,YAAY;YACjC,aAAa,EAAE,IAAI,CAAC,WAAW;YAC/B,OAAO,EAAE,IAAI,CAAC,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,QAAQ;QACN,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,aAAa;QACX,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,UAAU,EAAE,IAAI,CAAC,QAAQ;YACzB,cAAc,EAAE,IAAI,CAAC,YAAY;YACjC,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,YAAY,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;IACJ,CAAC;CACF;AA3MD,0BA2MC"}
|
|
@@ -6,6 +6,7 @@ const common_1 = require("../common");
|
|
|
6
6
|
class HtmlTemplate extends common_1.BaseComponent {
|
|
7
7
|
constructor(param) {
|
|
8
8
|
super(param);
|
|
9
|
+
this.type = "HtmlTemplate";
|
|
9
10
|
let obj;
|
|
10
11
|
if (typeof param === 'string') {
|
|
11
12
|
obj = utility_1.ToolHelper.convertToJsonOrDefault(param);
|
|
@@ -22,6 +23,26 @@ class HtmlTemplate extends common_1.BaseComponent {
|
|
|
22
23
|
this[key] = obj[key];
|
|
23
24
|
}
|
|
24
25
|
});
|
|
26
|
+
if (!utility_1.ToolHelper.isNullOrUndefinedOrEmpty(this.html)) {
|
|
27
|
+
const pattern = /\${([^}]+):([^}]+)}/g;
|
|
28
|
+
let myArray;
|
|
29
|
+
let originalHtml = this.html;
|
|
30
|
+
while ((myArray = pattern.exec(this.html)) !== null) {
|
|
31
|
+
if (utility_1.ToolHelper.isArray(myArray, false) && myArray.length == 3) {
|
|
32
|
+
let firstTitle = myArray[1];
|
|
33
|
+
if (utility_1.ToolHelper.isNullOrUndefinedOrEmpty(firstTitle)) {
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
firstTitle = utility_1.ToolHelper.trim(utility_1.ToolHelper.trim(firstTitle, "'"), "\"");
|
|
37
|
+
const generateComponentId = this.type + "/" + this.id + "/" + myArray[1].trim();
|
|
38
|
+
const value = utility_1.ToolHelper.trim(utility_1.ToolHelper.trim(myArray[2], "'"), "\"");
|
|
39
|
+
const originalReplaceHtml = myArray[0];
|
|
40
|
+
const replaceHtml = `{{"${generateComponentId}"|lang:lang:'${value}'}}`;
|
|
41
|
+
originalHtml = originalHtml.replace(originalReplaceHtml, replaceHtml);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
this.html = originalHtml;
|
|
45
|
+
}
|
|
25
46
|
}
|
|
26
47
|
toJSON() {
|
|
27
48
|
const result = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html_template.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/container/html_template.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,sCAA0C;AAE1C,MAAa,YAAa,SAAQ,sBAAa;IAI3C,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"html_template.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/container/html_template.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,sCAA0C;AAE1C,MAAa,YAAa,SAAQ,sBAAa;IAI3C,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAJjB,SAAI,GAAG,cAAc,CAAC;QAKlB,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,MAAM,CAAC;QACpB,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,oBAAU,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjD,MAAM,OAAO,GAAG,sBAAsB,CAAC;YAEvC,IAAI,OAAO,CAAC;YACZ,IAAI,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;YAC7B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;gBACjD,IAAI,oBAAU,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE;oBAE3D,IAAI,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBAE5B,IAAI,oBAAU,CAAC,wBAAwB,CAAC,UAAU,CAAC,EAAE;wBACjD,SAAS;qBACZ;oBACD,UAAU,GAAG,oBAAU,CAAC,IAAI,CAAC,oBAAU,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;oBACrE,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAChF,MAAM,KAAK,GAAG,oBAAU,CAAC,IAAI,CAAC,oBAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;oBACtE,MAAM,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBAEvC,MAAM,WAAW,GAAG,MAAM,mBAAmB,gBAAgB,KAAK,KAAK,CAAC;oBACxE,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;iBACzE;aACJ;YACD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;SAC5B;IAEL,CAAC;IAED,MAAM;QACF,MAAM,MAAM,GAAQ;YAChB,IAAI,EAAE,IAAI,CAAC,EAAE;YACb,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,IAAI,CAAC,IAAI;SACpB,CAAC;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;CACJ;AA/DD,oCA+DC"}
|
|
@@ -16,18 +16,22 @@ class QdpConditionDialog extends content_container_1.ContentContainer {
|
|
|
16
16
|
if (!obj) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
const keys = 'queryId,tabIndex';
|
|
19
|
+
const keys = 'queryId,tabIndex,beforeQuery';
|
|
20
20
|
Object.keys(obj).forEach(key => {
|
|
21
21
|
if (keys.includes(key)) {
|
|
22
22
|
this[key] = obj[key];
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
25
|
this.queryNameLang = "QdpConditionDialog" + utility_1.ToolHelper.replaceSpecialCharacter(this.id);
|
|
26
|
+
if (this.beforeQuery) {
|
|
27
|
+
this.beforeQueryName = "QdpConditionDialog" + utility_1.ToolHelper.tf(this.id) + "BeforeQuery";
|
|
28
|
+
}
|
|
26
29
|
}
|
|
27
30
|
toJSON() {
|
|
28
31
|
return Object.assign({}, super.toJSON(), {
|
|
29
|
-
"type": "
|
|
32
|
+
"type": "QdpConditionDialog",
|
|
30
33
|
"queryId": this.queryId,
|
|
34
|
+
"beforeQuery": this.beforeQuery,
|
|
31
35
|
"tabIndex": this.tabIndex
|
|
32
36
|
});
|
|
33
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qdp_condition_dialog.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/container/qdp_condition_dialog.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"qdp_condition_dialog.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/container/qdp_condition_dialog.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AACvD,8CAA8C;AAE9C,MAAa,kBAAmB,SAAQ,oCAAgB;IAOtD,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,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,8BAA8B,CAAC;QAC5C,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;QACH,IAAI,CAAC,aAAa,GAAG,oBAAoB,GAAG,oBAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxF,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,eAAe,GAAG,oBAAoB,GAAG,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;SACtF;IACH,CAAC;IAED,MAAM;QACJ,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,EAAE,oBAAoB;YAC5B,SAAS,EAAE,IAAI,CAAC,OAAO;YACvB,aAAa,EAAE,IAAI,CAAC,WAAW;YAC/B,UAAU,EAAE,IAAI,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AA7CD,gDA6CC"}
|
|
@@ -26,7 +26,7 @@ class QdpConditionDialogTab extends content_container_1.ContentContainer {
|
|
|
26
26
|
}
|
|
27
27
|
toJSON() {
|
|
28
28
|
return Object.assign({}, super.toJSON(), {
|
|
29
|
-
"type": "
|
|
29
|
+
"type": "QdpConditionDialogTab",
|
|
30
30
|
"queryId": this.queryId,
|
|
31
31
|
"tabIndex": this.tabIndex
|
|
32
32
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qdp_condition_dialog_tab.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/container/qdp_condition_dialog_tab.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AACvD,8CAA6C;AAE7C,MAAa,qBAAsB,SAAQ,oCAAgB;IAKzD,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,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,kBAAkB,CAAC;QAChC,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;QACH,IAAI,CAAC,aAAa,GAAG,uBAAuB,GAAG,oBAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED,MAAM;QACJ,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"qdp_condition_dialog_tab.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/container/qdp_condition_dialog_tab.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AACvD,8CAA6C;AAE7C,MAAa,qBAAsB,SAAQ,oCAAgB;IAKzD,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,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,kBAAkB,CAAC;QAChC,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;QACH,IAAI,CAAC,aAAa,GAAG,uBAAuB,GAAG,oBAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED,MAAM;QACJ,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,EAAE,uBAAuB;YAC/B,SAAS,EAAE,IAAI,CAAC,OAAO;YACvB,UAAU,EAAE,IAAI,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AAvCD,sDAuCC"}
|
|
@@ -32,7 +32,7 @@ class FarrisDataGrid extends common_1.BaseComponent {
|
|
|
32
32
|
pageIndex,total,fitColumns,autoFitColumns,fit,virtualizedAsyncLoad,multiSelect,disable,rowClass,enableCommandColumn,commandColumnWidth,onEditClicked,onDeleteClicked,showFooter,footerTemplate,footerTemplateName,footerHeight,onSelectionChange,nowrap,columnSorted,showGroupColumn,
|
|
33
33
|
showAllCheckbox,lineNumberTitle,checkedChange,beforeSelect,beforeUnSelect,beforeCheck,beforeUnCheck,disableRow,editable,lockPagination,dblClickRow,showTips,tipContent,beforeEdit,mergeCell,mergeFields,customCommandColumnTempl,showBorder,checkOnSelect,selectOnCheck, footerDataFrom,footerDataCommand,
|
|
34
34
|
enableFilterRow,remoteFilter,showFilterBar,enableSmartFilter,useControlPanel,autoHeight,AutoColumnWidthUseDblclick,checked,unChecked,rowClick,showPageSize,pageSizeChanged,showSelectedList,selectedItemFormatter,enableMorePageSelect,pageList,lineNumberWidth,headerWrap,emptyTemplate,emptyDataHeight,rowHeight,enableHighlightCell,enableEditCellStyle,checkAll,unCheckAll,
|
|
35
|
-
enableDragColumn,showRowGroupPanel,groupSummaryPosition,keepSelect,clearSelectionsWhenDataIsEmpty,filterChanged,checkValues`;
|
|
35
|
+
enableDragColumn,showRowGroupPanel,groupSummaryPosition,keepSelect,clearSelectionsWhenDataIsEmpty,filterChanged,checkValues,selectOnEditing,footerPosition,showGotoInput,scrollBarShowMode,selectionMode,disableGroupOnEditing`;
|
|
36
36
|
Object.keys(obj).forEach(key => {
|
|
37
37
|
if (keys.includes(key)) {
|
|
38
38
|
switch (key) {
|
|
@@ -137,25 +137,34 @@ class FarrisDataGrid extends common_1.BaseComponent {
|
|
|
137
137
|
}
|
|
138
138
|
break;
|
|
139
139
|
case "headerWrap":
|
|
140
|
-
this.headerWrap = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
|
|
140
|
+
this.headerWrap = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
141
141
|
break;
|
|
142
142
|
case "enableHighlightCell":
|
|
143
|
-
this.enableHighlightCell = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
|
|
143
|
+
this.enableHighlightCell = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
144
144
|
break;
|
|
145
145
|
case "multiSelect":
|
|
146
146
|
case "showCheckbox":
|
|
147
147
|
case "showAllCheckbox":
|
|
148
|
-
this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
|
|
148
|
+
this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
149
149
|
break;
|
|
150
150
|
case "enableEditCellStyle":
|
|
151
|
-
this.enableEditCellStyle = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
|
|
151
|
+
this.enableEditCellStyle = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
152
|
+
break;
|
|
153
|
+
case "selectOnEditing":
|
|
154
|
+
this.selectOnEditing = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
155
|
+
break;
|
|
156
|
+
case "showGotoInput":
|
|
157
|
+
this.showGotoInput = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
152
158
|
break;
|
|
153
159
|
case "enableDragColumn":
|
|
154
160
|
case "showRowGroupPanel":
|
|
155
161
|
case "keepSelect":
|
|
156
162
|
case "checkValues":
|
|
157
163
|
case "clearSelectionsWhenDataIsEmpty":
|
|
158
|
-
this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
|
|
164
|
+
this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
|
|
165
|
+
break;
|
|
166
|
+
case "disableGroupOnEditing":
|
|
167
|
+
this.disableGroupOnEditing = utility_1.ToolHelper.createBinding(obj[key], true, this.externalComponentNameSpace, this.id);
|
|
159
168
|
break;
|
|
160
169
|
default:
|
|
161
170
|
if (obj[key] || obj[key] == false) {
|
|
@@ -166,13 +175,13 @@ class FarrisDataGrid extends common_1.BaseComponent {
|
|
|
166
175
|
}
|
|
167
176
|
});
|
|
168
177
|
if (utility_1.ToolHelper.isNullOrUndefined(this.multiSelect)) {
|
|
169
|
-
this.multiSelect = utility_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace);
|
|
178
|
+
this.multiSelect = utility_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace, this.id);
|
|
170
179
|
}
|
|
171
180
|
if (utility_1.ToolHelper.isNullOrUndefined(this.showCheckbox)) {
|
|
172
|
-
this.showCheckbox = utility_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace);
|
|
181
|
+
this.showCheckbox = utility_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace, this.id);
|
|
173
182
|
}
|
|
174
183
|
if (utility_1.ToolHelper.isNullOrUndefined(this.showAllCheckbox)) {
|
|
175
|
-
this.showAllCheckbox = utility_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace);
|
|
184
|
+
this.showAllCheckbox = utility_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace, this.id);
|
|
176
185
|
}
|
|
177
186
|
if (this.rowStyler) {
|
|
178
187
|
this.rowStylerName = utility_1.ComponentFarrisDataGridCreator.createRowStyleName(this.id);
|
|
@@ -275,10 +284,10 @@ class FarrisDataGrid extends common_1.BaseComponent {
|
|
|
275
284
|
this.selectedItemFormatterName = utility_1.ComponentFarrisDataGridCreator.createSelectedItemFormatterName(this.id);
|
|
276
285
|
}
|
|
277
286
|
if (this.enableHeaderGroup && utility_1.ToolHelper.isArray(this.headerGroup, false)) {
|
|
278
|
-
this.enableDragColumn = utility_1.ToolHelper.createBinding(false, false, this.externalComponentNameSpace);
|
|
287
|
+
this.enableDragColumn = utility_1.ToolHelper.createBinding(false, false, this.externalComponentNameSpace, this.id);
|
|
279
288
|
}
|
|
280
289
|
if (!this.groupable) {
|
|
281
|
-
this.showRowGroupPanel = utility_1.ToolHelper.createBinding(false, false, this.externalComponentNameSpace);
|
|
290
|
+
this.showRowGroupPanel = utility_1.ToolHelper.createBinding(false, false, this.externalComponentNameSpace, this.id);
|
|
282
291
|
}
|
|
283
292
|
this.elementId = utility_1.ComponentFarrisDataGridCreator.createElementId(this.id);
|
|
284
293
|
}
|