npm - aldehyde - Versions diffs - 0.2.432 → 0.2.434 - Mend

aldehyde 0.2.432 → 0.2.434

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.

Files changed (27) hide show

package/lib/controls/2dEditor/components/card.js CHANGED Viewed

@@ -108,7 +108,7 @@ const Index = (props) => {
                 cursor: isDesignMode && isDragging ? 'grab' : 'default',
                 background: token.colorBgContainer,
                 border: `1px solid ${token.colorBorderSecondary}`
-            }, onMouseDown: handleMouseDown, onClick: onSelect },
+            }, onMouseDown: handleMouseDown, onClick: () => { var _a; return isDesignMode ? onSelect() : (_a = node.onClick) === null || _a === void 0 ? void 0 : _a.call(node, node); } },
             React.createElement(Spin, { spinning: loading },
                 React.createElement("div", { className: 'card-title' }, title || "-"),
                 React.createElement("div", { className: 'card-detail' },

package/lib/controls/2dEditor/components/card.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"card.js","sourceRoot":"","sources":["../../../../../../src/aldehyde/controls/2dEditor/components/card.tsx"],"names":[],"mappings":"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~~YAEjB~~,oBAAC,IAAI,IAAC,QAAQ,EAAE,OAAO;gBACnB,6BAAK,SAAS,EAAC,YAAY,IAAE,KAAK,IAAI,GAAG,CAAO;gBAChD,6BAAK,SAAS,EAAC,aAAa;oBACxB,oBAAC,GAAG,IAAC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAChB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC3B,oBAAC,GAAG,IAAC,SAAS,EAAC,kBAAkB,EAAC,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK;wBAClD,6BAAK,SAAS,EAAC,wBAAwB;4BAAE,IAAI,CAAC,KAAK;qCAAQ;wBAC3D,6BAAK,SAAS,EAAC,wBAAwB,IAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAO;wBAChG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,6BAAK,SAAS,EAAC,uBAAuB,IAAE,IAAI,CAAC,IAAI,CAAO,CAAC,CAAC,CAAC,EAAE;wBACzE,CAAC,KAAK,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,8BAAM,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;4BAAE,oBAAC,GAAG,IAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,SAAS,IAAG,KAAK,CAAO,CAAO,CAAC,CAAC,CAAC,EAAE,CAClI,CAAC,CAET,CACJ,CACH,CACL,CACC,CACd,CAAC;AACN,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
1	+ {"version":3,"file":"card.js","sourceRoot":"","sources":["../../../../../../src/aldehyde/controls/2dEditor/components/card.tsx"],"names":[],"mappings":"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"}

package/lib/controls/entity-select/popover-entity-select.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"popover-entity-select.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGlE,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,wBAAyB,SAAQ,aAAa;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC;AAED,UAAU,wBAAwB;CAAI;AAEtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,KAAK,CAAC,aAAa,CAClE,wBAAwB,EACxB,wBAAwB,CACzB;IACC,MAAM,CAAC,YAAY;;MAEjB;IAEF,KAAK,KAAM;IACX,MAAM,CAAC,WAAW;;;;;;;YATX,GAAG;oBAAyC,GAAG;;;;;;OASnB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,OAAO,aAIL;IAEF,QAAQ,GAAI,cAAc,WAAW,EAAE,UAsBrC;IAEF,OAAO,GAAI,UAAK,cAad;IAEF,YAAY,GAAI,UAAK,WAYnB;IAEF,MAAM;~~CA2GP~~"}
1	+ {"version":3,"file":"popover-entity-select.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGlE,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,wBAAyB,SAAQ,aAAa;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC;AAED,UAAU,wBAAwB;CAAI;AAEtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,KAAK,CAAC,aAAa,CAClE,wBAAwB,EACxB,wBAAwB,CACzB;IACC,MAAM,CAAC,YAAY;;MAEjB;IAEF,KAAK,KAAM;IACX,MAAM,CAAC,WAAW;;;;;;;YATX,GAAG;oBAAyC,GAAG;;;;;;OASnB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,OAAO,aAIL;IAEF,QAAQ,GAAI,cAAc,WAAW,EAAE,UAsBrC;IAEF,OAAO,GAAI,UAAK,cAad;IAEF,YAAY,GAAI,UAAK,WAYnB;IAEF,MAAM;CA6GP"}

package/lib/controls/entity-select/popover-entity-select.js CHANGED Viewed

@@ -107,7 +107,10 @@ class PopoverEntitySelect extends React.PureComponent {
                     } },
                     React.createElement(SelectTable, { serverKey: serverKey, mainCode: mainCode, maxSelectedRows: maxSelected, selectedRows: selectedRows, sourceId: fieldConfig.sourceId, onChange: this.onSelect, fieldConfig: fieldConfig, showActions: true })), trigger: "click" },
                 React.createElement(Select, { id: id, style: Object.assign({}, style), value: this.toValueArray(valueArray), mode: "multiple", placeholder: translate("${请选择}${" + (fieldConfig.placeholder || fieldConfig.title) + "}"), notFoundContent: translate("${请选择}"), allowClear: true, suffixIcon: React.createElement(SearchOutlined, null), dropdownStyle: { display: "none" }, onChange: (value) => {
-                        onChange(value.join("@,@"));
+                        var _a;
+                        // 关系字段更改选中项
+                        const selOptions = (_a = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.filter(r => value.includes(r.code))) === null || _a === void 0 ? void 0 : _a.map(r => `${r.code}@R@${r.title}`).join("@,@");
+                        onChange(selOptions || value.join("@,@"));
                     }, options: relationOptions }))));
     }
 }

package/lib/controls/entity-select/popover-entity-select.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"popover-entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,WAAW,MAAM,0BAA0B,CAAC;AACnD,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAS5D,MAAqB,mBAAoB,SAAQ,KAAK,CAAC,aAGtD;IAHD;;QAQE,UAAK,GAAG,EAAE,CAAC;QAIX,YAAO,GAAG,GAAG,EAAE;YACb,IAAI,CAAC,QAAQ,CAAC;gBACZ,eAAe,EAAE,IAAI;aACtB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,aAAQ,GAAG,CAAC,YAA2B,EAAE,EAAE;YACzC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACvC,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,IAAI,YAAY,EAAE,CAAC;gBACjB,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;oBAC7B,IAAI,KAAK,GAAW,IAAI,CAAC;oBACzB,IAAI,GAAG,CAAC,KAAK,YAAY,KAAK,EAAE,CAAC;wBAC/B,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACvB,CAAC;yBAAM,CAAC;wBACN,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;oBACpB,CAAC;oBAED,6BAA6B;oBAC7B,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC3C,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC5B,KAAK,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBAC5B,CAAC;oBACD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC;QAEF,YAAO,GAAG,CAAC,KAAK,EAAE,EAAE;YAClB,IAAI,UAAU,GAAa,EAAE,CAAC;YAC9B,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,UAAU,GAAG,KAAK,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,IAAI,KAAK,EAAE,CAAC;oBACV,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACN,UAAU,GAAG,EAAE,CAAC;gBAClB,CAAC;YACH,CAAC;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC;QAEF,iBAAY,GAAG,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrC,KAAK,IAAI,CAAC,IAAI,UAAU,EAAE,CAAC;gBACzB,IAAI,CAAC,EAAE,CAAC;oBACN,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACxB,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC;wBACpB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrB,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;~~IA6GJ~~,CAAC;~~IA3GC~~,MAAM;QACJ,MAAM,EACJ,EAAE,EACF,KAAK,EACL,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,KAAK,EACL,WAAW,EACX,aAAa,EACb,QAAQ,EACR,SAAS,GACV,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,EAAG,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,YAAY,GAAkB,EAAE,CAAC;QACrC,IAAI,eAAe,GAAG,EAAE,CAAC;QAEzB,IAAI,UAAU,GAAa,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE/C,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACxB,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACjD,eAAe,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;oBACZ,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CACrB,oBAAC,MAAM,IACL,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EACzB,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,EAAE,EACR,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;4BACb,CAAC,CAAC,eAAe,EAAE,CAAC;4BACpB,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;wBACvB,CAAC,IAEA,EAAE,CAAC,CAAC,CAAC,CACC,CACV,CAAC,CAAC,CAAC,CACF,EAAE,CAAC,CAAC,CAAC,CACN;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,CACL;YACE,oBAAC,OAAO;YACN,mCAAmC;;gBAAnC,mCAAmC;gBACnC,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE;oBACN,IAAI,EAAE;wBACJ,QAAQ,EAAE,oBAAoB;wBAC9B,SAAS,EAAE,oBAAoB;qBAChC;oBACD,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;iBACrB,EACD,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAC1B,OAAO,EACL,6BACE,SAAS,EAAC,sBAAsB,EAChC,KAAK,EAAE;wBACL,OAAO,EAAE,CAAC;wBACV,MAAM,EAAE,GAAG;wBACX,eAAe,EAAE,SAAS;wBAC1B,QAAQ,EAAE,MAAM;wBAChB,WAAW,EAAE,OAAO;wBACpB,YAAY,EAAE,KAAK;wBACnB,WAAW,EAAE,KAAK;wBAClB,WAAW,EAAE,SAAS;qBACvB;oBAED,oBAAC,WAAW,IACV,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,WAAW,EAC5B,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,IAAI,GACjB,CACE,EAER,OAAO,EAAC,OAAO;gBAEf,oBAAC,MAAM,IACL,EAAE,EAAE,EAAE,EACN,KAAK,oBAAO,KAAK,GACjB,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EACpC,IAAI,EAAC,UAAU,EACf,WAAW,EAAE,SAAS,CAAC,UAAU,GAAG,CAAC,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,EACzF,eAAe,EAAE,SAAS,CAAC,QAAQ,CAAC,EACpC,UAAU,EAAE,IAAI,EAChB,UAAU,EAAE,oBAAC,cAAc,OAAG,EAC9B,aAAa,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;wBAClB,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;~~oBAC9B~~,CAAC,EACD,OAAO,EAAE,eAAe,GAChB,CACF,CACT,CACJ,CAAC;IACJ,CAAC;;~~AA7KM~~,gCAAY,GAAG;IACpB,WAAW,EAAE,GAAG;CACjB,AAFkB,CAEjB;AAGK,+BAAW,GAAG,aAAa,AAAhB,CAAiB;eAThB,mBAAmB"}
1	+ {"version":3,"file":"popover-entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"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"}

package/lib/controls/file-view/drawer-file-view.d.ts CHANGED Viewed

@@ -1,23 +1,12 @@
-import * as React from 'react';
+import React from 'react';
 import { CommonFilePath } from "../../tmpl/interface";
+import "./index.less";
 interface DrawerFileViewProps {
     filePath: CommonFilePath;
     serverKey?: string;
     downloadable?: boolean;
+    contentType?: string;
 }
-interface DrawerFileViewState {
-    drawerOpen?: boolean;
-}
-export default class DrawerFileView extends React.PureComponent<DrawerFileViewProps, DrawerFileViewState> {
-    static defaultProps: {
-        downloadable: boolean;
-    };
-    state: {
-        drawerOpen: boolean;
-    };
-    onError(e: any): void;
-    onClose: () => void;
-    render(): React.JSX.Element;
-}
-export {};
+declare const DrawerFileView: React.FC<DrawerFileViewProps>;
+export default DrawerFileView;
 //# sourceMappingURL=drawer-file-view.d.ts.map

package/lib/controls/file-view/drawer-file-view.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"drawer-file-view.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/drawer-file-view.tsx"],"names":[],"mappings":"AAAA,OAAO,~~KAAK~~,~~KAAK,~~MAAM,OAAO,~~CAAA~~;~~AAI9B~~,OAAO,~~EAAC~~,cAAc,~~EAAC~~,MAAM,sBAAsB,CAAC;~~AAOpD~~,UAAU,mBAAmB;IACzB,QAAQ,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,~~EAAC~~,MAAM,CAAC;~~IAClB~~,YAAY,CAAC,~~EAAC~~,OAAO,CAAC;~~CACzB;AAED~~,~~UAAU~~,~~mBAAmB;IACzB,UAAU,~~CAAC,EAAE,~~OAAO~~,CAAC;~~CAExB~~;~~AACD~~,MAAM,~~CAAC~~,~~OAAO~~,~~OAAO,cAAe,SAAQ,~~KAAK,CAAC,~~aAAa~~,CAAC,mBAAmB,~~EAAE~~,~~mBAAmB,~~CAAC;~~IACrG~~,~~MAAM~~,~~CAAC~~,~~YAAY;;MAElB;IACD,KAAK;;MAEJ;IAED,OAAO,~~CAAC~~,CAAC,KAAA;IAIT,OAAO,aAEN;IAED,MAAM;CAqCT~~"}
1	+ {"version":3,"file":"drawer-file-view.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/drawer-file-view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAKjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,cAAc,CAAC;AAOtB,UAAU,mBAAmB;IACzB,QAAQ,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA2FjD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/lib/controls/file-view/drawer-file-view.js CHANGED Viewed

@@ -1,49 +1,64 @@
-import * as React from 'react';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import React, { useEffect, useRef } from 'react';
 import { Button, Drawer, Space, Spin } from 'antd';
 import { DownloadOutlined, CloseOutlined } from '@ant-design/icons';
-import HCService from "../../tmpl/hcservice-v3";
 import loadable from '@loadable/component';
+import { renderAsync } from 'docx-preview';
+import HCService from "../../tmpl/hcservice-v3";
+import "./index.less";
 const Loading = React.createElement(Spin, { tip: "Loading..." });
+// 懒加载 FileViewer
 const FileViewer = loadable(() => import('react-file-viewer'), { fallback: Loading });
-;
-;
-class DrawerFileView extends React.PureComponent {
-    constructor() {
-        super(...arguments);
-        this.state = {
-            drawerOpen: false
-        };
-        this.onClose = () => {
-            this.setState({ drawerOpen: false });
-        };
-    }
-    onError(e) {
+const DrawerFileView = (props) => {
+    const { filePath, serverKey, downloadable = true, contentType } = props;
+    const [drawerOpen, setDrawerOpen] = React.useState(false);
+    const containerRef = useRef(null);
+    const loadDocx = () => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const response = yield fetch(filePath.path);
+            const blob = yield response.blob();
+            yield renderAsync(blob, containerRef.current);
+        }
+        catch (error) {
+            console.error('Failed to load document:', error);
+        }
+    });
+    useEffect(() => {
+        if (contentType === "docx" && (filePath === null || filePath === void 0 ? void 0 : filePath.path) && drawerOpen) {
+            loadDocx();
+        }
+    }, [filePath, drawerOpen]);
+    const onClose = () => {
+        setDrawerOpen(false);
+    };
+    const handleDownload = () => {
+        HCService.downloadDir(filePath.path, filePath.fileName);
+    };
+    const handleOpenDrawer = () => {
+        setDrawerOpen(true);
+    };
+    const onError = (e) => {
         console.log(e, 'error in file-viewer');
-    }
-    render() {
-        const { filePath, downloadable, serverKey } = this.props;
-        const { drawerOpen } = this.state;
-        // @ts-ignore
-        return React.createElement("span", { className: 'labelcss' },
-            React.createElement(Button, { type: 'link', onClick: () => {
-                    this.setState({ drawerOpen: true });
-                }, size: "small", style: { margin: 0 } }, filePath.fileName),
-            downloadable ? React.createElement(Button, { type: 'text', onClick: () => {
-                    HCService.downloadDir(filePath.path, filePath.fileName);
-                }, size: "small" },
-                React.createElement(DownloadOutlined, null)) : null,
-            drawerOpen ? React.createElement(Drawer, { title: filePath.fileName, placement: 'left', closable: false, onClose: this.onClose, width: '1200px', open: drawerOpen, extra: React.createElement(Space, null,
-                    downloadable ? React.createElement(Button, { onClick: () => {
-                            HCService.downloadDir(filePath.path, filePath.fileName);
-                        } },
-                        React.createElement(DownloadOutlined, null)) : null,
-                    React.createElement(Button, { onClick: this.onClose },
-                        React.createElement(CloseOutlined, null))) },
-                React.createElement(FileViewer, { style: { width: '100%' }, fileType: filePath.contentType, filePath: filePath.path, errorComponent: undefined, onError: this.onError })) : null);
-    }
-}
-DrawerFileView.defaultProps = {
-    downloadable: true,
+    };
+    return (React.createElement("span", { className: 'labelcss' },
+        React.createElement(Button, { type: 'link', onClick: handleOpenDrawer, size: "small", style: { margin: 0 } }, filePath.fileName),
+        downloadable ? (React.createElement(Button, { type: 'text', onClick: handleDownload, size: "small" },
+            React.createElement(DownloadOutlined, null))) : null,
+        drawerOpen && (React.createElement(Drawer, { title: filePath.fileName, placement: 'left', closable: false, onClose: onClose, width: '1200px', open: drawerOpen, extra: React.createElement(Space, null,
+                downloadable ? (React.createElement(Button, { onClick: handleDownload },
+                    React.createElement(DownloadOutlined, null))) : null,
+                React.createElement(Button, { onClick: onClose },
+                    React.createElement(CloseOutlined, null))), className: 'drawer-file-view' }, contentType === "docx" ?
+            React.createElement("div", { ref: containerRef, style: { width: '100%', height: '100vh' } }) :
+            React.createElement(FileViewer, { style: { width: '100%' }, fileType: filePath.contentType, filePath: filePath.path, errorComponent: undefined, onError: onError })))));
 };
 export default DrawerFileView;
 //# sourceMappingURL=drawer-file-view.js.map

package/lib/controls/file-view/drawer-file-view.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"drawer-file-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/drawer-file-view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,~~KAAK~~,MAAM,OAAO,~~CAAA~~;~~AAC9B~~,OAAO,~~EAAC~~,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,~~EAAC~~,MAAM,MAAM,~~CAAA~~;~~AAChD~~,OAAO,~~EAAc~~,gBAAgB,~~EAAC~~,aAAa,~~EAAC~~,MAAM,mBAAmB,~~CAAA~~;~~AAG7E~~,OAAO,~~SAAS~~,MAAM,~~yBAAyB~~,CAAC;~~AAChD~~,OAAO,~~QAAQ~~,MAAM,~~qBAAqB~~,CAAC;~~AAC3C~~,MAAM,OAAO,GAAG,oBAAC,IAAI,IAAC,GAAG,EAAC,YAAY,~~GAC/B~~,~~CAAA~~;~~AACP~~,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,EAAE,~~CAC7B~~,MAAM,CAAC,mBAAmB,CAAC,EAAE,~~EAAC~~,QAAQ,EAAE,OAAO,~~EAAC~~,CAAC,CAAC;~~AAKrD~~,CAAC~~;AAKD~~,~~CAAC~~;~~AACF~~,~~MAAqB~~,~~cAAe~~,~~SAAQ~~,~~KAAK~~,~~CAAC~~,~~aAAuD;IAAzG;;QAII~~,~~UAAK~~,GAAG;~~YACJ~~,UAAU,EAAE,KAAK~~;SACpB~~,~~CAAA~~;~~QAMD~~,~~YAAO~~,GAAG,GAAG,EAAE;~~YACX~~,IAAI,CAAC,QAAQ,~~CAAC~~,~~EAAC~~,~~UAAU~~,~~EAAE~~,~~KAAK~~,~~EAAC~~,CAAC,~~CAAA~~;~~QACtC~~,CAAC,~~CAAA;IAuCL~~,CAAC;~~IA7CG~~,OAAO,CAAC,CAAC;~~QACL~~,OAAO,CAAC,~~GAAG~~,CAAC,CAAC,EAAE,~~sBAAsB~~,CAAC,CAAC;~~IAC3C~~,CAAC;~~IAMD~~,~~MAAM~~;~~QACF~~,MAAM,~~EAAC~~,QAAQ,~~EAAC~~,~~YAAY~~,~~EAAC~~,~~SAAS~~,~~EAAC~~,~~GAAG~~,IAAI,CAAC,~~KAAK~~,CAAC;~~QACrD~~,~~MAAM~~,~~EAAC~~,~~UAAU~~,~~EAAC~~,~~GAAG~~,~~IAAI~~,CAAC,~~KAAK~~,CAAC;~~QAChC~~,~~aAAa;QACb~~,OAAO,~~8BAAM~~,~~SAAS~~,~~EAAC,UAAU~~;~~YACjB~~,~~oBAAC~~,~~MAAM~~,~~IAAC~~,~~IAAI~~,~~EAAE~~,~~MAAM~~,~~EAAE~~,~~OAAO~~,~~EAAE~~,GAAG,EAAE;~~oBAChC~~,~~IAAI~~,CAAC,QAAQ,CAAC,~~EAAC~~,~~UAAU,~~EAAE,~~IAAI~~,~~EAAC~~,CAAC,~~CAAA~~;~~gBACrC~~,CAAC,EAAE,IAAI,~~EAAC~~,OAAO,~~EAAC~~,~~KAAK~~,EAAE,~~EAAC~~,~~MAAM~~,~~EAAC~~,CAAC,~~EAAC~~,~~IAAG~~,~~QAAQ~~,CAAC,~~QAAQ,CAAU~~;~~YAC1E~~,~~YAAY~~,CAAA,~~CAAC~~,~~CAAC~~,oBAAC,MAAM,~~IAAC~~,IAAI,EAAE,MAAM,EAAE,OAAO,~~EAAG~~,~~GAAG~~,EAAE~~;oBACvC~~,~~SAAS~~,~~CAAC~~,~~WAAW~~,CAAC,~~QAAQ~~,~~CAAC~~,~~IAAI,EAAC,~~QAAQ,CAAC,QAAQ,CAAC,CAAC~~;gBAC5D~~,CAAC,EAAE,IAAI,EAAC,OAAO;~~gBAAC~~,oBAAC,gBAAgB,~~OAAE~~,~~CAAS~~,~~CAAA~~,CAAC,~~CAAA~~,IAAI;~~YACxD~~,UAAU,~~CAAC~~,~~CAAC~~,~~CAAC,~~oBAAC,MAAM,~~IACjB~~,KAAK,EAAE,QAAQ,CAAC,QAAQ,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,KAAK,EACf,OAAO,EAAE,~~IAAI,CAAC,~~OAAO,~~EACrB~~,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,UAAU,EAChB,KAAK,~~EACL~~,oBAAC,KAAK;~~oBACD~~,YAAY,~~CAAA~~,CAAC,CAAC,oBAAC,MAAM,~~IAAE~~,OAAO,~~EAAG~~,~~GAAG,EAAE~~;~~4BAClC~~,~~SAAS~~,~~CAAC~~,~~WAAW~~,CAAC,~~QAAQ~~,CAAC,IAAI,EAAC,~~QAAQ~~,~~CAAC~~,~~QAAQ~~,~~CAAC~~,CAAC~~;wBAC5D~~,CAAC;~~wBAAG~~,~~oBAAC~~,~~gBAAgB~~,~~OAAE~~,~~CAAS~~,~~CAAA~~,~~CAAC~~,~~CAAA~~,~~IAAI;oBACrC~~,~~oBAAC~~,MAAM,~~IAAC~~,~~OAAO~~,EAAE,~~IAAI,CAAC,~~OAAO~~;wBAAE~~,~~oBAAC~~,~~aAAa~~,~~OAAG~~,~~CAAS,CACrD~~;~~gBAER~~,oBAAC,UAAU,IACP,KAAK,EAAE,~~EAAC~~,KAAK,EAAE,MAAM,~~EAAC~~,~~EACtB~~,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAC9B,QAAQ,EAAE,QAAQ,CAAC,IAAI,EACvB,cAAc,EAAE,SAAS,EACzB,OAAO,EAAE,~~IAAI,CAAC,~~OAAO,~~GAAG~~,~~CACvB~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~IAAI,CAEC,~~CAAC;~~IAC1B~~,CAAC~~;;AAlDM~~,~~2BAAY,GAAC~~;~~IAChB~~,~~YAAY~~,~~EAAC~~,~~IAAI;CACpB,AAFkB,CAElB;eAHgB,cAAc~~"}
1	+ {"version":3,"file":"drawer-file-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/drawer-file-view.tsx"],"names":[],"mappings":"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"}

package/lib/controls/file-view/index.js CHANGED Viewed

@@ -74,7 +74,7 @@ class FileView extends React.PureComponent {
                         React.createElement(Button, { type: "link", onClick: () => { this.setState({ playing: true }); }, icon: React.createElement(PlayCircleOutlined, null) }, '播放'))));
                 }
                 else if (['xlsx', 'docx', 'csv', 'webm', 'bmp'].includes(filePath.contentType)) {
-                    return React.createElement(DrawerFileView, { serverKey: serverKey, filePath: filePath, downloadable: downloadable });
+                    return React.createElement(DrawerFileView, { serverKey: serverKey, filePath: filePath, downloadable: downloadable, contentType: filePath.contentType });
                 }
                 else if (['pdf', 'txt'].includes(filePath.contentType)) {
                     return React.createElement("span", { className: 'labelcss' },

package/lib/controls/file-view/index.js.map CHANGED Viewed

	@@ -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,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AACrD,OAAO,cAAc,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,SAAS;AACT,MAAM,OAAO,GAAQ,MAAM,CAAC;AAE5B,YAAY;AACZ,MAAM,QAAQ,GAAG,gqGAAgqG,CAAC;AASjrG,CAAC;AAOD,CAAC;AACF,MAAqB,QAAS,SAAQ,KAAK,CAAC,aAA2C;IAAvF;;QAMI,UAAK,GAAG;YACJ,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,SAAS;YACnB,OAAO,EAAE,KAAK;SACjB,CAAA;QAED,aAAQ,GAAG,GAAS,EAAE;YAClB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,IAAI,QAAQ,GAAmB,SAAS,CAAC;YACzC,IAAI,OAAkB,CAAC;YACvB,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAClD,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,KAAI,oBAAoB,CAAC,IAAI,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,EAAE,CAAC;gBACtE,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,CAAA;YACxE,CAAC;YACD,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,CAAC,QAAQ,CAAC;oBACV,QAAQ,EAAE,OAAO;iBACpB,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAA,CAAA;QAeD,kBAAa,GAAG,GAAG,EAAE;YACjB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAClD,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;YAEhE,IAAI,IAAI,GAAG,SAAS,CAAC;YACrB,IAAI,QAAQ,GAAG,SAAS,CAAC;YACzB,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBAC1B,OAAO,QAAQ,CAAC,QAAQ,CAAA;gBAC5B,CAAC;qBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACpC,OAAO,SAAS,CAAC;gBACrB,CAAC;qBAAM,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACjH,OAAO,oBAAC,KAAK,IACT,KAAK,EAAE,EAAE,EACT,GAAG,EAAE,WAAW,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EACzE,OAAO,EAAE,OAAO,IAAI,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,EACxE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAC7C,CAAA;gBACN,CAAC;qBAAM,IAAI,OAAO,EAAE,CAAC;oBACjB,iEAAiE;oBACjE,OAAO,oBAAC,KAAK,IACT,KAAK,EAAE,EAAE,EACT,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,OAAO,IAAI,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAClE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAC7C,CAAA;gBACN,CAAC;qBAAM,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC/G,IAAI,OAAO,GAAG;wBACV,EAAE,EAAE;4BACA,QAAQ,EAAE,QAAQ,CAAC,IAAI;yBAC1B;qBACJ,CAAA;oBACD,OAAO,CAAC,oBAAC,GAAG,QACP,OAAO,CAAC,CAAC;wBACN,oBAAC,GAAG,IAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE;4BAC1C,oBAAC,OAAO,IAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAI,CACrF,CAAC,CAAC,CAAC,oBAAC,GAAG;wBACT,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA,CAAC,CAAC,EACrE,IAAI,EAAE,oBAAC,kBAAkB,OAAG,IAAG,IAAI,CAAU,CAC/C,CACR,CAAC,CAAA;gBACX,CAAC;qBAAM,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC/E,OAAO,oBAAC,cAAc,IAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAC3D,YAAY,EAAE,YAAY,~~GAAmB~~,CAAA;~~gBACrD~~,CAAC;qBAAM,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACvD,OAAO,8BAAM,SAAS,EAAC,UAAU;wBAE7B,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACtC,MAAM,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;4BACpG,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,IAAG,QAAQ,CAAC,QAAQ,CAAU;wBACjE,YAAY,CAAC,CAAC,CAAC,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACtD,MAAM,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;4BAClE,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO;4BAAC,oBAAC,gBAAgB,OAAG,CAAS,CAAC,CAAC,CAAC,IAAI,CACjD,CAAA;gBACX,CAAC;qBAAM,CAAC;oBACJ,OAAO,oBAAC,KAAK,IAAC,SAAS,EAAC,UAAU,EAAC,IAAI,EAAE,CAAC,IAErC,YAAY,CAAC,CAAC,CAAC;wBAAE,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACxD,MAAM,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;4BACvD,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,IAAG,QAAQ,CAAC,QAAQ,CAAU;wBAC9D,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACtC,MAAM,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;4BAClE,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO,EAAC,IAAI,EAAE,oBAAC,gBAAgB,OAAG,GAAW,CAAG,CAAC,CAAC;wBAC1D,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAC,OAAO,IAAE,QAAQ,CAAC,QAAQ,CAAU,CAC/D,CAAA;gBACZ,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,SAAS,CAAC;YACrB,CAAC;QAEL,CAAC,CAAA;IAML,CAAC;IA5FG,iBAAiB;QACb,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC;IAED,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ;QAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACvC,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,CAAC;IACL,CAAC;IA8ED,MAAM;QACF,OAAO,0CAAG,IAAI,CAAC,aAAa,EAAE,CAAI,CAAC;IACvC,CAAC;;AAnHM,qBAAY,GAAG;IAClB,YAAY,EAAE,IAAI;CACrB,AAFkB,CAElB;eAJgB,QAAQ"}
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,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AACrD,OAAO,cAAc,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,SAAS;AACT,MAAM,OAAO,GAAQ,MAAM,CAAC;AAE5B,YAAY;AACZ,MAAM,QAAQ,GAAG,gqGAAgqG,CAAC;AASjrG,CAAC;AAOD,CAAC;AACF,MAAqB,QAAS,SAAQ,KAAK,CAAC,aAA2C;IAAvF;;QAMI,UAAK,GAAG;YACJ,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,SAAS;YACnB,OAAO,EAAE,KAAK;SACjB,CAAA;QAED,aAAQ,GAAG,GAAS,EAAE;YAClB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,IAAI,QAAQ,GAAmB,SAAS,CAAC;YACzC,IAAI,OAAkB,CAAC;YACvB,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAClD,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,KAAI,oBAAoB,CAAC,IAAI,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,EAAE,CAAC;gBACtE,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,CAAA;YACxE,CAAC;YACD,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,CAAC,QAAQ,CAAC;oBACV,QAAQ,EAAE,OAAO;iBACpB,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAA,CAAA;QAeD,kBAAa,GAAG,GAAG,EAAE;YACjB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAClD,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;YAEhE,IAAI,IAAI,GAAG,SAAS,CAAC;YACrB,IAAI,QAAQ,GAAG,SAAS,CAAC;YACzB,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBAC1B,OAAO,QAAQ,CAAC,QAAQ,CAAA;gBAC5B,CAAC;qBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACpC,OAAO,SAAS,CAAC;gBACrB,CAAC;qBAAM,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACjH,OAAO,oBAAC,KAAK,IACT,KAAK,EAAE,EAAE,EACT,GAAG,EAAE,WAAW,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EACzE,OAAO,EAAE,OAAO,IAAI,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,EACxE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAC7C,CAAA;gBACN,CAAC;qBAAM,IAAI,OAAO,EAAE,CAAC;oBACjB,iEAAiE;oBACjE,OAAO,oBAAC,KAAK,IACT,KAAK,EAAE,EAAE,EACT,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,OAAO,IAAI,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAClE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAC7C,CAAA;gBACN,CAAC;qBAAM,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC/G,IAAI,OAAO,GAAG;wBACV,EAAE,EAAE;4BACA,QAAQ,EAAE,QAAQ,CAAC,IAAI;yBAC1B;qBACJ,CAAA;oBACD,OAAO,CAAC,oBAAC,GAAG,QACP,OAAO,CAAC,CAAC;wBACN,oBAAC,GAAG,IAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE;4BAC1C,oBAAC,OAAO,IAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAI,CACrF,CAAC,CAAC,CAAC,oBAAC,GAAG;wBACT,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA,CAAC,CAAC,EACrE,IAAI,EAAE,oBAAC,kBAAkB,OAAG,IAAG,IAAI,CAAU,CAC/C,CACR,CAAC,CAAA;gBACX,CAAC;qBAAM,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC/E,OAAO,oBAAC,cAAc,IAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAC3D,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,GAAI,CAAA;gBACzE,CAAC;qBAAM,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACvD,OAAO,8BAAM,SAAS,EAAC,UAAU;wBAE7B,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACtC,MAAM,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;4BACpG,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,IAAG,QAAQ,CAAC,QAAQ,CAAU;wBACjE,YAAY,CAAC,CAAC,CAAC,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACtD,MAAM,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;4BAClE,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO;4BAAC,oBAAC,gBAAgB,OAAG,CAAS,CAAC,CAAC,CAAC,IAAI,CACjD,CAAA;gBACX,CAAC;qBAAM,CAAC;oBACJ,OAAO,oBAAC,KAAK,IAAC,SAAS,EAAC,UAAU,EAAC,IAAI,EAAE,CAAC,IAErC,YAAY,CAAC,CAAC,CAAC;wBAAE,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACxD,MAAM,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;4BACvD,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,IAAG,QAAQ,CAAC,QAAQ,CAAU;wBAC9D,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAS,EAAE;gCACtC,MAAM,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;4BAClE,CAAC,CAAA,EAAE,IAAI,EAAC,OAAO,EAAC,IAAI,EAAE,oBAAC,gBAAgB,OAAG,GAAW,CAAG,CAAC,CAAC;wBAC1D,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAC,OAAO,IAAE,QAAQ,CAAC,QAAQ,CAAU,CAC/D,CAAA;gBACZ,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,SAAS,CAAC;YACrB,CAAC;QAEL,CAAC,CAAA;IAML,CAAC;IA5FG,iBAAiB;QACb,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC;IAED,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ;QAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACvC,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,CAAC;IACL,CAAC;IA8ED,MAAM;QACF,OAAO,0CAAG,IAAI,CAAC,aAAa,EAAE,CAAI,CAAC;IACvC,CAAC;;AAnHM,qBAAY,GAAG;IAClB,YAAY,EAAE,IAAI;CACrB,AAFkB,CAElB;eAJgB,QAAQ"}

package/lib/controls/file-view/index.less ADDED Viewed

@@ -0,0 +1,10 @@
+.drawer-file-view {
+    .pdf-canvas {
+        display: flex;
+        justify-content: center;
+    }
+    .pdf-canvas canvas {
+        width: 80%;
+    }
+}

package/lib/form/criteria-form.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"criteria-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAYpE,OAAO,EACW,YAAY,EAC5B,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAa3B,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAC5B,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,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IAC1E,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,~~CAmhB7C~~,CAAC;AAKF,eAAe,YAAY,CAAC"}
1	+ {"version":3,"file":"criteria-form.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAYpE,OAAO,EACW,YAAY,EAC5B,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAa3B,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAC5B,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,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IAC1E,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA0hB7C,CAAC;AAKF,eAAe,YAAY,CAAC"}

package/lib/form/criteria-form.js CHANGED Viewed

@@ -73,6 +73,12 @@ const CriteriaForm = (props) => {
             setCollapsible(true);
         }
     });
+    useEffect(() => {
+        var _a;
+        if ((_a = Object.keys(initialValues)) === null || _a === void 0 ? void 0 : _a.length) {
+            onValuesChange(initialValues, false);
+        }
+    }, [initialValues]);
     let showQueryButton = buttons.includes("query") && doSearch;
     let showDeleteButton = buttons.includes("batchDelete") && doDelete;
     let deleteButtonDisabled = !(selectedRows && selectedRows.length > 0);
@@ -214,11 +220,11 @@ const CriteriaForm = (props) => {
             ] },
             React.createElement(Select, Object.assign({ mode: "multiple" }, antdControlProps, { notFoundContent: translate("${暂无选项}"), allowClear: true, showSearch: true, showArrow: true, options: options })))) : (React.createElement(AntdForm.Item, { hidden: true, name: "drillingColIds" }));
     };
-    const onValuesChange = (changedValues, allValues) => {
+    const onValuesChange = (changedValues, clearCurrent = true) => {
         let appCtmplConfig = ProgramConfig.getAppCtmplConfig(ltmplConfig, data, props);
         if (appCtmplConfig.onCriteriaValuesChange) {
             //自定义值修改逻辑
-            appCtmplConfig.onCriteriaValuesChange(changedValues, data, form);
+            appCtmplConfig.onCriteriaValuesChange(changedValues, data, form, clearCurrent);
         }
         // if (onValuesChange) {
         //   onValuesChange();
@@ -279,7 +285,7 @@ const CriteriaForm = (props) => {
                 React.createElement(Space, { size: "small", wrap: true }, renderCriteria(r.criterias));
         });
     };
-    return (React.createElement(AntdForm, { form: form, name: "control-hooks", initialValues: initialValues, layout: "inline", onFinish: searchSubmit, onValuesChange: onValuesChange, style: { width: "100%" } },
+    return (React.createElement(AntdForm, { form: form, name: "control-hooks", initialValues: initialValues, layout: "inline", onFinish: searchSubmit, onValuesChange: (val) => onValuesChange(val), style: { width: "100%" } },
         React.createElement(Card, { size: 'small', style: { display: open ? "block" : "none", width: "100%" } },
             React.createElement(Row, null,
                 React.createElement(Col, null,

package/lib/form/criteria-form.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"criteria-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"criteria-form.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/criteria-form.tsx"],"names":[],"mappings":"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"}

package/lib/tmpl/tmpl-config-analysis.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tmpl-config-analysis.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/tmpl-config-analysis.tsx"],"names":[],"mappings":"AAGA,OAAO,EACH,WAAW,EACX,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EAAE,YAAY,EAC5B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,iBAAS,kBAAkB,SAC1B;kBADQ,kBAAkB;iCAIR,MAAM,aACV,MAAM;4BA+B4B,MAAM,UAAU,MAAM;+CA6J3D,WAAW,GAAG,WAAW,YACvB,MAAM,YACN,MAAM,iBACD,MAAM;8CA4Bb,WAAW,GAAG,WAAW,YACvB,MAAM,YACN,MAAM,iBACD,MAAM;0CAqBb,WAAW,GAAG,WAAW,YACvB,MAAM,YACN,MAAM,iBACD,MAAM;6BAkBb,WAAW,GAAG,WAAW,YACvB,MAAM;2CAmCH,WAAW,YACd,MAAM,YACN,MAAM;yCASiC,WAAW;0CAoB/C,WAAW,aACb,SAAS,SACb,cAAc;gCAyFmB,WAAW;0CA6CtC,YAAY,4BAElB,iBAAiB;;~~AAuE5B~~,eAAe,kBAAkB,CAAC"}
1	+ {"version":3,"file":"tmpl-config-analysis.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/tmpl-config-analysis.tsx"],"names":[],"mappings":"AAGA,OAAO,EACH,WAAW,EACX,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EAAE,YAAY,EAC5B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,iBAAS,kBAAkB,SAC1B;kBADQ,kBAAkB;iCAIR,MAAM,aACV,MAAM;4BA+B4B,MAAM,UAAU,MAAM;+CA6J3D,WAAW,GAAG,WAAW,YACvB,MAAM,YACN,MAAM,iBACD,MAAM;8CA4Bb,WAAW,GAAG,WAAW,YACvB,MAAM,YACN,MAAM,iBACD,MAAM;0CAqBb,WAAW,GAAG,WAAW,YACvB,MAAM,YACN,MAAM,iBACD,MAAM;6BAkBb,WAAW,GAAG,WAAW,YACvB,MAAM;2CAmCH,WAAW,YACd,MAAM,YACN,MAAM;yCASiC,WAAW;0CAoB/C,WAAW,aACb,SAAS,SACb,cAAc;gCAyFmB,WAAW;0CA6CtC,YAAY,4BAElB,iBAAiB;;AA+E5B,eAAe,kBAAkB,CAAC"}

package/lib/tmpl/tmpl-config-analysis.js CHANGED Viewed

@@ -417,9 +417,10 @@ TmplConfigAnalysis.getRules = (fieldConfig, translate) => {
 };
 TmplConfigAnalysis.buildInCtmplConfig = (ltmplConfig, criteriaData, props) => {
     if (!ltmplConfig.buildInFuncFields) {
+        const { commonCriterias, criterias } = ltmplConfig;
         //先找到有业务的
         let buildInFuncFields = [];
-        for (let field of ltmplConfig.criterias) {
+        for (let field of ((commonCriterias === null || commonCriterias === void 0 ? void 0 : commonCriterias.length) ? commonCriterias : criterias)) {
             if ((field.requiredRuleCriterias &&
                 field.requiredRuleCriterias.length > 0) ||
                 (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
@@ -442,27 +443,33 @@ TmplConfigAnalysis.buildInCtmplConfig = (ltmplConfig, criteriaData, props) => {
         ltmplConfig.buildInFuncFields = buildInFuncFields;
     }
     if (ltmplConfig.buildInFuncFields.length > 0) {
-        function setConfig(changedValues, allValues, formInstance) {
+        function setConfig(changedValues, allValues, formInstance, clearCurrent = true) {
             for (let field of ltmplConfig.buildInFuncFields) {
                 if (field.relValueField && changedValues && changedValues.hasOwnProperty("c_" + field.relValueField.id)) {
                     if (!field.baseCriteria) {
                         field.baseCriteria = {};
                     }
-                    field.baseCriteria = Object.assign(Object.assign({}, field.baseCriteria), { "secondCriteria": changedValues["c_" + field.relValueField.id] });
-                    field.configChanged = true;
-                    if (formInstance.getFieldValue(field.id)) {
-                        formInstance.setFieldValue(field.id, null);
+                    let secondCriteria = changedValues["c_" + field.relValueField.id];
+                    if ((secondCriteria === null || secondCriteria === void 0 ? void 0 : secondCriteria.includes("@R@")) || (secondCriteria === null || secondCriteria === void 0 ? void 0 : secondCriteria.includes("@,@"))) { // 处理关系字段多选
+                        secondCriteria = secondCriteria.split("@,@").map(r => r.split("@R@")[0]).join(",");
                     }
-                    if (formInstance.getFieldValue("c_" + field.id)) {
-                        formInstance.setFieldValue("c_" + field.id, null);
+                    field.baseCriteria = Object.assign(Object.assign({}, field.baseCriteria), { "secondCriteria": secondCriteria });
+                    field.configChanged = true;
+                    if (clearCurrent) { // 是否清除关联项（搜索表单初始化设置不可清除）
+                        if (formInstance.getFieldValue(field.id)) {
+                            formInstance.setFieldValue(field.id, null);
+                        }
+                        if (formInstance.getFieldValue("c_" + field.id)) {
+                            formInstance.setFieldValue("c_" + field.id, null);
+                        }
                     }
                 }
             }
         }
         //debugger
         setConfig(null, criteriaData, null);
-        ltmplConfig.onCriteriaValuesChange = (changedValues, allValues, formInstance) => {
-            setConfig(changedValues, allValues, formInstance);
+        ltmplConfig.onCriteriaValuesChange = (changedValues, allValues, formInstance, clearCurrent) => {
+            setConfig(changedValues, allValues, formInstance, clearCurrent);
         };
         return ltmplConfig;
     }

package/lib/tmpl/tmpl-config-analysis.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tmpl-config-analysis.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/tmpl-config-analysis.tsx"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"tmpl-config-analysis.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/tmpl-config-analysis.tsx"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.432",
+  "version": "0.2.434",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",
@@ -49,6 +49,7 @@
     "core-js": "^3.21.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.10",
+    "docx-preview": "^0.3.7",
     "dotenv": "^6.0.0",
     "dotenv-expand": "^4.2.0",
     "draft-js": "^0.11.7",

package/src/aldehyde/controls/2dEditor/components/card.tsx CHANGED Viewed

@@ -124,7 +124,7 @@ const Index = (props: Props) => {
                     border: `1px solid ${token.colorBorderSecondary}`
                 }}
                 onMouseDown={handleMouseDown}
-                onClick={onSelect}
+                onClick={() => isDesignMode ? onSelect() : node.onClick?.(node)}
             >
                 <Spin spinning={loading}>
                     <div className='card-title'>{title || "-"}</div>

package/src/aldehyde/controls/2dEditor/components/data.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export interface BaseNode { // 组件基本属性
     zIndex: number; // 层级
     dataSourceId?: string; // 数据源Id
     params?: { [key: string]: any }; // 数据源查询过滤条件
+    onClick?: (val: BaseNode) => void; // 组件渲染页点击事件
 }
 export interface LineProps { // 连线组件

package/src/aldehyde/controls/entity-select/popover-entity-select.tsx CHANGED Viewed

@@ -183,7 +183,9 @@ export default class PopoverEntitySelect extends React.PureComponent<
             suffixIcon={<SearchOutlined />}
             dropdownStyle={{ display: "none" }}
             onChange={(value) => {
-              onChange(value.join("@,@"));
+              // 关系字段更改选中项
+              const selOptions = selectedRows?.filter(r => value.includes(r.code))?.map(r => `${r.code}@R@${r.title}`).join("@,@");
+              onChange(selOptions || value.join("@,@"));
             }}
             options={relationOptions}
           ></Select>

package/src/aldehyde/controls/file-view/drawer-file-view.tsx CHANGED Viewed

@@ -1,75 +1,115 @@
-import * as React from 'react'
-import {Button, Drawer, Space, Spin} from 'antd'
-import {ReadOutlined,DownloadOutlined,CloseOutlined} from '@ant-design/icons'
-import {CommonFilePath} from "../../tmpl/interface";
-import HCService from "../../tmpl/hcservice-v3";
+import React, { useEffect, useRef } from 'react';
+import { Button, Drawer, Space, Spin } from 'antd';
+import { DownloadOutlined, CloseOutlined } from '@ant-design/icons';
 import loadable from '@loadable/component';
-const Loading = <Spin tip="Loading...">
-</Spin>
-const FileViewer = loadable(() =>
-    import('react-file-viewer'), {fallback: Loading});
+import { renderAsync } from 'docx-preview';
+import { CommonFilePath } from "../../tmpl/interface";
+import HCService from "../../tmpl/hcservice-v3";
+import "./index.less";
+const Loading = <Spin tip="Loading..." />;
+// 懒加载 FileViewer
+const FileViewer = loadable(() => import('react-file-viewer'), { fallback: Loading });
 interface DrawerFileViewProps {
-    filePath: CommonFilePath,
-    serverKey?:string,
-    downloadable?:boolean,
-};
+    filePath: CommonFilePath;
+    serverKey?: string;
+    downloadable?: boolean;
+    contentType?: string;
+}
-interface DrawerFileViewState {
-    drawerOpen?: boolean,
+const DrawerFileView: React.FC<DrawerFileViewProps> = (props) => {
+    const { filePath, serverKey, downloadable = true, contentType } = props;
+    const [drawerOpen, setDrawerOpen] = React.useState<boolean>(false);
+    const containerRef = useRef(null);
-};
-export default class DrawerFileView extends React.PureComponent<DrawerFileViewProps, DrawerFileViewState> {
-    static defaultProps={
-        downloadable:true,
-    }
-    state = {
-        drawerOpen: false
-    }
+    const loadDocx = async () => {
+        try {
+            const response = await fetch(filePath.path);
+            const blob = await response.blob();
+            await renderAsync(blob, containerRef.current);
+        } catch (error) {
+            console.error('Failed to load document:', error);
+        }
+    };
-    onError(e) {
-        console.log(e, 'error in file-viewer');
-    }
+    useEffect(() => {
+        if (contentType === "docx" && filePath?.path && drawerOpen) {
+            loadDocx();
+        }
+    }, [filePath, drawerOpen]);
-    onClose = () => {
-        this.setState({drawerOpen: false})
-    }
+    const onClose = () => {
+        setDrawerOpen(false);
+    };
+    const handleDownload = () => {
+        HCService.downloadDir(filePath.path, filePath.fileName);
+    };
-    render() {
-        const {filePath,downloadable,serverKey} = this.props;
-        const {drawerOpen} = this.state;
-        // @ts-ignore
-        return <span className='labelcss'>
-                        <Button type={'link'} onClick={() => {
-                            this.setState({drawerOpen: true})
-                        }} size="small" style={{margin:0}}>{filePath.fileName}</Button>
-            {downloadable? <Button type={'text'} onClick={ () => {
-                         HCService.downloadDir(filePath.path,filePath.fileName);
-                    }} size="small"><DownloadOutlined/></Button>:null}
-            {drawerOpen ? <Drawer
-                title={filePath.fileName}
-                placement={'left'}
-                closable={false}
-                onClose={this.onClose}
-                width={'1200px'}
-                open={drawerOpen}
-                extra={
-                <Space>
-                    {downloadable? <Button  onClick={ () => {
-                         HCService.downloadDir(filePath.path,filePath.fileName);
-                    }} ><DownloadOutlined/></Button>:null}
-                    <Button onClick={this.onClose}><CloseOutlined /></Button>
-                </Space>
-            }>
-                <FileViewer
-                    style={{width: '100%'}}
-                    fileType={filePath.contentType}
-                    filePath={filePath.path}
-                    errorComponent={undefined}
-                    onError={this.onError}/>
-            </Drawer> : null
-            }
-                      </span>;
+    const handleOpenDrawer = () => {
+        setDrawerOpen(true);
+    };
+    const onError = (e) => {
+        console.log(e, 'error in file-viewer');
     }
-}
+    return (
+        <span className='labelcss'>
+            <Button
+                type={'link'}
+                onClick={handleOpenDrawer}
+                size="small"
+                style={{ margin: 0 }}
+            >
+                {filePath.fileName}
+            </Button>
+            {downloadable ? (
+                <Button
+                    type={'text'}
+                    onClick={handleDownload}
+                    size="small"
+                >
+                    <DownloadOutlined />
+                </Button>
+            ) : null}
+            {drawerOpen && (
+                <Drawer
+                    title={filePath.fileName}
+                    placement={'left'}
+                    closable={false}
+                    onClose={onClose}
+                    width={'1200px'}
+                    open={drawerOpen}
+                    extra={
+                        <Space>
+                            {downloadable ? (
+                                <Button onClick={handleDownload}>
+                                    <DownloadOutlined />
+                                </Button>
+                            ) : null}
+                            <Button onClick={onClose}>
+                                <CloseOutlined />
+                            </Button>
+                        </Space>
+                    }
+                    className='drawer-file-view'
+                >
+                    {contentType === "docx" ?
+                        <div ref={containerRef} style={{ width: '100%', height: '100vh' }} /> :
+                        <FileViewer
+                            style={{ width: '100%' }}
+                            fileType={filePath.contentType}
+                            filePath={filePath.path}
+                            errorComponent={undefined}
+                            onError={onError}
+                        />}
+                </Drawer>
+            )}
+        </span>
+    );
+};
+export default DrawerFileView;

package/src/aldehyde/controls/file-view/index.less ADDED Viewed

@@ -0,0 +1,10 @@
+.drawer-file-view {
+    .pdf-canvas {
+        display: flex;
+        justify-content: center;
+    }
+    .pdf-canvas canvas {
+        width: 80%;
+    }
+}

package/src/aldehyde/controls/file-view/index.tsx CHANGED Viewed

@@ -112,7 +112,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                 </Row>)
             } else if (['xlsx', 'docx', 'csv', 'webm', 'bmp'].includes(filePath.contentType)) {
                 return <DrawerFileView serverKey={serverKey} filePath={filePath}
-                    downloadable={downloadable}></DrawerFileView>
+                    downloadable={downloadable} contentType={filePath.contentType} />
             } else if (['pdf', 'txt'].includes(filePath.contentType)) {
                 return <span className='labelcss'>
                     {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}

package/src/aldehyde/form/criteria-form.tsx CHANGED Viewed

@@ -157,6 +157,12 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     }
   });
+  useEffect(() => { // 表单初始化设置
+    if (Object.keys(initialValues)?.length) {
+      onValuesChange(initialValues, false);
+    }
+  }, [initialValues]);
   let showQueryButton = buttons.includes("query") && doSearch;
   let showDeleteButton = buttons.includes("batchDelete") && doDelete;
@@ -398,7 +404,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     );
   };
-  const onValuesChange = (changedValues, allValues) => {
+  const onValuesChange = (changedValues, clearCurrent = true) => {
     let appCtmplConfig = ProgramConfig.getAppCtmplConfig(
       ltmplConfig,
       data,
@@ -409,7 +415,8 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
       appCtmplConfig.onCriteriaValuesChange(
         changedValues,
         data,
-        form
+        form,
+        clearCurrent
       );
     }
     // if (onValuesChange) {
@@ -501,7 +508,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
       initialValues={initialValues}
       layout="inline"
       onFinish={searchSubmit}
-      onValuesChange={onValuesChange}
+      onValuesChange={(val) => onValuesChange(val)}
       style={{ width: "100%" }}
     >

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx CHANGED Viewed

@@ -490,9 +490,10 @@ TmplConfigAnalysis.buildInCtmplConfig = (
     props: CriteriaFormProps
 ) => {
     if (!ltmplConfig.buildInFuncFields) {
+        const { commonCriterias, criterias } = ltmplConfig;
         //先找到有业务的
         let buildInFuncFields = [];
-        for (let field of ltmplConfig.criterias) {
+        for (let field of (commonCriterias?.length ? commonCriterias : criterias)) {
             if (
                 (field.requiredRuleCriterias &&
                     field.requiredRuleCriterias.length > 0) ||
@@ -523,7 +524,8 @@ TmplConfigAnalysis.buildInCtmplConfig = (
         function setConfig(
             changedValues,
             allValues: DtmplData,
-            formInstance: FormInstance
+            formInstance: FormInstance,
+            clearCurrent = true
         ) {
             for (let field of ltmplConfig.buildInFuncFields) {
@@ -531,16 +533,22 @@ TmplConfigAnalysis.buildInCtmplConfig = (
                     if (!field.baseCriteria) {
                         field.baseCriteria = {}
                     }
+                    let secondCriteria = changedValues["c_" + field.relValueField.id];
+                    if (secondCriteria?.includes("@R@") || secondCriteria?.includes("@,@")) { // 处理关系字段多选
+                        secondCriteria = secondCriteria.split("@,@").map(r => r.split("@R@")[0]).join(",");
+                    }
                     field.baseCriteria = {
                         ...field.baseCriteria,
-                        "secondCriteria": changedValues["c_" + field.relValueField.id]
+                        "secondCriteria": secondCriteria
                     };
                     field.configChanged = true;
-                    if (formInstance.getFieldValue(field.id)) {
-                        formInstance.setFieldValue(field.id, null);
-                    }
-                    if (formInstance.getFieldValue("c_" + field.id)) {
-                        formInstance.setFieldValue("c_" + field.id, null);
+                    if (clearCurrent) { // 是否清除关联项（搜索表单初始化设置不可清除）
+                        if (formInstance.getFieldValue(field.id)) {
+                            formInstance.setFieldValue(field.id, null);
+                        }
+                        if (formInstance.getFieldValue("c_" + field.id)) {
+                            formInstance.setFieldValue("c_" + field.id, null);
+                        }
                     }
                 }
             }
@@ -548,8 +556,8 @@ TmplConfigAnalysis.buildInCtmplConfig = (
         //debugger
         setConfig(null, criteriaData, null);
-        ltmplConfig.onCriteriaValuesChange = (changedValues, allValues, formInstance) => {
-            setConfig(changedValues, allValues, formInstance);
+        ltmplConfig.onCriteriaValuesChange = (changedValues, allValues, formInstance, clearCurrent?: boolean) => {
+            setConfig(changedValues, allValues, formInstance, clearCurrent);
         };
         return ltmplConfig;
     } else {