aldehyde 0.2.101 → 0.2.102
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/file-view/index.d.ts.map +1 -1
- package/lib/controls/file-view/index.js +2 -1
- package/lib/controls/file-view/index.js.map +1 -1
- package/lib/controls/rfield/index.d.ts +1 -0
- package/lib/controls/rfield/index.d.ts.map +1 -1
- package/lib/controls/rfield/index.js +16 -2
- package/lib/controls/rfield/index.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/file-view/index.tsx +3 -1
- package/src/aldehyde/controls/rfield/index.tsx +19 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAMjD,UAAU,aAAa;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,YAAY,CAAC,EAAC,OAAO,CAAC;IACtB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAC,MAAM,CAAC;CAClB;AAED,UAAU,aAAa;IACnB,OAAO,CAAC,EAAC,MAAM,CAAA;CAElB;AACD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK,CAAC,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC;IAEnF,MAAM,CAAC,YAAY;;MAElB;IAED,KAAK;;MAEJ;IAED,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAMjD,UAAU,aAAa;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,YAAY,CAAC,EAAC,OAAO,CAAC;IACtB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAC,MAAM,CAAC;CAClB;AAED,UAAU,aAAa;IACnB,OAAO,CAAC,EAAC,MAAM,CAAA;CAElB;AACD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK,CAAC,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC;IAEnF,MAAM,CAAC,YAAY;;MAElB;IAED,KAAK;;MAEJ;IAED,QAAQ,sBAYP;IACD,iBAAiB;IAIjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IASjD,YAAY,qBAQX;IAED,aAAa,cAAe,MAAM,oBA+EjC;IAED,MAAM;CAIT"}
|
|
@@ -25,6 +25,7 @@ class FileView extends React.PureComponent {
|
|
|
25
25
|
};
|
|
26
26
|
this.loadData = () => __awaiter(this, void 0, void 0, function* () {
|
|
27
27
|
const { value, serverKey } = this.props;
|
|
28
|
+
debugger;
|
|
28
29
|
let jsonFile = this.getJsonValue(value);
|
|
29
30
|
if (jsonFile) {
|
|
30
31
|
if (/^image\/\w+;base64/.test(jsonFile.base.type)) {
|
|
@@ -35,7 +36,7 @@ class FileView extends React.PureComponent {
|
|
|
35
36
|
}
|
|
36
37
|
});
|
|
37
38
|
this.getJsonValue = (file) => {
|
|
38
|
-
let jsonFile;
|
|
39
|
+
let jsonFile = file;
|
|
39
40
|
if (!file) {
|
|
40
41
|
return undefined;
|
|
41
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAC,KAAK,EAAC,MAAM,MAAM,CAAA;AAClD,OAAO,cAAc,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,SAAS;AACT,MAAM,OAAO,GAAQ,MAAM,CAAC;AAQ3B,CAAC;AAKD,CAAC;AACF,MAAqB,QAAS,SAAQ,KAAK,CAAC,aAA2C;IAAvF;;QAMI,UAAK,GAAC;YACF,OAAO,EAAC,SAAS;SACpB,CAAA;QAED,aAAQ,GAAE,GAAQ,EAAE;YAChB,MAAM,EAAC,KAAK,EAAC,SAAS,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YACnC,IAAI,QAAQ,GAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACtC,IAAG,QAAQ,EAAC,CAAC;gBACT,IAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC,CAAC;oBAC9C,IAAI,CAAC,QAAQ,CAAC;wBACV,OAAO,EAAE,MAAM,SAAS,CAAC,WAAW,CAAC,SAAS,EAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;qBACrE,CAAC,CAAA;gBACN,CAAC;YACL,CAAC;QAEL,CAAC,CAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,7 @@ export default class Rfield extends React.PureComponent<RfieldProps, RfieldState
|
|
|
32
32
|
showCount: () => number;
|
|
33
33
|
needMore: () => boolean;
|
|
34
34
|
getValue: (count?: number) => any;
|
|
35
|
+
showValue: (value: string) => string | React.JSX.Element;
|
|
35
36
|
render(): React.JSX.Element;
|
|
36
37
|
}
|
|
37
38
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/rfield/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/rfield/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,UAAU,WAAY,SAAQ,aAAa;CAAG;AAE9C,UAAU,WAAW;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,KAAK,CAAC,aAAa,CACrD,WAAW,EACX,WAAW,CACZ;IACC,KAAK;;;;;MAKH;IACF,MAAM,CAAC,WAAW;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,mBAAmB,sBAKjB;IAEF,eAAe,aAIb;IAEF,kBAAkB,OAAQ,MAAM,UAAQ;IAExC,iBAAiB,OAAQ,MAAM,UAAQ;IAEvC,SAAS,eAoBP;IAEF,QAAQ,gBAcN;IAEF,QAAQ,WAAY,MAAM,SA0DxB;IAIF,SAAS,UAAW,MAAM,gCAWzB;IAED,MAAM;CA4CP"}
|
|
@@ -3,6 +3,7 @@ import { Button, Popover, Space } from "antd";
|
|
|
3
3
|
import ModalDtmplView from "../../detail/view/modal-dtmpl-view";
|
|
4
4
|
import "./index.css";
|
|
5
5
|
import { LocaleContext } from "../../locale/LocaleProvider";
|
|
6
|
+
import FileView from "../file-view";
|
|
6
7
|
class Rfield extends React.PureComponent {
|
|
7
8
|
constructor() {
|
|
8
9
|
super(...arguments);
|
|
@@ -93,7 +94,7 @@ class Rfield extends React.PureComponent {
|
|
|
93
94
|
let code = !val ? undefined : val.split("@R@")[0];
|
|
94
95
|
return isRValue ? (React.createElement(Button, { key: index, style: { padding: "0px 0px", height: "100%" }, type: "link", title: "", onClick: () => {
|
|
95
96
|
this.showRfieldDtmplView(code);
|
|
96
|
-
} }, valueShow)) : (React.createElement("span", { key: index }, valueShow));
|
|
97
|
+
} }, this.showValue(valueShow))) : (React.createElement("span", { key: index }, this.showValue(valueShow)));
|
|
97
98
|
})));
|
|
98
99
|
}
|
|
99
100
|
else {
|
|
@@ -101,11 +102,24 @@ class Rfield extends React.PureComponent {
|
|
|
101
102
|
let isRValue = val ? val.indexOf("@R@") > 0 : false;
|
|
102
103
|
let valueShow = isRValue ? val.split("@R@")[1] : val;
|
|
103
104
|
let code = !val ? undefined : val.split("@R@")[0];
|
|
104
|
-
return React.createElement("span", { key: index }, valueShow);
|
|
105
|
+
return React.createElement("span", { key: index }, this.showValue(valueShow));
|
|
105
106
|
})));
|
|
106
107
|
}
|
|
107
108
|
return dom;
|
|
108
109
|
};
|
|
110
|
+
this.showValue = (value) => {
|
|
111
|
+
const jsonRegex = /^\s*[\[{].*[\]}]\s*$/;
|
|
112
|
+
if (jsonRegex.test(value)) {
|
|
113
|
+
let jsonFile = JSON.parse(value);
|
|
114
|
+
if (jsonFile.valid && jsonFile.base) {
|
|
115
|
+
return React.createElement("div", { onClick: (e) => {
|
|
116
|
+
e.stopPropagation();
|
|
117
|
+
} },
|
|
118
|
+
React.createElement(FileView, { fieldConfig: { "id": "1", "title": '文件' }, value: jsonFile }));
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return value;
|
|
122
|
+
};
|
|
109
123
|
}
|
|
110
124
|
render() {
|
|
111
125
|
const { fieldConfig, value, itemType, serverKey } = this.props;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/rfield/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/rfield/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,QAAQ,MAAM,cAAc,CAAC;AAWpC,MAAqB,MAAO,SAAQ,KAAK,CAAC,aAGzC;IAHD;;QAIE,UAAK,GAAG;YACN,aAAa,EAAE,KAAK;YACpB,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,SAAS;YACxB,QAAQ,EAAE,SAAS;SACpB,CAAC;QAIF,wBAAmB,GAAG,CAAC,IAAI,EAAE,EAAE;YAC7B,IAAI,CAAC,QAAQ,CAAC;gBACZ,QAAQ,EAAE,IAAI;gBACd,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,oBAAe,GAAG,GAAG,EAAE;YACrB,IAAI,CAAC,QAAQ,CAAC;gBACZ,aAAa,EAAE,KAAK;aACrB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,uBAAkB,GAAG,CAAC,EAAU,EAAE,EAAE,GAAE,CAAC,CAAC;QAExC,sBAAiB,GAAG,CAAC,EAAU,EAAE,EAAE,GAAE,CAAC,CAAC;QAEvC,cAAS,GAAG,GAAG,EAAE;YACf,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC7B,IAAI,UAAoB,CAAC;YACzB,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,UAAU,GAAG,KAAK,CAAC;gBACnB,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,KAAK,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;oBAC3B,CAAC,EAAE,CAAC;oBACJ,IAAI,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBACpD,IAAI,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBACrD,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;oBACxB,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;wBACtB,MAAM;oBACR,CAAC;gBACH,CAAC;gBACD,OAAO,CAAC,CAAC;YACX,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,CAAC;YACX,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAG,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC7B,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,CAAC,CAAC;YACf,CAAC;YACD,IAAI,QAAQ,GAAG,SAAS,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAG,CAAC,KAAc,EAAE,EAAE;YAC5B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1C,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAChC,IAAI,UAAoB,CAAC;YACzB,UAAU;YACV,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC;oBAC/C,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACN,UAAU,GAAG,KAAK,CAAC;gBACrB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,KAAK,EAAE,CAAC;oBACV,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,UAAU,GAAG,EAAE,CAAC;gBAClB,CAAC;YACH,CAAC;YACD,IAAI,GAAG,CAAC;YACR,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1C,GAAG,GAAG,CACJ,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,UAClD,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAC7B,IAAI,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBACpD,IAAI,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBACrD,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAChB,oBAAC,MAAM,IACL,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAC7C,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,EAAE,EACR,OAAO,EAAE,GAAG,EAAE;4BACZ,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;wBACjC,CAAC,IAEA,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CACnB,CACV,CAAC,CAAC,CAAC,CACF,8BAAM,GAAG,EAAE,KAAK,IAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAQ,CACrD,CAAC;gBACJ,CAAC,CAAC,CACI,CACT,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,CACJ,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,UACnD,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAC7B,IAAI,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBACpD,IAAI,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBACrD,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClD,OAAO,8BAAM,GAAG,EAAE,KAAK,IAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAQ,CAAC;gBAC9D,CAAC,CAAC,CACI,CACT,CAAC;YACJ,CAAC;YAED,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;QAIF,cAAS,GAAG,CAAC,KAAa,EAAE,EAAE;YAC5B,MAAM,SAAS,GAAG,sBAAsB,CAAC;YACzC,IAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,CAAC;gBACxB,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAG,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,EAAC,CAAC;oBAClC,OAAQ,6BAAK,OAAO,EAAE,CAAC,CAAC,EAAC,EAAE;4BACzB,CAAC,CAAC,eAAe,EAAE,CAAC;wBACtB,CAAC;wBAAE,oBAAC,QAAQ,IAAG,WAAW,EAAE,EAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAC,IAAI,EAAC,EAAE,KAAK,EAAE,QAAQ,GAAI,CAAM,CAAA;gBAChF,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAA;IA8CH,CAAC;IA5CC,MAAM;QACJ,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/D,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/C,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAChC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEnC,2DAA2D;QAC3D,yDAAyD;QACzD,yDAAyD;QACzD,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9C,OAAO,CACL;YACE,oBAAC,KAAK,IAAC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,QAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;gBAC3D,OAAO;gBACP,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CACjB,oBAAC,OAAO,IACN,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EACnC,SAAS,EAAC,YAAY,EACtB,OAAO,EAAC,OAAO,EACf,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;oBAExB,oBAAC,MAAM,IAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,IAC7C,SAAS,CAAC,UAAU,CAAC,CACf,CACD,CACX,CAAC,CAAC,CAAC,IAAI;gBACP,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACvC,oBAAC,cAAc,IACb,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,KAAK,EACV,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,IAAI,CAAC,eAAe,EAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAC9B,IAAI,EAAE,QAAQ,IAEb,GAAG,CACW,CAClB,CAAC,CAAC,CAAC,CACF,EAAE,CACH,CACK,CACP,CACJ,CAAC;IACJ,CAAC;;AAhLM,kBAAW,GAAG,aAAa,AAAhB,CAAiB;eAVhB,MAAM"}
|
package/package.json
CHANGED
|
@@ -32,6 +32,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
|
|
|
32
32
|
|
|
33
33
|
loadData= async ()=>{
|
|
34
34
|
const {value,serverKey}=this.props;
|
|
35
|
+
debugger
|
|
35
36
|
let jsonFile=this.getJsonValue(value);
|
|
36
37
|
if(jsonFile){
|
|
37
38
|
if(/^image\/\w+;base64/.test(jsonFile.base.type)){
|
|
@@ -49,13 +50,14 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
|
|
|
49
50
|
componentDidUpdate(prevProps, prevState, snapshot) {
|
|
50
51
|
const {value}=this.props;
|
|
51
52
|
const {value:preValue}=this.props;
|
|
53
|
+
|
|
52
54
|
if(value!=preValue){
|
|
53
55
|
this.loadData();
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
|
|
57
59
|
getJsonValue=(file)=>{
|
|
58
|
-
let jsonFile;
|
|
60
|
+
let jsonFile=file;
|
|
59
61
|
if (!file) {
|
|
60
62
|
return undefined;
|
|
61
63
|
} else if (typeof (file) == 'string') {
|
|
@@ -4,6 +4,7 @@ import { VControlProps } from "../../tmpl/interface";
|
|
|
4
4
|
import ModalDtmplView from "../../detail/view/modal-dtmpl-view";
|
|
5
5
|
import "./index.css";
|
|
6
6
|
import { LocaleContext } from "../../locale/LocaleProvider";
|
|
7
|
+
import FileView from "../file-view";
|
|
7
8
|
|
|
8
9
|
interface RfieldProps extends VControlProps {}
|
|
9
10
|
|
|
@@ -118,10 +119,10 @@ export default class Rfield extends React.PureComponent<
|
|
|
118
119
|
this.showRfieldDtmplView(code);
|
|
119
120
|
}}
|
|
120
121
|
>
|
|
121
|
-
{valueShow}
|
|
122
|
+
{this.showValue(valueShow)}
|
|
122
123
|
</Button>
|
|
123
124
|
) : (
|
|
124
|
-
<span key={index}>{valueShow}</span>
|
|
125
|
+
<span key={index}>{this.showValue(valueShow)}</span>
|
|
125
126
|
);
|
|
126
127
|
})}
|
|
127
128
|
</Space>
|
|
@@ -133,7 +134,7 @@ export default class Rfield extends React.PureComponent<
|
|
|
133
134
|
let isRValue = val ? val.indexOf("@R@") > 0 : false;
|
|
134
135
|
let valueShow = isRValue ? val.split("@R@")[1] : val;
|
|
135
136
|
let code = !val ? undefined : val.split("@R@")[0];
|
|
136
|
-
return <span key={index}>{valueShow}</span>;
|
|
137
|
+
return <span key={index}>{this.showValue(valueShow)}</span>;
|
|
137
138
|
})}
|
|
138
139
|
</Space>
|
|
139
140
|
);
|
|
@@ -142,6 +143,21 @@ export default class Rfield extends React.PureComponent<
|
|
|
142
143
|
return dom;
|
|
143
144
|
};
|
|
144
145
|
|
|
146
|
+
|
|
147
|
+
|
|
148
|
+
showValue = (value: string) => {
|
|
149
|
+
const jsonRegex = /^\s*[\[{].*[\]}]\s*$/;
|
|
150
|
+
if(jsonRegex.test(value)){
|
|
151
|
+
let jsonFile = JSON.parse(value);
|
|
152
|
+
if(jsonFile.valid && jsonFile.base){
|
|
153
|
+
return <div onClick={(e)=>{
|
|
154
|
+
e.stopPropagation();
|
|
155
|
+
}}><FileView fieldConfig={{"id":"1","title":'文件'}} value={jsonFile} /></div>
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
return value;
|
|
159
|
+
}
|
|
160
|
+
|
|
145
161
|
render() {
|
|
146
162
|
const { fieldConfig, value, itemType, serverKey } = this.props;
|
|
147
163
|
const { showDtmplView, openCode } = this.state;
|