@zgfe/business-lib 1.2.58-ljy.0 → 1.2.66-hxd.2

package/es/userCondition/styles/index.less

@@ -1,33 +1,33 @@
-@import '../../assets/styles/variable.less';
-.biz-user-condition {
-  width: 100%;
-  min-width: 0;
-  &-conditions-content {
-    display: flex;
-    .biz-user-condition-and-conditions-wrap {
-      flex: 1;
-      margin-bottom: @margin-lg;
-      &.text-mode {
-        display: flex;
-        flex-wrap: wrap;
-        min-width: 0;
-        margin-bottom: 0;
-        line-height: 32px;
-        border: none;
-        .biz-user-condition-and-desc {
-          margin: 0 @margin-xs;
-        }
-      }
-    }
-    .biz-user-condition-and-conditions-empty {
-      margin-bottom: 0;
-    }
-  }
-  &-tip {
-    margin-top: @margin-lg;
-    color: @warning-color;
-    span {
-      margin-right: @margin-xs;
-    }
-  }
-}
+@import '../../assets/styles/variable.less';
+.biz-user-condition {
+  width: 100%;
+  min-width: 0;
+  &-conditions-content {
+    display: flex;
+    .biz-user-condition-and-conditions-wrap {
+      flex: 1;
+      margin-bottom: @margin-lg;
+      &.text-mode {
+        display: flex;
+        flex-wrap: wrap;
+        min-width: 0;
+        margin-bottom: 0;
+        line-height: 32px;
+        border: none;
+        .biz-user-condition-and-desc {
+          margin: 0 @margin-xs;
+        }
+      }
+    }
+    .biz-user-condition-and-conditions-empty {
+      margin-bottom: 0;
+    }
+  }
+  &-tip {
+    margin-top: @margin-lg;
+    color: @warning-color;
+    span {
+      margin-right: @margin-xs;
+    }
+  }
+}

package/es/userCondition/styles/orConditions.less

@@ -1,34 +1,34 @@
-@import '../../assets/styles/variable.less';
-.biz-user-condition-or {
-  &:not(:last-child) {
-    margin-bottom: @margin-lg;
-  }
-  &.text-mode {
-    display: flex;
-    min-width: 0;
-    // align-items: center;
-    margin-bottom: 0;
-    .biz-user-condition-or-content {
-      margin-bottom: 0;
-      border: none;
-      .biz-user-condition-conditions {
-        padding: 0;
-      }
-    }
-  }
-  &-content {
-    display: flex;
-    width: 100%;
-
-    background: #ffffff;
-    border: 1px solid @border-color-base;
-    border-radius: @border-radius-small;
-    &:not(:last-child) {
-      margin-bottom: @margin-md;
-    }
-    .biz-user-condition-conditions {
-      flex: 1;
-      padding: @padding-xs @padding-md 0 0;
-    }
-  }
-}
+@import '../../assets/styles/variable.less';
+.biz-user-condition-or {
+  &:not(:last-child) {
+    margin-bottom: @margin-lg;
+  }
+  &.text-mode {
+    display: flex;
+    min-width: 0;
+    // align-items: center;
+    margin-bottom: 0;
+    .biz-user-condition-or-content {
+      margin-bottom: 0;
+      border: none;
+      .biz-user-condition-conditions {
+        padding: 0;
+      }
+    }
+  }
+  &-content {
+    display: flex;
+    width: 100%;
+
+    background: #ffffff;
+    border: 1px solid @border-color-base;
+    border-radius: @border-radius-small;
+    &:not(:last-child) {
+      margin-bottom: @margin-md;
+    }
+    .biz-user-condition-conditions {
+      flex: 1;
+      padding: @padding-xs @padding-md 0 0;
+    }
+  }
+}

package/es/userCondition/styles/relationLabel.less

@@ -1,19 +1,19 @@
-@import '../../assets/styles/inner.less';
-.biz-user-condition-relation {
-  position: relative;
-  width: 2px;
-  margin-right: @margin-lg;
-  background-color: @border-color-split;
-  &-label {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 24px;
-    height: 24px;
-    line-height: 24px;
-    text-align: center;
-    background-color: @border-color-split;
-    border-radius: @border-radius-small;
-    transform: translate(-50%, -50%);
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-condition-relation {
+  position: relative;
+  width: 2px;
+  margin-right: @margin-lg;
+  background-color: @border-color-split;
+  &-label {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
+    text-align: center;
+    background-color: @border-color-split;
+    border-radius: @border-radius-small;
+    transform: translate(-50%, -50%);
+  }
+}

package/es/userGroup/styles/index.less

@@ -1,145 +1,145 @@
-@import '../../assets/styles/inner.less';
-
-.biz-user-group {
-  position: relative;
-  width: 100%;
-  min-width: 208px;
-  color: @text-color;
-
-  &-handle {
-    .__select-handle();
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: 100%;
-    min-height: @height-base;
-    padding: 4px 4px 4px 12px;
-    &:hover {
-      .biz-user-group-del {
-        display: inline-block;
-      }
-    }
-  }
-  &-placeholder {
-    flex: 1;
-    color: @input-placeholder-color;
-    pointer-events: none;
-  }
-  &-val {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  &-handle-tags {
-    display: flex;
-    flex: 1;
-    flex-wrap: wrap;
-    gap: 4px 8px;
-
-    &-item.ant-tag {
-      margin: 0;
-      padding: 0 4px;
-    }
-  }
-  &-arrow {
-    flex: none;
-    margin-left: 8px;
-    color: @text-color-secondary;
-    &.open {
-      transform: rotate(180deg);
-    }
-  }
-  &-del {
-    display: none;
-    flex: none;
-    width: 16px;
-    max-height: 24px;
-    margin-left: 6px;
-    text-align: center;
-    border-radius: @border-radius-small;
-    &:hover {
-      color: #fb5547;
-      background-color: #feddda;
-    }
-    &.disabled {
-      color: @disabled-color;
-      cursor: not-allowed;
-      &:hover {
-        background-color: transparent;
-      }
-    }
-  }
-  &-overlay {
-    .__select-panel();
-    display: flex;
-    flex-direction: row;
-    height: auto;
-  }
-  &-typelist {
-    width: 104px;
-    padding-right: @padding-xs;
-    border-right: 1px solid @border-color-split;
-  }
-  &-option {
-    .__select-option();
-  }
-  &-tags {
-    padding: 0;
-    box-shadow: none !important;
-  }
-  &-grouplist {
-    display: flex;
-    flex-direction: column;
-    padding-left: @padding-xs;
-  }
-  &-grouplist-no {
-    display: flex;
-    flex-direction: column;
-  }
-  &-top {
-    flex: none;
-    margin-bottom: @margin-xs;
-  }
-  &-add .bsicon {
-    margin-right: @margin-xs;
-  }
-  &-divider {
-    position: relative;
-    flex: none;
-    height: 0;
-    margin-top: @margin-xs;
-    overflow: visible;
-    border-top: 1px solid @border-color-split;
-    & > span {
-      position: absolute;
-      top: -12px;
-      left: 0;
-      display: inline-block;
-      padding: 0 5px 0 12px;
-      background-color: #fff;
-    }
-    &::after {
-      position: absolute;
-      top: -8px;
-      left: 4px;
-      display: inline-block;
-      width: 3px;
-      height: 14px;
-      background-color: @primary-color;
-      border-radius: 10px;
-      content: '';
-    }
-  }
-  &-list {
-    flex: 1;
-    max-height: 320px;
-    overflow: auto;
-  }
-  &-item {
-    .__select-option();
-  }
-  &-empty {
-    .__select-nodata();
-    flex: none;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-user-group {
+  position: relative;
+  width: 100%;
+  min-width: 208px;
+  color: @text-color;
+
+  &-handle {
+    .__select-handle();
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: 100%;
+    min-height: @height-base;
+    padding: 4px 4px 4px 12px;
+    &:hover {
+      .biz-user-group-del {
+        display: inline-block;
+      }
+    }
+  }
+  &-placeholder {
+    flex: 1;
+    color: @input-placeholder-color;
+    pointer-events: none;
+  }
+  &-val {
+    flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  &-handle-tags {
+    display: flex;
+    flex: 1;
+    flex-wrap: wrap;
+    gap: 4px 8px;
+
+    &-item.ant-tag {
+      margin: 0;
+      padding: 0 4px;
+    }
+  }
+  &-arrow {
+    flex: none;
+    margin-left: 8px;
+    color: @text-color-secondary;
+    &.open {
+      transform: rotate(180deg);
+    }
+  }
+  &-del {
+    display: none;
+    flex: none;
+    width: 16px;
+    max-height: 24px;
+    margin-left: 6px;
+    text-align: center;
+    border-radius: @border-radius-small;
+    &:hover {
+      color: #fb5547;
+      background-color: #feddda;
+    }
+    &.disabled {
+      color: @disabled-color;
+      cursor: not-allowed;
+      &:hover {
+        background-color: transparent;
+      }
+    }
+  }
+  &-overlay {
+    .__select-panel();
+    display: flex;
+    flex-direction: row;
+    height: auto;
+  }
+  &-typelist {
+    width: 104px;
+    padding-right: @padding-xs;
+    border-right: 1px solid @border-color-split;
+  }
+  &-option {
+    .__select-option();
+  }
+  &-tags {
+    padding: 0;
+    box-shadow: none !important;
+  }
+  &-grouplist {
+    display: flex;
+    flex-direction: column;
+    padding-left: @padding-xs;
+  }
+  &-grouplist-no {
+    display: flex;
+    flex-direction: column;
+  }
+  &-top {
+    flex: none;
+    margin-bottom: @margin-xs;
+  }
+  &-add .bsicon {
+    margin-right: @margin-xs;
+  }
+  &-divider {
+    position: relative;
+    flex: none;
+    height: 0;
+    margin-top: @margin-xs;
+    overflow: visible;
+    border-top: 1px solid @border-color-split;
+    & > span {
+      position: absolute;
+      top: -12px;
+      left: 0;
+      display: inline-block;
+      padding: 0 5px 0 12px;
+      background-color: #fff;
+    }
+    &::after {
+      position: absolute;
+      top: -8px;
+      left: 4px;
+      display: inline-block;
+      width: 3px;
+      height: 14px;
+      background-color: @primary-color;
+      border-radius: 10px;
+      content: '';
+    }
+  }
+  &-list {
+    flex: 1;
+    max-height: 320px;
+    overflow: auto;
+  }
+  &-item {
+    .__select-option();
+  }
+  &-empty {
+    .__select-nodata();
+    flex: none;
+  }
+}

package/es/userGroupHeader/styles/index.less

@@ -1,31 +1,31 @@
-@import '../../assets/styles/inner.less';
-.biz-user-group-header {
-  background: #fff;
-  &-title {
-    height: 20px;
-    margin-bottom: @margin-xs;
-    padding-left: @padding-lg;
-    color: @text-color-secondary;
-    font-weight: 500;
-  }
-
-  &-add {
-    color: @primary-color;
-    font-size: 20px !important;
-    cursor: pointer;
-    &.disabled {
-      display: none;
-    }
-  }
-  .biz-user {
-    width: 208px;
-  }
-  &-container {
-    width: 100%;
-    padding: @padding-xss @padding-lg;
-
-    &:hover {
-      background: #e8efff;
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-group-header {
+  background: #fff;
+  &-title {
+    height: 20px;
+    margin-bottom: @margin-xs;
+    padding-left: @padding-lg;
+    color: @text-color-secondary;
+    font-weight: 500;
+  }
+
+  &-add {
+    color: @primary-color;
+    font-size: 20px !important;
+    cursor: pointer;
+    &.disabled {
+      display: none;
+    }
+  }
+  .biz-user {
+    width: 208px;
+  }
+  &-container {
+    width: 100%;
+    padding: @padding-xss @padding-lg;
+
+    &:hover {
+      background: #e8efff;
+    }
+  }
+}

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
       }
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.data) && res.data.results) {
@@ -209,7 +211,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 +232,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 +275,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 +305,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/components/search/index.less

@@ -1,6 +1,6 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-tags-selector {
-  &-drop-panel-search {
-    margin-bottom: @margin-xs;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-tags-selector {
+  &-drop-panel-search {
+    margin-bottom: @margin-xs;
+  }
+}

package/es/userTagsSelector/components/tagList/index.less

@@ -1,13 +1,13 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-tags-selector {
-  &-list-container {
-    max-height: 360px;
-    overflow: auto;
-  }
-  &-list-container-loading {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 40px;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-tags-selector {
+  &-list-container {
+    max-height: 360px;
+    overflow: auto;
+  }
+  &-list-container-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 40px;
+  }
+}

package/es/userTagsSelector/demo/index.js

@@ -49,6 +49,7 @@ export default (function () {
     keyFields: ['labelGroup', 'id', 'layerLabelId'],
     labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
     valueFields: ['labelGroup', 'id', 'layerLabelId'],
+    isOpenLayer: false,
     onChange: onChange
   })));
 });