@zgfe/business-lib 1.2.53 → 1.2.54-plat.0

package/es/userTagsSelector/cascaderOverlay.js

@@ -36,7 +36,8 @@ var CascaderOverlay = function CascaderOverlay(props) {
     labelFields = props.labelFields,
     keyFields = props.keyFields,
     valueFields = props.valueFields,
-    childFields = props.childFields;
+    childFields = props.childFields,
+    isOpenLayer = props.isOpenLayer;
   var timer = useRef(null);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -162,7 +163,8 @@ var CascaderOverlay = function CascaderOverlay(props) {
         labelGroup: currentSelect,
         pageNo: pageNo,
         pageSize: 20,
-        labelName: highlightText
+        labelName: highlightText,
+        isOpenLayer: isOpenLayer || true
       }
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.data) && res.data.results) {
@@ -172,6 +174,11 @@ var CascaderOverlay = function CascaderOverlay(props) {
             if (item.labelGroup === currentSelect) {
               item.children = pageNo === 1 ? _toConsumableArray(result) : item.children.concat(result);
             }
+            if (!isOpenLayer) {
+              item.children.forEach(function (element) {
+                element.layers = [];
+              });
+            }
             return _objectSpread({}, item);
           });
         });
@@ -209,7 +216,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
   }
   function onClickTag(data) {
     setCurrentTag(data);
-    if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.firstAndLastUpdate || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.fundingSource || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.eventPreference || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.sqlCreateTable) {
+    if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.firstAndLastUpdate || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.fundingSource || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.eventPreference || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.sqlCreateTable || !isOpenLayer) {
       var newValue = [{
         id: groupMap[currentSelect].id,
         labelGroup: currentSelect
@@ -230,7 +237,11 @@ var CascaderOverlay = function CascaderOverlay(props) {
       });
       if (_index === -1) {
         if (currentValue.length >= 20) return;
-        props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
+        if (isOpenLayer) {
+          props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
+        } else {
+          props.onChange([newValue]);
+        }
       } else {
         currentValue.splice(_index, 1);
         props.onChange(_toConsumableArray(currentValue));
@@ -269,7 +280,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
         getTagsByGroup(Math.floor(groupMap[currentSelect].children.length / 20) + 1);
       },
       onClick: onClickTag
-    }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.firstAndLastUpdate && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.fundingSource && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.eventPreference && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.sqlCreateTable && /*#__PURE__*/React.createElement("div", {
+    }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), isOpenLayer && currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.firstAndLastUpdate && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.fundingSource && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.eventPreference && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.sqlCreateTable && /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-overlay-selections")
     }, /*#__PURE__*/React.createElement(MultipleCheckPanel, {
       valueField: valueFields[2],
@@ -299,6 +310,7 @@ CascaderOverlay.defaultProps = {
   childFields: ['children', 'layers'],
   keyFields: ['labelGroup', 'id', 'layerLabelId'],
   labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
-  valueFields: ['labelGroup', 'id', 'layerLabelId']
+  valueFields: ['labelGroup', 'id', 'layerLabelId'],
+  isOpenLayer: true
 };
 export default CascaderOverlay;

package/es/userTagsSelector/index.js

@@ -26,7 +26,8 @@ var UserTagsSelect = function UserTagsSelect(props) {
     labelFields = props.labelFields,
     childFields = props.childFields,
     keyFields = props.keyFields,
-    valueFields = props.valueFields;
+    valueFields = props.valueFields,
+    isOpenLayer = props.isOpenLayer;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     currentValue = _useState2[0],
@@ -42,7 +43,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
       var pre_text = pre[labelFields[labelFields.length - 2]];
       var last_text = last[labelFields[labelFields.length - 1]];
       var res = _objectSpread(_objectSpread({}, last), {}, {
-        handleText: (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 3 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 6 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === LabelCreateType.sqlCreateTable ? pre_text : "".concat(pre_text, "\uFF1A").concat(last_text)
+        handleText: (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 3 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 6 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === LabelCreateType.sqlCreateTable || !isOpenLayer ? pre_text : "".concat(pre_text, "\uFF1A").concat(last_text)
       });
       return res;
     });
@@ -75,6 +76,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
       keyFields: keyFields,
       labelFields: labelFields,
       data: data,
+      isOpenLayer: isOpenLayer,
       onChange: onChange
     });
   }
@@ -105,6 +107,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
   }))));
 };
 UserTagsSelect.defaultProps = {
-  destroyPopupOnHide: false
+  destroyPopupOnHide: false,
+  isOpenLayer: true
 };
 export default UserTagsSelect;

package/es/userTagsSelector/types.d.ts

@@ -30,6 +30,7 @@ export declare namespace UserTagsSelectorTypes {
         defaultCurrent?: string[];
         onChange: Function;
         destroyPopupOnHide?: boolean;
+        isOpenLayer?: boolean;
     }
     interface CascaderOverlayProps {
         className?: string;
@@ -40,6 +41,7 @@ export declare namespace UserTagsSelectorTypes {
         valueFields?: string[];
         currentValue: Value;
         onChange: (val: Value) => void;
+        isOpenLayer?: boolean;
     }
     interface Groups {
         data: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.53",
+    "version": "1.2.54-plat.0",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "ba9a9d18dfdcab3ac09e1b55b17d549a04b29045",
+    "gitHead": "61f2895d3451a2a2d81b55dffcdb66629d55c482",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }