aldehyde 0.2.78 → 0.2.79

package/lib/controls/action/index.js

@@ -29,7 +29,7 @@ class Action extends React.PureComponent {
                 }
                 if (upperFormValue) {
                     if (upperFormValue.getFieldValue(fieldConfig.id)) {
-                        value[fieldConfig.id] = ActionUtils.getFormRefValue(formRef, fieldConfig.id);
+                        value[fieldConfig.id] = ActionUtils.getFormRefValue(formRef.current, fieldConfig.id);
                     }
                     else {
                         if (dtmplValue) {

package/lib/controls/action/index.js.map

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

package/lib/controls/action/utils.d.ts

@@ -1,9 +1,10 @@
-import { ActionConfig, Comparator, DtmplData } from "../../tmpl/interface";
+import { ActionConfig, Comparator, DtmplData, DtmplConfig, FieldConfig } from "../../tmpl/interface";
 import { RefObject } from "react";
 import { FormInstance } from "antd/lib/form/hooks/useForm";
 export default class ActionUtils {
     static isShow(actionConfig: ActionConfig, data: DtmplData[] | object[], formRef: RefObject<FormInstance>): boolean;
+    static isMatch(fieldConfigs: FieldConfig[], data: DtmplData[] | object[], formInstance: FormInstance, dtmplConfig: DtmplConfig): boolean;
     static comparator(comparator: Comparator, value: string, defaultValue: string): boolean;
-    static getFormRefValue(formRef: any, key: any): any;
+    static getFormRefValue(formInstance: FormInstance, key: any): any;
 }
 //# sourceMappingURL=utils.d.ts.map

package/lib/controls/action/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,UAAU,EAAE,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAIzD,MAAM,CAAC,OAAO,OAAO,WAAW;IAE5B,MAAM,CAAE,MAAM,CAAC,YAAY,EAAC,YAAY,EAAE,IAAI,EAAC,SAAS,EAAE,GAAE,MAAM,EAAE,EAAE,OAAO,EAAC,SAAS,CAAC,YAAY,CAAC;IAsDrG,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IA2C7E,MAAM,CAAC,eAAe,CAAC,OAAO,KAAA,EAAE,GAAG,KAAA;CAUtC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,UAAU,EAAE,SAAS,EAAC,WAAW,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAKzD,MAAM,CAAC,OAAO,OAAO,WAAW;IAC5B,MAAM,CAAE,MAAM,CAAC,YAAY,EAAC,YAAY,EAAE,IAAI,EAAC,SAAS,EAAE,GAAE,MAAM,EAAE,EAAE,OAAO,EAAC,SAAS,CAAC,YAAY,CAAC;IAQrG,MAAM,CAAE,OAAO,CAAC,YAAY,EAAC,WAAW,EAAE,EAAE,IAAI,EAAC,SAAS,EAAE,GAAE,MAAM,EAAE,EAAE,YAAY,EAAC,YAAY,EAAC,WAAW,EAAC,WAAW;IAmDzH,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IA2C7E,MAAM,CAAC,eAAe,CAAC,YAAY,EAAC,YAAY,EAAE,GAAG,KAAA;CAUxD"}

package/lib/controls/action/utils.js

@@ -1,46 +1,52 @@
 import { message } from "antd";
+import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
 export default class ActionUtils {
     static isShow(actionConfig, data, formRef) {
-        //所有data都必须满足条件才能显示
-        //let comparator=actionConfig.comparator;
         let preFieldConfigs = actionConfig.preposes;
         if (!preFieldConfigs || preFieldConfigs.length <= 0) {
             return true;
         }
-        let isShow = true;
-        if (formRef && formRef.current) {
-            for (let fieldConfig of preFieldConfigs) {
+        return this.isMatch(preFieldConfigs, data, formRef === null || formRef === void 0 ? void 0 : formRef.current, null);
+    }
+    static isMatch(fieldConfigs, data, formInstance, dtmplConfig) {
+        //所有data都必须满足条件才能显示
+        //let comparator=actionConfig.comparator;
+        debugger;
+        let isMatch = true;
+        if (formInstance) {
+            for (let fieldConfig of fieldConfigs) {
                 if (!fieldConfig) {
                     continue;
                 }
-                let value = this.getFormRefValue(formRef, fieldConfig.id);
+                let fieldId = dtmplConfig ? TmplConfigAnalysis.getFieldId(dtmplConfig, fieldConfig.mstrucId) : fieldConfig.id;
+                let value = this.getFormRefValue(formInstance, fieldId);
                 // if (value) {
                 if (!this.comparator(fieldConfig.comparator, value, fieldConfig.defaultValue)) {
-                    isShow = false;
+                    isMatch = false;
                     break;
                 }
             }
         }
         else if (data) {
             for (let d of data) {
-                if (!isShow) {
+                if (!isMatch) {
                     break;
                 }
                 if (!d) {
-                    isShow = false;
+                    isMatch = false;
                     break;
                 }
-                for (let fieldConfig of preFieldConfigs) {
+                for (let fieldConfig of fieldConfigs) {
                     if (d['fieldMap']) {
                         if (!this.comparator(fieldConfig.comparator, d['fieldMap'][fieldConfig.id], fieldConfig.defaultValue)) {
-                            isShow = false;
+                            isMatch = false;
                             break;
                         }
                     }
                     else {
                         // debugger
                         if (!this.comparator(fieldConfig.comparator, d[fieldConfig.id], fieldConfig.defaultValue)) {
-                            isShow = false;
+                            isMatch = false;
                             break;
                         }
                     }
@@ -48,9 +54,9 @@ export default class ActionUtils {
             }
         }
         else {
-            isShow = false;
+            isMatch = false;
         }
-        return isShow;
+        return isMatch;
     }
     static comparator(comparator, value, defaultValue) {
         let dvs;
@@ -90,10 +96,10 @@ export default class ActionUtils {
                 return;
         }
     }
-    static getFormRefValue(formRef, key) {
-        if (formRef && formRef.current) {
+    static getFormRefValue(formInstance, key) {
+        if (formInstance) {
             // console.log("formRef.current.getFieldsValue",formRef.current.getFieldValue(key));
-            return formRef.current.getFieldValue(key);
+            return formInstance.getFieldValue(key);
         }
         else {
             return false;

package/lib/controls/action/utils.js.map

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

package/lib/form/form-Item-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-Item-group.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAA;AAEtC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAG9C,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAIzD,MAAM,WAAW,eAAe;IAC5B,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;CACrC;AAED,UAAU,eAAe;IACrB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAE5F,MAAM,CAAC,YAAY;;;MAGlB;gBAEW,KAAK,KAAA;IAOjB,SAAS,wBAIR;IAGD,WAAW,SAAU,WAAW,wBAY/B;IAED,cAAc,SAAU,WAAW,iBAYlC;IACD,YAAY,gBAAiB,WAAW,wCAsBvC;IAED,YAAY,0BAqDX;IAED,MAAM;CAKT"}
+{"version":3,"file":"form-Item-group.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAA;AAEtC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAG9C,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAIzD,MAAM,WAAW,eAAe;IAC5B,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;CACrC;AAED,UAAU,eAAe;IACrB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAE5F,MAAM,CAAC,YAAY;;;MAGlB;gBAEW,KAAK,KAAA;IAOjB,SAAS,wBAIR;IAGD,WAAW,SAAU,WAAW,wBAY/B;IAED,cAAc,SAAU,WAAW,iBAUlC;IACD,YAAY,gBAAiB,WAAW,wCAkBvC;IAED,YAAY,0BAqDX;IAED,MAAM;CAKT"}

package/lib/form/form-Item-group.js

@@ -31,9 +31,7 @@ class FormItemGroup extends React.PureComponent {
             const { formRef } = this.props;
             let fieldConfig = item;
             if (item.updateSelf) {
-                //item.value=formRef.current?formRef.current.getFieldValue(item.id):item.defaultValue;
                 fieldConfig = item.updateSelf(formRef.current);
-                //formRef.current.setFieldValue(item.id,fieldConfig.value);
             }
             else {
                 fieldConfig = item;
@@ -45,11 +43,6 @@ class FormItemGroup extends React.PureComponent {
             const { nameAttr, maxColsOnRow, mainCode, serverKey } = this.props;
             let item = this.getFieldConfig(fieldConfig);
             const title = item.title;
-            // let fieldValue = valueMap ? valueMap[item.id] : undefined;
-            //const fieldKey = item.id + Math.random() * 100;
-            //fieldValue = (fieldValue || fieldValue == 0) ? fieldValue : item.defaultValue ? Units.configParamTrans(item.defaultValue) : undefined;
-            //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
-            // console.log("表单值：", valueMap[item.id], fieldValue);
             return 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 ? [{
                         required: true, message: `请输入${title}`,
                     }] : undefined },

package/lib/form/form-Item-group.js.map

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

package/lib/layout/menu/l2menu-message-bar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2menu-message-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-message-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAA;AAG1C,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKhD,UAAU,qBAAqB;IAC3B,cAAc,CAAC,EAAC,MAAM,CAAC;CAC1B;AAED,UAAU,UAAU;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,qBAAqB;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAC,OAAO,CAAC;CACrB;AAGD,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC5F,KAAK;;;MAGJ;IACD,MAAM,CAAE,YAAY;;MAEnB;IAEK,iBAAiB;IA2BvB,gBAAgB,gBAAiB,UAAU,EAAE,uBAiD5C;IAGD,MAAM;CAQT;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"l2menu-message-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-message-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAA;AAG1C,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKhD,UAAU,qBAAqB;IAC3B,cAAc,CAAC,EAAC,MAAM,CAAC;CAC1B;AAED,UAAU,UAAU;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,qBAAqB;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAC,OAAO,CAAC;CACrB;AAGD,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC5F,KAAK;;;MAGJ;IACD,MAAM,CAAE,YAAY;;MAEnB;IAEK,iBAAiB;IA+BvB,gBAAgB,gBAAiB,UAAU,EAAE,uBAiD5C;IAGD,MAAM;CAQT;AAED,eAAe,gBAAgB,CAAC"}

package/lib/layout/menu/l2menu-message-bar.js

@@ -66,9 +66,12 @@ class L2MenuMessageBar extends React.PureComponent {
     }
     componentDidMount() {
         return __awaiter(this, void 0, void 0, function* () {
-            let l2Menus = yield HCDataSource.messageMenus();
+            let l2Menus = yield HCDataSource.fastMenu('MessageBar');
             const messageBars = [];
             for (const item of l2Menus) {
+                if (item.disabled) {
+                    continue;
+                }
                 const messageBar = {
                     l2Menu: item,
                     count: 0,

package/lib/layout/menu/l2menu-message-bar.js.map

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

package/lib/layout/menu/l2menu-quick-bar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2menu-quick-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAA;AAG1C,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAIhD,UAAU,mBAAmB;IACzB,cAAc,CAAC,EAAC,MAAM,CAAC;CAC1B;AAED,UAAU,QAAQ;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,mBAAmB;IACzB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAC,OAAO,CAAC;IAClB,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAC,OAAO,CAAC;CACrB;AAGD,cAAM,cAAe,SAAQ,KAAK,CAAC,aAAa,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACtF,KAAK;;;;;MAKJ;IACD,MAAM,CAAE,YAAY;;MAEnB;IAEK,iBAAiB;IAevB,QAAQ,cAAY,MAAM,UAOzB;IAED,WAAW,aAIV;IAED,cAAc,cAAe,QAAQ,EAAE,uBAmCtC;IAGD,MAAM;CA2BT;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"l2menu-quick-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAA;AAG1C,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAIhD,UAAU,mBAAmB;IACzB,cAAc,CAAC,EAAC,MAAM,CAAC;CAC1B;AAED,UAAU,QAAQ;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,mBAAmB;IACzB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAC,OAAO,CAAC;IAClB,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAC,OAAO,CAAC;CACrB;AAGD,cAAM,cAAe,SAAQ,KAAK,CAAC,aAAa,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACtF,KAAK;;;;;MAKJ;IACD,MAAM,CAAE,YAAY;;MAEnB;IAEK,iBAAiB;IAkBvB,QAAQ,cAAY,MAAM,UAOzB;IAED,WAAW,aAIV;IAED,cAAc,cAAe,QAAQ,EAAE,uBAmCtC;IAGD,MAAM;CA2BT;AAED,eAAe,cAAc,CAAC"}

package/lib/layout/menu/l2menu-quick-bar.js

@@ -65,9 +65,12 @@ class L2MenuQuickBar extends React.PureComponent {
     }
     componentDidMount() {
         return __awaiter(this, void 0, void 0, function* () {
-            let l2Menus = yield HCDataSource.quickEntranceMenus();
+            let l2Menus = yield HCDataSource.fastMenu('QuickQueryBar');
             const quickBars = [];
             for (const item of l2Menus) {
+                if (item.disabled) {
+                    continue;
+                }
                 const quickBar = {
                     l2Menu: item,
                     count: 0,

package/lib/layout/menu/l2menu-quick-bar.js.map

@@ -1 +1 @@
-{"version":3,"file":"l2menu-quick-bar.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAsB,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,EAAC,MAAM,MAAM,CAAA;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAA;AACpD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAmBlD,MAAM,cAAe,SAAQ,KAAK,CAAC,aAAuD;IAA1F;;QACI,UAAK,GAAC;YACF,SAAS,EAAC,SAAS;YACnB,QAAQ,EAAC,KAAK;YACd,SAAS,EAAC,SAAS;YACnB,QAAQ,EAAC,KAAK;SACjB,CAAA;QAoBD,aAAQ,GAAC,CAAC,SAAgB,EAAC,EAAE;YACzB,8CAA8C;YAC9C,IAAI,CAAC,QAAQ,CAAC;gBACV,SAAS;gBACT,QAAQ,EAAC,IAAI;aAChB,CAAC,CAAA;QAEN,CAAC,CAAA;QAED,gBAAW,GAAC,GAAE,EAAE;YACZ,IAAI,CAAC,QAAQ,CAAC;gBACV,QAAQ,EAAC,KAAK;aACjB,CAAC,CAAA;QACN,CAAC,CAAA;QAED,mBAAc,GAAG,CAAC,SAAqB,EAAE,EAAE;YACvC,MAAM,EAAC,cAAc,EAAC,GAAC,IAAI,CAAC,KAAK,CAAA;YACjC,IAAK,KAAK,GAAQ,CAAC,CAAC;YACpB,MAAM,IAAI,GAAe,EAAC,0BAA0B,EAAC,cAAc,EAAkB,CAAC;YACtF,MAAM,IAAI,GAAG,CACT,oBAAC,IAAI,IAAC,GAAG,EAAE,CAAC,IACN,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;gBAChC,IAAG,QAAQ,CAAC,KAAK,EAAC;oBACd,KAAK,GAAC,KAAK,GAAC,QAAQ,CAAC,KAAK,CAAC;iBAC9B;gBACN,OAAO,oBAAC,IAAI,CAAC,IAAI,IAAC,GAAG,EAAE,KAAK;oBACxB,8BAAM,OAAO,EAAE,GAAE,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAC9C,QAAQ,CAAC,MAAM,CAAC,KAAK,CACpB,CAEI,CAAA;YAClB,CAAC,CAAC,CACK,CACV,CAAC;YAEF,IAAG,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,IAAE,CAAC,EAAC;gBACjC,OAAO;aACV;iBAAK,IAAG,SAAS,CAAC,MAAM,IAAE,CAAC,EAAC;gBACzB,IAAI,QAAQ,GAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;gBAC/B,OAAO,CAAC,6BAAM,SAAS,EAAE,aAAa,EAAG,KAAK,EAAE,IAAI,EAAG,OAAO,EAAE,GAAE,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChG,8BAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;wBAAG,oBAAC,gBAAgB,OAAG,CAAO,CAC9E,CAAC,CAAA;aACV;iBAAI;gBACD,OAAO,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,cAAc;oBACpD,6BAAM,SAAS,EAAE,aAAa,EAAG,KAAK,EAAE,IAAI;wBACzC,8BAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;4BAAG,oBAAC,gBAAgB,OAAG,CAAO,CAC5E,CACC,CAAA;aACd;QACL,CAAC,CAAA;IA8BL,CAAC;IA/FS,iBAAiB;;YACnB,IAAI,OAAO,GAAG,MAAM,YAAY,CAAC,kBAAkB,EAAE,CAAC;YACtD,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;gBACzB,MAAM,QAAQ,GAAU;oBACpB,MAAM,EAAC,IAAI;oBACX,KAAK,EAAC,CAAC;iBACV,CAAC;gBACF,IAAI,IAAI,GAAC,IAAI,CAAC;gBACb,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC5B;YACD,IAAI,CAAC,QAAQ,CAAC;gBACV,SAAS;aACZ,CAAC,CAAC;QACP,CAAC;KAAA;IAsDD,MAAM;QACF,MAAM,EAAC,SAAS,EAAC,QAAQ,EAAC,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAClD,OAAO,CACH;YACK,SAAS,CAAA,CAAC,CAAA,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA,CAAC,CAAA,EAAE;YAC5C,oBAAC,MAAM,IACH,SAAS,EAAE,MAAM,EACjB,KAAK,EAAC,0BAAM,EACZ,QAAQ,EAAE,IAAI,EACd,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,IAAI,CAAC,WAAW,EACzB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE;oBACH,QAAQ,EAAE,IAAI;iBACjB,EACD,KAAK,EACD,oBAAC,KAAK;oBACF,oBAAC,MAAM,IAAC,OAAO,EAAE,IAAI,CAAC,WAAW,mBAAa,CAC1C;gBAGb,oBAAC,UAAU,IAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,GAAe,CACzD,CACV,CACN,CAAC;IACN,CAAC;;AAlGO,2BAAY,GAAC;IACjB,cAAc,EAAC,SAAS;CAC3B,AAFmB,CAEnB;AAmGL,eAAe,cAAc,CAAC"}
+{"version":3,"file":"l2menu-quick-bar.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/menu-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,MAAM,OAAO,CAAC;;uBAOH,SAAS;uBAST,CAAC,UAAU,CAAC,EAAE;wBAiBb,CAAC,UAAU,GAAE,SAAS,CAAC,EAAE;uBAmB1B,UAAU;wBAqCT,UAAU;0BAsBR,SAAS,mBAAmB,MAAM;;AA1G5D,wBA2IC"}
+{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,MAAM,OAAO,CAAC;;uBAOH,SAAS;uBAST,CAAC,UAAU,CAAC,EAAE;wBAiBb,CAAC,UAAU,GAAE,SAAS,CAAC,EAAE;uBAsC1B,UAAU;wBAqCT,UAAU;0BAsBR,SAAS,mBAAmB,MAAM;;AA7H5D,wBA8JC"}

package/lib/layout/menu/menu-render.js

@@ -1,3 +1,4 @@
+import { Tooltip } from "antd";
 import React from "react";
 import { NavLink } from 'react-router-dom';
 import Units from "../../units";
@@ -39,9 +40,27 @@ export default {
                 }
                 else {
                     let i = item;
-                    menu.label = this.toL2MenuTitle(i, target, basePath);
+                    if (i.disabled) {
+                        if (i.hiddenOnDisabled) {
+                            menu = null;
+                        }
+                        else {
+                            menu.disabled = i.disabled;
+                            if (i.tip) {
+                                menu.label = React.createElement(Tooltip, { placement: "top", title: i.tip }, i.title);
+                            }
+                            else {
+                                menu.label = i.title;
+                            }
+                        }
+                    }
+                    else {
+                        menu.label = this.toL2MenuTitle(i, target, basePath);
+                    }
+                }
+                if (menu) {
+                    menus.push(menu);
                 }
-                menus.push(menu);
             });
         }
         return menus;

package/lib/layout/menu/menu-render.js.map

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

package/lib/tmpl/hc-data-source.d.ts

@@ -15,9 +15,8 @@ declare namespace HCDataSource {
     var getEnumOption: (mstrucId: string, enumValue: string) => EnumItem;
     var getEnumValueColor: (mstrucId: string, enumValue: string) => string;
     var requestBlocks: (l2MenuId: string, blockId: string) => Promise<any>;
-    var quickEntranceMenus: () => Promise<Level2Menu[]>;
-    var messageMenus: () => Promise<Level2Menu[]>;
-    var workbenchMenus: () => Promise<Level2Menu[]>;
+    var initfastMenu: () => Promise<void>;
+    var fastMenu: (key: string) => Promise<Level2Menu[]>;
     var reload: (roles: string[]) => Promise<void>;
     var cache: (data: DtmplData) => void;
     var getFromCache: (code: string) => DtmplData;

package/lib/tmpl/hc-data-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hc-data-source.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hc-data-source.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,WAAW,EACX,SAAS,EACT,QAAQ,EACR,SAAS,EACT,UAAU,EAEV,cAAc,EACd,YAAY,EAAE,WAAW,EAC5B,MAAM,aAAa,CAAC;AAoHrB,iBAAS,YAAY,SAEpB;kBAFQ,YAAY;;;;;;;;;;;;;;;;;;;;;;;AAqOrB,eAAe,YAAY,CAAC"}
+{"version":3,"file":"hc-data-source.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hc-data-source.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,WAAW,EACX,SAAS,EACT,QAAQ,EACR,SAAS,EACT,UAAU,EAEV,cAAc,EACd,YAAY,EACZ,WAAW,EACd,MAAM,aAAa,CAAC;AAqHrB,iBAAS,YAAY,SAEpB;kBAFQ,YAAY;;;;;;;;;;;;;;;;;;;;;;AA8PrB,eAAe,YAAY,CAAC"}

package/lib/tmpl/hc-data-source.js

@@ -12,9 +12,10 @@ import ControlTypeSupportor from './control-type-supportor';
 import { message } from "antd";
 const blocksCache = [];
 let programName;
-const quickEntranceCache = [];
-const messageCache = [];
-const workbenchCache = [];
+// const quickEntranceCache: Level2Menu[] = [];
+// const messageCache: Level2Menu[] = [];
+// const workbenchCache: Level2Menu[] = [];
+const fastMenuCache = new Map();
 const enumMap = new Map(); //key mstrucId
 // const optionsMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();//key mstrucId
 const selectConfigMap = new Map();
@@ -276,36 +277,55 @@ HCDataSource.requestBlocks = (l2MenuId, blockId) => __awaiter(void 0, void 0, vo
     }
     return result;
 });
-HCDataSource.quickEntranceMenus = () => __awaiter(void 0, void 0, void 0, function* () {
-    let result;
-    if (quickEntranceCache.length < 1) {
-        let quicks = yield HcserviceV3.requestFaceplate_menu();
-        if (quicks) {
-            quickEntranceCache.splice(0, quickEntranceCache.length);
-            quickEntranceCache.push(...quicks);
-        }
-    }
-    return [...quickEntranceCache];
-});
-HCDataSource.messageMenus = () => __awaiter(void 0, void 0, void 0, function* () {
-    let result;
-    if (messageCache.length < 1) {
-        let bars = yield HcserviceV3.requestMessagebar();
-        if (bars) {
-            messageCache.push(...bars);
+HCDataSource.initfastMenu = () => __awaiter(void 0, void 0, void 0, function* () {
+    // let result:Map<string,Level2Menu[]> ;
+    if (fastMenuCache.size < 1) {
+        let re = yield HcserviceV3.requestFastMenu();
+        if (re) {
+            for (let e in re) {
+                fastMenuCache.set(e, re[e]);
+            }
         }
     }
-    return [...messageCache];
 });
-HCDataSource.workbenchMenus = () => __awaiter(void 0, void 0, void 0, function* () {
-    if (workbenchCache.length < 1) {
-        let sm = yield HcserviceV3.requestFaceplateStatistic_menu();
-        if (sm) {
-            workbenchCache.push(...sm);
-        }
+HCDataSource.fastMenu = (key) => __awaiter(void 0, void 0, void 0, function* () {
+    // let result:Map<string,Level2Menu[]> ;
+    if (fastMenuCache.size < 1) {
+        yield HCDataSource.initfastMenu();
     }
-    return [...workbenchCache];
+    return fastMenuCache.get(key);
 });
+// HCDataSource.quickEntranceMenus = async () => {
+//     let result: Level2Menu[];
+//     if (quickEntranceCache.length < 1) {
+//         let quicks = await HcserviceV3.requestFaceplate_menu();
+//         if (quicks) {
+//             quickEntranceCache.splice(0, quickEntranceCache.length);
+//             quickEntranceCache.push(...quicks);
+//         }
+//     }
+//     return [...quickEntranceCache];
+// }
+// HCDataSource.messageMenus = async () => {
+//     let result: Level2Menu[];
+//     if (messageCache.length < 1) {
+//         let bars = await HcserviceV3.requestMessagebar();
+//         if (bars) {
+//             messageCache.push(...bars);
+//         }
+//     }
+//     return [...messageCache];
+// }
+//
+// HCDataSource.workbenchMenus = async () => {
+//     if (workbenchCache.length < 1) {
+//       let sm= await HcserviceV3.requestFaceplateStatistic_menu();
+//       if(sm){
+//           workbenchCache.push(...sm);
+//       }
+//     }
+//     return [...workbenchCache];
+// }
 HCDataSource.reload = function (roles) {
     return __awaiter(this, void 0, void 0, function* () {
         // if(roles.includes("admin")){
@@ -334,6 +354,7 @@ HCDataSource.getFromCache = function (code) {
 };
 HCDataSource.clear = function () {
     return __awaiter(this, void 0, void 0, function* () {
+        fastMenuCache.clear();
         enumMap.clear();
         ltmplConfigMap.clear();
         dtmplConfigMap.clear();
@@ -343,9 +364,9 @@ HCDataSource.clear = function () {
         l2LtmplConfigMap.clear();
         // optionsMap.clear();
         blocksCache.splice(0, blocksCache.length);
-        quickEntranceCache.splice(0, quickEntranceCache.length);
-        messageCache.splice(0, quickEntranceCache.length);
-        workbenchCache.splice(0, workbenchCache.length);
+        // quickEntranceCache.splice(0, quickEntranceCache.length);
+        // messageCache.splice(0, quickEntranceCache.length);
+        // workbenchCache.splice(0, workbenchCache.length);
         objctCacheMap.clear();
     });
 };

package/lib/tmpl/hc-data-source.js.map

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

package/lib/tmpl/hcservice-v3.d.ts

@@ -52,8 +52,6 @@ export default class HcserviceV3 {
     static getFileUrl(serverKey: string, path: any): string;
     static getFileTxtUrl(serverKey: string, path: any): string;
     static loadFileTxt(serverKey: string, path: any): Promise<any>;
-    static requestFaceplate_menu(): Promise<any>;
-    static requestFaceplateStatistic_menu(): Promise<any>;
     static requestBlocks(l2MenuId: string, blockId: string): Promise<any>;
     static logout(): Promise<void>;
     static resetPassword(serverKey: string, oPassword: string, nPassword: string, pubkey: any): Promise<any>;
@@ -64,8 +62,7 @@ export default class HcserviceV3 {
     static getKaptchaToken(programCode?: string): Promise<any>;
     static getRasPubkey(serverKey?: string, programCode?: string): Promise<any>;
     static getUser(programCode?: string, hydrocarbonToken?: string): Promise<any>;
-    static requestMessagebar(): Promise<any>;
-    static requestSimpleCharts(): Promise<any>;
+    static requestFastMenu(): Promise<any>;
     static reload(): Promise<any>;
     static initProgramConfig(ProgramConfigJson: any): Promise<void>;
 }