aldehyde 0.1.34 → 0.1.37
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/lib/controls/counting-tag/index.d.ts +18 -0
- package/lib/controls/counting-tag/index.d.ts.map +1 -0
- package/lib/controls/counting-tag/index.js +31 -0
- package/lib/controls/counting-tag/index.js.map +1 -0
- package/lib/controls/entity-select/entity-select.d.ts.map +1 -1
- package/lib/controls/entity-select/entity-select.js +6 -6
- package/lib/controls/entity-select/entity-select.js.map +1 -1
- package/lib/controls/entity-select/popover-entity-select.d.ts +3 -3
- package/lib/controls/entity-select/popover-entity-select.d.ts.map +1 -1
- package/lib/controls/entity-select/popover-entity-select.js +4 -4
- package/lib/controls/entity-select/popover-entity-select.js.map +1 -1
- package/lib/controls/entry-control.d.ts +1 -0
- package/lib/controls/entry-control.d.ts.map +1 -1
- package/lib/controls/entry-control.js +23 -6
- package/lib/controls/entry-control.js.map +1 -1
- package/lib/controls/rfield/index.js +1 -1
- package/lib/controls/rfield/index.js.map +1 -1
- package/lib/controls/view-control.d.ts.map +1 -1
- package/lib/controls/view-control.js +1 -0
- package/lib/controls/view-control.js.map +1 -1
- package/lib/detail/edit/dtmpl-edit.js +2 -2
- package/lib/detail/edit/dtmpl-edit.js.map +1 -1
- package/lib/detail/edit/row-editor.d.ts +2 -0
- package/lib/detail/edit/row-editor.d.ts.map +1 -1
- package/lib/detail/edit/row-editor.js +4 -3
- package/lib/detail/edit/row-editor.js.map +1 -1
- package/lib/detail/view/act-dtmpl-view.js +1 -1
- package/lib/detail/view/act-dtmpl-view.js.map +1 -1
- package/lib/detail/view/dtmpl-view.js +1 -1
- package/lib/detail/view/dtmpl-view.js.map +1 -1
- package/lib/form/criteria-form.d.ts +1 -0
- package/lib/form/criteria-form.d.ts.map +1 -1
- package/lib/form/criteria-form.js +1 -1
- package/lib/form/criteria-form.js.map +1 -1
- package/lib/form/dtmpl-form.d.ts.map +1 -1
- package/lib/form/dtmpl-form.js +5 -6
- package/lib/form/dtmpl-form.js.map +1 -1
- package/lib/form/form-Item-group.d.ts +1 -0
- package/lib/form/form-Item-group.d.ts.map +1 -1
- package/lib/form/form-Item-group.js +3 -3
- package/lib/form/form-Item-group.js.map +1 -1
- package/lib/layout/menu/menu-2layers.d.ts.map +1 -1
- package/lib/layout/menu/menu-2layers.js +38 -21
- package/lib/layout/menu/menu-2layers.js.map +1 -1
- package/lib/layout/menu/menu-render.d.ts +1 -0
- package/lib/layout/menu/menu-render.d.ts.map +1 -1
- package/lib/layout/menu/menu-render.js +28 -1
- package/lib/layout/menu/menu-render.js.map +1 -1
- package/lib/routable/dtmpl-route.d.ts +10 -0
- package/lib/routable/dtmpl-route.d.ts.map +1 -1
- package/lib/routable/dtmpl-route.js +56 -4
- package/lib/routable/dtmpl-route.js.map +1 -1
- package/lib/table/modal-select-table.d.ts +1 -0
- package/lib/table/modal-select-table.d.ts.map +1 -1
- package/lib/table/modal-select-table.js +2 -2
- package/lib/table/modal-select-table.js.map +1 -1
- package/lib/table/relation-table.d.ts +1 -0
- package/lib/table/relation-table.d.ts.map +1 -1
- package/lib/table/relation-table.js +23 -53
- package/lib/table/relation-table.js.map +1 -1
- package/lib/table/select-table.d.ts +1 -0
- package/lib/table/select-table.d.ts.map +1 -1
- package/lib/table/select-table.js +2 -1
- package/lib/table/select-table.js.map +1 -1
- package/lib/tmpl/control-type-supportor.d.ts.map +1 -1
- package/lib/tmpl/control-type-supportor.js +1 -0
- package/lib/tmpl/control-type-supportor.js.map +1 -1
- package/lib/tmpl/hc-data-source.d.ts +1 -0
- package/lib/tmpl/hc-data-source.d.ts.map +1 -1
- package/lib/tmpl/hc-data-source.js +12 -0
- package/lib/tmpl/hc-data-source.js.map +1 -1
- package/lib/tmpl/hcservice-v3.d.ts +3 -0
- package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
- package/lib/tmpl/hcservice-v3.js +23 -3
- package/lib/tmpl/hcservice-v3.js.map +1 -1
- package/lib/tmpl/interface.d.ts +5 -1
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/counting-tag/index.tsx +45 -0
- package/src/aldehyde/controls/entity-select/entity-select.tsx +6 -5
- package/src/aldehyde/controls/entity-select/popover-entity-select.tsx +5 -5
- package/src/aldehyde/controls/entry-control.tsx +14 -6
- package/src/aldehyde/controls/rfield/index.tsx +1 -1
- package/src/aldehyde/controls/view-control.tsx +1 -0
- package/src/aldehyde/detail/edit/dtmpl-edit.tsx +2 -2
- package/src/aldehyde/detail/edit/row-editor.tsx +5 -2
- package/src/aldehyde/detail/view/act-dtmpl-view.tsx +1 -1
- package/src/aldehyde/detail/view/dtmpl-view.tsx +1 -1
- package/src/aldehyde/form/criteria-form.tsx +3 -1
- package/src/aldehyde/form/dtmpl-form.tsx +4 -4
- package/src/aldehyde/form/form-Item-group.tsx +4 -3
- package/src/aldehyde/layout/menu/menu-2layers.tsx +43 -25
- package/src/aldehyde/layout/menu/menu-render.tsx +33 -1
- package/src/aldehyde/routable/dtmpl-route.tsx +50 -7
- package/src/aldehyde/table/modal-select-table.tsx +3 -2
- package/src/aldehyde/table/relation-table.tsx +27 -54
- package/src/aldehyde/table/select-table.tsx +3 -1
- package/src/aldehyde/tmpl/control-type-supportor.tsx +1 -0
- package/src/aldehyde/tmpl/hc-data-source.tsx +12 -1
- package/src/aldehyde/tmpl/hcservice-v3.tsx +21 -4
- package/src/aldehyde/tmpl/interface.tsx +6 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/view/dtmpl-view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,cAAc,MAAM,oBAAoB,CAAC;AAChD,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,cAAc,CAAC;AAEtB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,YAAY,MAAM,8BAA8B,CAAC;AACxD,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAMzD,CAAC;AAQD,CAAC;AAEF,MAAM,SAAU,SAAQ,KAAK,CAAC,aAA4C;IAA1E;;QAKI,UAAK,GAAG;YACJ,OAAO,EAAE,IAAI;YACb,EAAE,EAAC,WAAW,GAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;YACpC,eAAe,EAAE,KAAK;YACtB,SAAS,EAAE,SAAS;YACpB,aAAa,EAAE,MAAM;YACrB,MAAM,EAAE;gBACJ,QAAQ,EAAE,EAAC,IAAI,EAAE,CAAC,EAAC;gBACnB,UAAU,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC;aACzB;SACJ,CAAA;QAcD,aAAQ,GAAG,GAAS,EAAE;YAClB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAChD,IAAI,IAAI,EAAE;gBACN,IAAI,CAAC,QAAQ,CAAC;oBACV,OAAO,EAAE,IAAI;iBAChB,CAAC,CAAA;gBACF,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"dtmpl-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/view/dtmpl-view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criteria-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAiB,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAQpG,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAC,SAAS,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,MAAM,KAAA,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IACjE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"criteria-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAiB,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAQpG,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAC,SAAS,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,MAAM,KAAA,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IACjE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAC,MAAM,CAAC;CACpB;AAED,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkN7C,CAAA;AAKD,eAAe,YAAY,CAAC"}
|
|
@@ -127,7 +127,7 @@ const CriteriaForm = (props) => {
|
|
|
127
127
|
return React.createElement(FormItem, { label: item.title, name: formItemName, key: item.id, tooltip: item.tip, rules: item.required ? [{
|
|
128
128
|
required: true, message: `请选择${item.title}`,
|
|
129
129
|
}] : undefined },
|
|
130
|
-
React.createElement(EntryControl, { value: fieldValue, fieldConfig: item }));
|
|
130
|
+
React.createElement(EntryControl, { mainCode: props.mainCode, value: fieldValue, fieldConfig: item }));
|
|
131
131
|
}
|
|
132
132
|
});
|
|
133
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criteria-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AACvC,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,IAAI,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,MAAM,CAAC;AAEnG,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,YAAY,MAAM,kCAAkC,CAAA;AAE3D,MAAM,EAAC,KAAK,EAAC,GAAG,QAAQ,CAAC;AACzB,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"criteria-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/dtmpl-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAA;AAEtC,OAAO,EAAC,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAG3F,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAIzD,OAAO,kBAAkB,CAAC;AAG1B,MAAM,WAAW,cAAe,SAAQ,cAAc;IAClD,QAAQ,EAAC,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAC,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;IAChC,cAAc,CAAC,EAAC,MAAI,IAAI,CAAC;CAC5B;AAED,UAAU,aAAa;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;CAExB;
|
|
1
|
+
{"version":3,"file":"dtmpl-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/dtmpl-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAA;AAEtC,OAAO,EAAC,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAG3F,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAIzD,OAAO,kBAAkB,CAAC;AAG1B,MAAM,WAAW,cAAe,SAAQ,cAAc;IAClD,QAAQ,EAAC,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAC,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;IAChC,cAAc,CAAC,EAAC,MAAI,IAAI,CAAC;CAC5B;AAED,UAAU,aAAa;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;CAExB;AAGD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,aAAa,CAAC;IAChF,QAAQ,EAAE,OAAO,CAAS;IAC1B,aAAa,EAAE,MAAM,CAAU;IAE/B,KAAK;;;MAIJ;IACD,MAAM,CAAC,YAAY;;MAElB;IAEK,iBAAiB;IAIjB,kBAAkB,CAAC,QAAQ,KAAA;IAejC,QAAQ,sBA0BP;IAED,SAAS,sBAGR;IAED,aAAa,qBAAsB,gBAAgB,gBAAgB,SAAS,EAAE,UAS7E;IAGD,cAAc,yBAEb;IAED,QAAQ,iCAiBP;IAED,QAAQ,WAAkB,GAAG,mBA6C5B;IAGD,cAAc,sBAoCb;IAED,MAAM;CAyDT"}
|
package/lib/form/dtmpl-form.js
CHANGED
|
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import React from 'react';
|
|
11
|
-
import { Button, Card, Form as AntdForm, message,
|
|
11
|
+
import { Button, Card, Form as AntdForm, message, Switch } from 'antd';
|
|
12
12
|
import HcserviceV3 from "../tmpl/hcservice-v3";
|
|
13
13
|
import FormItemGroup from "./form-Item-group";
|
|
14
14
|
import { ReloadOutlined } from '@ant-design/icons';
|
|
@@ -18,7 +18,6 @@ import './dtmpl-form.css';
|
|
|
18
18
|
import CollapseCard from "../controls/collapse-card";
|
|
19
19
|
;
|
|
20
20
|
;
|
|
21
|
-
const confirm = Modal.confirm;
|
|
22
21
|
export default class Form extends React.PureComponent {
|
|
23
22
|
constructor() {
|
|
24
23
|
super(...arguments);
|
|
@@ -141,7 +140,7 @@ export default class Form extends React.PureComponent {
|
|
|
141
140
|
// }
|
|
142
141
|
});
|
|
143
142
|
this.fieldGroupList = () => {
|
|
144
|
-
const { dtmplConfig, parentId, maxColsOnRow } = this.props;
|
|
143
|
+
const { dtmplConfig, parentId, maxColsOnRow, mainCode } = this.props;
|
|
145
144
|
const { dtmplData, loading } = this.state;
|
|
146
145
|
let groups;
|
|
147
146
|
if (dtmplConfig) {
|
|
@@ -154,12 +153,12 @@ export default class Form extends React.PureComponent {
|
|
|
154
153
|
if (dtmplData) {
|
|
155
154
|
data = dtmplData.arrayMap[item.id];
|
|
156
155
|
}
|
|
157
|
-
return React.createElement(RelationTable, { loading: loading, parentId: parentId, key: item.id, fieldGroupConfig: item, value: data, viewOrEdit: "edit", onChange: this.onGroupChange });
|
|
156
|
+
return React.createElement(RelationTable, { mainCode: mainCode, loading: loading, parentId: parentId, key: item.id, fieldGroupConfig: item, value: data, viewOrEdit: "edit", onChange: this.onGroupChange });
|
|
158
157
|
}
|
|
159
158
|
}
|
|
160
159
|
else { //字段组
|
|
161
|
-
return React.createElement(CollapseCard, { title: item.title, key: item.id, id: parentId + item.id, className: "hoverable", headStyle: { background: "#f2f4f5" }, loading: loading },
|
|
162
|
-
React.createElement(FormItemGroup, { maxColsOnRow: maxColsOnRow, fields: item ? item.fields : undefined, valueMap: dtmplData ? dtmplData.fieldMap : undefined }));
|
|
160
|
+
return React.createElement(CollapseCard, { title: item.title, key: item.id, id: parentId + item.id, className: "hoverable", headStyle: { background: "#f2f4f5" }, loading: loading, bodyStyle: { padding: '6px' } },
|
|
161
|
+
React.createElement(FormItemGroup, { mainCode: mainCode, maxColsOnRow: maxColsOnRow, fields: item ? item.fields : undefined, valueMap: dtmplData ? dtmplData.fieldMap : undefined }));
|
|
163
162
|
}
|
|
164
163
|
});
|
|
165
164
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/dtmpl-form.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAkB,MAAM,OAAO,CAAA;AACtC,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,QAAQ,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"dtmpl-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/dtmpl-form.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-Item-group.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAC,WAAW,EAAmB,MAAM,mBAAmB,CAAC;AAQhE,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"form-Item-group.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAC,WAAW,EAAmB,MAAM,mBAAmB,CAAC;AAQhE,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAC,MAAM,CAAC;CACpB;AAED,UAAU,eAAe;IACrB,QAAQ,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAE5F,MAAM,CAAC,YAAY;;;MAGlB;gBAEW,KAAK,KAAA;IAOjB,YAAY,oBA2DX;IAED,MAAM;CAKT"}
|
|
@@ -10,7 +10,7 @@ export default class FormItemGroup extends React.PureComponent {
|
|
|
10
10
|
constructor(props) {
|
|
11
11
|
super(props);
|
|
12
12
|
this.initFormList = () => {
|
|
13
|
-
const { fields, valueMap, nameAttr, maxColsOnRow } = this.props;
|
|
13
|
+
const { fields, valueMap, nameAttr, maxColsOnRow, mainCode } = this.props;
|
|
14
14
|
const formItemList = [];
|
|
15
15
|
if (fields && fields.length > 0) {
|
|
16
16
|
fields.forEach((item, index) => {
|
|
@@ -23,13 +23,13 @@ export default class FormItemGroup extends React.PureComponent {
|
|
|
23
23
|
let formItem = null;
|
|
24
24
|
if (item.extControlType == 'hidden') {
|
|
25
25
|
formItem = React.createElement(FormItem, { hidden: true, initialValue: fieldValue, name: item[nameAttr], key: item.id },
|
|
26
|
-
React.createElement(EntryControl, { value: fieldValue, fieldConfig: item }));
|
|
26
|
+
React.createElement(EntryControl, { mainCode: mainCode, value: fieldValue, fieldConfig: item }));
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
29
|
formItem = React.createElement(FormItem, { label: item.title, name: item[nameAttr], key: item.id, labelCol: maxColsOnRow == 1 ? { span: 6 } : item.colNum == 1 ? { span: 6 } : { span: 3 }, wrapperCol: maxColsOnRow == 1 ? { span: 18 } : item.colNum == 1 ? { span: 15 } : { span: 19 }, tooltip: item.tip, initialValue: fieldValue, style: { margin: 4 }, rules: item.required ? [{
|
|
30
30
|
required: true, message: `请选择${title}`,
|
|
31
31
|
}] : undefined },
|
|
32
|
-
React.createElement(EntryControl, { value: fieldValue, fieldConfig: item }));
|
|
32
|
+
React.createElement(EntryControl, { mainCode: mainCode, value: fieldValue, fieldConfig: item }));
|
|
33
33
|
}
|
|
34
34
|
formItemList.push(formItem);
|
|
35
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-Item-group.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAC,MAAM,MAAM,CAAA;AACnC,OAAO,qBAAqB,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,MAAM,UAAU,CAAA;AAI5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"form-Item-group.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";AAqGA,wBAAuC"}
|
|
@@ -28,40 +28,57 @@ class Menu2layers extends React.PureComponent {
|
|
|
28
28
|
openKeys: [],
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
//
|
|
33
|
-
// }
|
|
34
|
-
componentDidUpdate(prevProps) {
|
|
31
|
+
componentDidMount() {
|
|
35
32
|
const { currentL2MenuId, blockMenu, collapsed } = this.props;
|
|
36
|
-
let { currentL2MenuId: preMenuId } = prevProps;
|
|
37
33
|
const { openKeys } = this.state;
|
|
38
|
-
// if(collapsed){
|
|
39
|
-
// if(openKeys.length>0){
|
|
40
|
-
// this.setState({
|
|
41
|
-
// openKeys:[]
|
|
42
|
-
// })
|
|
43
|
-
// }
|
|
44
|
-
// }else{
|
|
45
34
|
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
|
|
46
35
|
if (openKey && openKeys.length < 1) {
|
|
47
36
|
this.setState({
|
|
48
37
|
openKeys: [openKey.toString()]
|
|
49
38
|
});
|
|
50
39
|
}
|
|
51
|
-
|
|
52
|
-
|
|
40
|
+
}
|
|
41
|
+
componentDidUpdate(prevProps) {
|
|
42
|
+
const { currentL2MenuId, blockMenu, collapsed } = this.props;
|
|
43
|
+
let { currentL2MenuId: preMenuId, blockMenu: preBlockMenu } = prevProps;
|
|
44
|
+
const { openKeys } = this.state;
|
|
45
|
+
if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
|
|
46
|
+
//console.log('currentL2MenuId:',currentL2MenuId);
|
|
47
|
+
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
|
|
53
48
|
if (openKey) {
|
|
54
|
-
if (openKeys.length == 1) {
|
|
55
|
-
openKeys.push(openKey.toString());
|
|
56
|
-
if (openKeys && openKeys.length > 1) {
|
|
57
|
-
openKeys.splice(0, 1);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
49
|
this.setState({
|
|
61
|
-
openKeys,
|
|
50
|
+
openKeys: [openKey],
|
|
62
51
|
});
|
|
63
52
|
}
|
|
64
53
|
}
|
|
54
|
+
else {
|
|
55
|
+
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
|
|
56
|
+
let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId) : undefined;
|
|
57
|
+
if (openKey && openKey != preOpenKey) {
|
|
58
|
+
this.setState({
|
|
59
|
+
openKeys: [openKey],
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
// let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
|
|
64
|
+
// if(openKey && openKeys.length<1){
|
|
65
|
+
// this.setState({
|
|
66
|
+
// openKeys:[openKey.toString()]
|
|
67
|
+
// })
|
|
68
|
+
// }else if(preMenuId!=currentL2MenuId){
|
|
69
|
+
// console.log('currentL2MenuId:',currentL2MenuId);
|
|
70
|
+
// if (openKey) {
|
|
71
|
+
// if(openKeys.length==1){
|
|
72
|
+
// openKeys.push(openKey.toString())
|
|
73
|
+
// if (openKeys && openKeys.length > 1) {
|
|
74
|
+
// openKeys.splice(0, 1);
|
|
75
|
+
// }
|
|
76
|
+
// }
|
|
77
|
+
// this.setState({
|
|
78
|
+
// openKeys,
|
|
79
|
+
// })
|
|
80
|
+
// }
|
|
81
|
+
// }
|
|
65
82
|
//}
|
|
66
83
|
}
|
|
67
84
|
render() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAE1B,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAM5C,MAAM,WAAY,SAAQ,KAAK,CAAC,aAAiD;IAG7E,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Level1Menu, Level2Menu } from "../../tmpl/interface";
|
|
2
2
|
declare const _default: {
|
|
3
3
|
renderL1Menu(menus: Level1Menu[], target: any, basePath?: string): JSX.Element[];
|
|
4
|
+
getRoutePath(menu: Level2Menu, basePath: any, defaultCriteriaData: any): string;
|
|
4
5
|
renderL2Menu(menus: Level2Menu[], target: any, basePath?: string): JSX.Element[];
|
|
5
6
|
findOpenId(l1Menus: Level1Menu[], currentL2MenuId: string): string;
|
|
6
7
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;;wBAQrC,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;;wBAQrC,UAAU,EAAE;uBASb,UAAU;wBA8BT,UAAU,EAAE;wBAqBZ,UAAU,EAAE,mBAAiB,MAAM;;AA7D1D,wBAyEC"}
|
|
@@ -11,6 +11,32 @@ export default {
|
|
|
11
11
|
}
|
|
12
12
|
});
|
|
13
13
|
},
|
|
14
|
+
getRoutePath(menu, basePath, defaultCriteriaData) {
|
|
15
|
+
if (menu) {
|
|
16
|
+
let pageType = menu.pageType;
|
|
17
|
+
let routePath = 'act-table';
|
|
18
|
+
let codeSource = '';
|
|
19
|
+
switch (pageType) {
|
|
20
|
+
case "列表":
|
|
21
|
+
routePath = 'act-table';
|
|
22
|
+
break;
|
|
23
|
+
case "添加":
|
|
24
|
+
routePath = 'detail-edit';
|
|
25
|
+
codeSource = '&codeSource=new';
|
|
26
|
+
break;
|
|
27
|
+
case "编辑":
|
|
28
|
+
routePath = 'detail-edit';
|
|
29
|
+
codeSource = '&codeSource=listTop';
|
|
30
|
+
break;
|
|
31
|
+
case "详情":
|
|
32
|
+
routePath = 'detail-view';
|
|
33
|
+
codeSource = '&codeSource=listTop';
|
|
34
|
+
break;
|
|
35
|
+
}
|
|
36
|
+
return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
|
|
37
|
+
}
|
|
38
|
+
return null;
|
|
39
|
+
},
|
|
14
40
|
renderL2Menu(menus, target, basePath = "") {
|
|
15
41
|
return menus.map((item) => {
|
|
16
42
|
let delimiter = "/";
|
|
@@ -24,8 +50,9 @@ export default {
|
|
|
24
50
|
if (item.defaultCriteriaValue) {
|
|
25
51
|
defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
|
|
26
52
|
}
|
|
53
|
+
let path = customPath ? `${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
|
|
27
54
|
return React.createElement(Menu.Item, { key: item.id },
|
|
28
|
-
React.createElement(NavLink, { to:
|
|
55
|
+
React.createElement(NavLink, { to: path, target: target }, item.title));
|
|
29
56
|
});
|
|
30
57
|
},
|
|
31
58
|
findOpenId(l1Menus, currentL2MenuId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,MAAM,EAAC,OAAO,EAAC,GAAG,IAAI,CAAC;AAEvB,eAAe;IACX,YAAY,CAAC,KAAkB,EAAC,MAAM,EAAC,QAAQ,GAAC,EAAE;QAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAO,oBAAC,OAAO,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,IAC1C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAC,MAAM,EAAC,QAAQ,CAAC,CAC1C,CAAA;aACb;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IACD,YAAY,CAAC,KAAkB,EAAC,MAAM,EAAC,QAAQ,GAAC,EAAE;QAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,SAAS,GAAC,GAAG,CAAC;YAClB,IAAI,UAAU,GAAC,IAAI,CAAC,UAAU,CAAC;YAC/B,IAAG,UAAU,EAAC;gBACV,IAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC;oBACzD,SAAS,GAAC,EAAE,CAAC;iBAChB;aACJ;YACD,IAAI,mBAAmB,GAAC,EAAE,CAAC;YAC3B,IAAG,IAAI,CAAC,oBAAoB,EAAC;gBACzB,mBAAmB,GAAC,GAAG,GAAE,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aACnF;YAED,
|
|
1
|
+
{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,22 @@ import { RouterCompProps } from '../tmpl/interface';
|
|
|
3
3
|
export interface DtmplRouteProps extends RouterCompProps {
|
|
4
4
|
}
|
|
5
5
|
export interface DtmplRoutePropsStat {
|
|
6
|
+
codeSource: 'new' | 'listTop' | undefined;
|
|
7
|
+
queriedCode: string;
|
|
6
8
|
}
|
|
7
9
|
declare class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsStat> {
|
|
10
|
+
state: {
|
|
11
|
+
codeSource: any;
|
|
12
|
+
queriedCode: any;
|
|
13
|
+
};
|
|
8
14
|
static defaultProps: {
|
|
9
15
|
basePath: string;
|
|
16
|
+
codeSource: any;
|
|
17
|
+
queriedCode: any;
|
|
10
18
|
};
|
|
19
|
+
componentDidMount(): Promise<void>;
|
|
11
20
|
getMenuId: () => string;
|
|
21
|
+
getCodeSource: () => any;
|
|
12
22
|
goBackToLtmpl: () => void;
|
|
13
23
|
goDtmpl: (code: string) => void;
|
|
14
24
|
getMainCode: () => any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAQ,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"dtmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAQ,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAOnD,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAC,KAAK,GAAC,SAAS,GAAC,SAAS,CAAC;IACrC,WAAW,EAAC,MAAM,CAAC;CACtB;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC9E,KAAK;;;MAGJ;IACD,MAAM,CAAE,YAAY;;;;MAInB;IACK,iBAAiB;IAiBvB,SAAS,eAMR;IAED,aAAa,YAQZ;IAED,aAAa,aASZ;IAED,OAAO,SAAO,MAAM,UAYnB;IAED,WAAW,YASV;IAED,OAAO,YAUN;IAED,OAAO,YAIN;IAED,MAAM;CAqBT;AAED,eAAe,UAAU,CAAC"}
|
|
@@ -1,12 +1,26 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
1
10
|
import React from 'react';
|
|
2
11
|
import Units from "../units";
|
|
3
12
|
import DtmplEdit from "../detail/edit/dtmpl-edit";
|
|
4
13
|
import ActDtmplView from '../detail/view/act-dtmpl-view';
|
|
14
|
+
import HcserviceV3 from "../tmpl/hcservice-v3";
|
|
5
15
|
;
|
|
6
16
|
;
|
|
7
17
|
class DtmplRoute extends React.PureComponent {
|
|
8
18
|
constructor() {
|
|
9
19
|
super(...arguments);
|
|
20
|
+
this.state = {
|
|
21
|
+
codeSource: undefined,
|
|
22
|
+
queriedCode: undefined,
|
|
23
|
+
};
|
|
10
24
|
this.getMenuId = () => {
|
|
11
25
|
const { location } = this.props;
|
|
12
26
|
console.log("this.props.match.params", this.props);
|
|
@@ -14,6 +28,16 @@ class DtmplRoute extends React.PureComponent {
|
|
|
14
28
|
let menuId = searchParams.get('menuId');
|
|
15
29
|
return menuId;
|
|
16
30
|
};
|
|
31
|
+
this.getCodeSource = () => {
|
|
32
|
+
const { location } = this.props;
|
|
33
|
+
let params = Units.transQueryStrToParams(location.search);
|
|
34
|
+
if ('codeSource' in params) {
|
|
35
|
+
return params['codeSource'];
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
};
|
|
17
41
|
this.goBackToLtmpl = () => {
|
|
18
42
|
const { sourceId, } = this.props.match.params;
|
|
19
43
|
const { basePath } = this.props;
|
|
@@ -48,9 +72,16 @@ class DtmplRoute extends React.PureComponent {
|
|
|
48
72
|
}
|
|
49
73
|
};
|
|
50
74
|
this.getCode = () => {
|
|
75
|
+
const { codeSource, queriedCode } = this.state;
|
|
51
76
|
const { location } = this.props;
|
|
52
|
-
let
|
|
53
|
-
|
|
77
|
+
//let code;
|
|
78
|
+
if (codeSource == 'listTop') {
|
|
79
|
+
return queriedCode;
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
let params = Units.transQueryStrToParams(location.search);
|
|
83
|
+
return params['code'];
|
|
84
|
+
}
|
|
54
85
|
};
|
|
55
86
|
this.getMode = () => {
|
|
56
87
|
const { location } = this.props;
|
|
@@ -58,10 +89,29 @@ class DtmplRoute extends React.PureComponent {
|
|
|
58
89
|
return this.getCode() ? params['mode'] : "add";
|
|
59
90
|
};
|
|
60
91
|
}
|
|
92
|
+
componentDidMount() {
|
|
93
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
94
|
+
const { location, match } = this.props;
|
|
95
|
+
const { sourceId, } = match.params;
|
|
96
|
+
let codeSource = this.getCodeSource();
|
|
97
|
+
let queriedCode = undefined;
|
|
98
|
+
if (codeSource && codeSource == 'listTop') {
|
|
99
|
+
//查询
|
|
100
|
+
let data = yield HcserviceV3.requestMstrucLtmplQueryTop(sourceId, { top: 1 });
|
|
101
|
+
if (data && data.entities && data.entities[0]) {
|
|
102
|
+
queriedCode = data.entities[0].code;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
this.setState({
|
|
106
|
+
codeSource, queriedCode
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
}
|
|
61
110
|
render() {
|
|
62
111
|
const { location, match } = this.props;
|
|
63
112
|
const { sourceId, } = match.params;
|
|
64
|
-
|
|
113
|
+
const { codeSource } = this.state;
|
|
114
|
+
console.log("this.props.match.params", match);
|
|
65
115
|
if (!location) {
|
|
66
116
|
return React.createElement(React.Fragment, null);
|
|
67
117
|
}
|
|
@@ -71,12 +121,14 @@ class DtmplRoute extends React.PureComponent {
|
|
|
71
121
|
return (React.createElement(ActDtmplView, { goDtmpl: this.goDtmpl, sourceId: sourceId, versionId: versionId, code: this.getCode(), mainCode: this.getMainCode() }));
|
|
72
122
|
}
|
|
73
123
|
else {
|
|
74
|
-
return (React.createElement(DtmplEdit, { addOrUpdate: this.getMode(), sourceId: sourceId, code: this.getCode(), mainCode: this.getMainCode(), goBackToLtmpl: this.goBackToLtmpl, goDtmpl: this.goDtmpl }));
|
|
124
|
+
return (React.createElement(DtmplEdit, { addOrUpdate: this.getMode(), sourceId: sourceId, code: this.getCode(), mainCode: this.getMainCode(), goBackToLtmpl: codeSource ? undefined : this.goBackToLtmpl, goDtmpl: this.goDtmpl }));
|
|
75
125
|
}
|
|
76
126
|
}
|
|
77
127
|
}
|
|
78
128
|
DtmplRoute.defaultProps = {
|
|
79
129
|
basePath: "",
|
|
130
|
+
codeSource: undefined,
|
|
131
|
+
queriedCode: undefined,
|
|
80
132
|
};
|
|
81
133
|
export default DtmplRoute;
|
|
82
134
|
//# sourceMappingURL=dtmpl-route.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,SAAS,MAAM,2BAA2B,CAAC;AAClD,OAAO,YAAY,MAAM,+BAA+B,
|
|
1
|
+
{"version":3,"file":"dtmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal-select-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/modal-select-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,aAAa,CAAA;AACpB,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAa,MAAM,mBAAmB,CAAC;AAU7F,UAAU,qBAAqB;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,IAAI,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAC/C;AAED,UAAU,oBAAoB;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,WAAW,EAAE,CAAC;CAC/B;AAED,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAC3F,KAAK;;;;;;;;MAQJ;IAED,QAAQ,iBAAwB,YAAY,gBAAgB,MAAM,mBAsBjE;IAEK,iBAAiB;IAOvB,UAAU,8BA4CT;IAEK,kBAAkB,CAAC,SAAS,KAAA;IAelC,QAAQ,kCAIP;IAED,QAAQ,aAMP;IAED,YAAY,aAOX;IAED,kBAAkB,kBAAmB,WAAW,EAAE,kBAAgB,SAAS,EAAE,eAAe,MAAM,EAAE,UA6CnG;IAGD,MAAM;CAwCT;AAED,eAAe,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"modal-select-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/modal-select-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,aAAa,CAAA;AACpB,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAa,MAAM,mBAAmB,CAAC;AAU7F,UAAU,qBAAqB;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAC,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,IAAI,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAC/C;AAED,UAAU,oBAAoB;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,WAAW,EAAE,CAAC;CAC/B;AAED,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAC3F,KAAK;;;;;;;;MAQJ;IAED,QAAQ,iBAAwB,YAAY,gBAAgB,MAAM,mBAsBjE;IAEK,iBAAiB;IAOvB,UAAU,8BA4CT;IAEK,kBAAkB,CAAC,SAAS,KAAA;IAelC,QAAQ,kCAIP;IAED,QAAQ,aAMP;IAED,YAAY,aAOX;IAED,kBAAkB,kBAAmB,WAAW,EAAE,kBAAgB,SAAS,EAAE,eAAe,MAAM,EAAE,UA6CnG;IAGD,MAAM;CAwCT;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -42,10 +42,10 @@ class ModelSelectTable extends React.PureComponent {
|
|
|
42
42
|
pageSize: defaultPageSize ? defaultPageSize : 10,
|
|
43
43
|
virtualEndPageNo: undefined,
|
|
44
44
|
};
|
|
45
|
-
const { sourceId, exceptCodes } = this.props;
|
|
45
|
+
const { sourceId, exceptCodes, mainCode } = this.props;
|
|
46
46
|
/** 构建 dataSource **/
|
|
47
47
|
//构建过滤条件
|
|
48
|
-
let queryKey = yield HcserviceV3.requestLtmplQueryKey(sourceId, Object.assign(Object.assign({ exceptCodes }, criteriaData), pageInfo));
|
|
48
|
+
let queryKey = yield HcserviceV3.requestLtmplQueryKey(sourceId, Object.assign(Object.assign(Object.assign({ exceptCodes }, criteriaData), pageInfo), { mainCode }));
|
|
49
49
|
this.setState({
|
|
50
50
|
queryKey,
|
|
51
51
|
criteriaData,
|