@zgfe/business-lib 1.2.70-hxd.1 → 1.2.70-hxd.10

package/es/assets/styles/variable.less

@@ -1,21 +1,21 @@
-@import '~antd/es/style/themes/default.less';
-
-@border-radius-sx: 2px;
-@border-radius-small: 4px;
-@border-radius-normal: 8px;
-@border-radius-large: 20px;
-@option-height: @height-base;
-@background-color-gray: #f6f6f6;
-@background-color-table: #f2f3f4;
-
-@icon-width: 24px;
-
-@shadow-color-light: rgba(0, 0, 0, 0.1);
-@box-shadow-small: 0px 1px 2px @shadow-color-light;
-@primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
-@box-shadow-form: 0 0 0 4px @primary-color-hover;
-@text-color-middle: #9aa1a9;
-@custom-background: #fafafb;
-@custom-focus: #f0f7ff;
-@primary-color: '#165dff';
-@input-placeholder-color: #9797af;
+@import '~antd/es/style/themes/default.less';
+
+@border-radius-sx: 2px;
+@border-radius-small: 4px;
+@border-radius-normal: 8px;
+@border-radius-large: 20px;
+@option-height: @height-base;
+@background-color-gray: #f6f6f6;
+@background-color-table: #f2f3f4;
+
+@icon-width: 24px;
+
+@shadow-color-light: rgba(0, 0, 0, 0.1);
+@box-shadow-small: 0px 1px 2px @shadow-color-light;
+@primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
+@box-shadow-form: 0 0 0 4px @primary-color-hover;
+@text-color-middle: #9aa1a9;
+@custom-background: #fafafb;
+@custom-focus: #f0f7ff;
+@primary-color: '#165dff';
+@input-placeholder-color: #9797af;

package/es/attrCondition/styles/index.less

@@ -1,101 +1,101 @@
-@import '../../assets/styles/inner.less';
-.biz-attr-condition {
-  gap: 16px !important;
-  align-items: flex-start !important;
-  width: 100%;
-  &-btn-del {
-    color: #9aa1a9;
-    font-size: 16px !important;
-    line-height: 32px;
-    &:hover {
-      color: @error-color;
-      cursor: pointer;
-    }
-  }
-  .biz-attr-select-handle {
-    width: 184px;
-    padding: 0;
-  }
-  .ant-space-item:nth-of-type(3) {
-    min-width: 184px;
-    max-width: calc(100% - 320px);
-  }
-  &-group {
-    display: flex;
-    flex-direction: row;
-    .ant-space-item:nth-of-type(3) {
-      min-width: 184px;
-      max-width: calc(100% - 380px);
-    }
-    &-container {
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      gap: 4px;
-      width: 100%;
-      max-width: calc(100% + 33px);
-      margin-left: -33px;
-      &-item {
-        padding: 4px 0 4px 48px;
-        &:hover {
-          background: #e8efff;
-        }
-      }
-    }
-    &-handle {
-      position: relative;
-      width: 1px;
-      margin-right: 0;
-      margin-left: 32px;
-      background: @border-color-base;
-    }
-    &-operate {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      width: 16px;
-      transform: translate(-50%, -50%);
-    }
-    &-operate-text {
-      width: 16px;
-      height: 16px;
-      span {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-        height: 100%;
-        font-size: 12px;
-        *font-size: 10px;
-        transform: scale(0.83, 0.83);
-      }
-
-      .__default-hover();
-
-      &:first-child {
-        border-top-left-radius: 3px;
-        border-top-right-radius: 3px;
-      }
-
-      &:last-child {
-        border-bottom-right-radius: 3px;
-        border-bottom-left-radius: 3px;
-      }
-
-      &.active {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-  }
-
-  &-column {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-  }
-  &-error {
-    padding-left: 4px;
-    color: @error-color;
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-attr-condition {
+  gap: 16px !important;
+  align-items: flex-start !important;
+  width: 100%;
+  &-btn-del {
+    color: #9aa1a9;
+    font-size: 16px !important;
+    line-height: 32px;
+    &:hover {
+      color: @error-color;
+      cursor: pointer;
+    }
+  }
+  .biz-attr-select-handle {
+    width: 184px;
+    padding: 0;
+  }
+  .ant-space-item:nth-of-type(3) {
+    min-width: 184px;
+    max-width: calc(100% - 320px);
+  }
+  &-group {
+    display: flex;
+    flex-direction: row;
+    .ant-space-item:nth-of-type(3) {
+      min-width: 184px;
+      max-width: calc(100% - 380px);
+    }
+    &-container {
+      display: flex;
+      flex: 1;
+      flex-direction: column;
+      gap: 4px;
+      width: 100%;
+      max-width: calc(100% + 33px);
+      margin-left: -33px;
+      &-item {
+        padding: 4px 0 4px 48px;
+        &:hover {
+          background: #e8efff;
+        }
+      }
+    }
+    &-handle {
+      position: relative;
+      width: 1px;
+      margin-right: 0;
+      margin-left: 32px;
+      background: @border-color-base;
+    }
+    &-operate {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 16px;
+      transform: translate(-50%, -50%);
+    }
+    &-operate-text {
+      width: 16px;
+      height: 16px;
+      span {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        font-size: 12px;
+        *font-size: 10px;
+        transform: scale(0.83, 0.83);
+      }
+
+      .__default-hover();
+
+      &:first-child {
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+      }
+
+      &:last-child {
+        border-bottom-right-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      &.active {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+  }
+
+  &-column {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+  }
+  &-error {
+    padding-left: 4px;
+    color: @error-color;
+  }
+}

package/es/attrCondition/useAttrCondition.js

@@ -37,6 +37,7 @@ var useAttrCondition = function useAttrCondition(props) {
           attrData = {
             id: data.attrId,
             propCategory: data.propCategory,
+            encryptionType: data.encryptionType,
             type: data.type,
             key: "".concat(data.propCategory, "-").concat(data.attrId),
             label: data.attrNameStr || data.label,
@@ -52,6 +53,7 @@ var useAttrCondition = function useAttrCondition(props) {
             propCategory: data.propCategory,
             type: data.type,
             category: data.category,
+            encryptionType: data.encryptionType,
             key: "".concat(data.propCategory, "-").concat(data.attrName, "-").concat(aId),
             subtype: data.subtype,
             label: data.attrNameStr || data.label,
@@ -66,7 +68,8 @@ var useAttrCondition = function useAttrCondition(props) {
             type: data.type,
             key: "".concat(data.propCategory, "-").concat(data.attrId),
             label: data.attrNameStr || data.label,
-            subtype: data.subtype
+            subtype: data.subtype,
+            encryptionType: data.encryptionType
           };
         }
       }

package/es/attrConditions/styles/group.less

@@ -1,49 +1,49 @@
-@import '../../assets/styles/inner.less';
-
-.biz-condition {
-  display: flex;
-
-  /* 是筛选条件组 */
-  &-group-handle {
-    position: relative;
-    width: 1px;
-    margin-right: 16px;
-    margin-left: 8px;
-    background: @border-color-base;
-  }
-
-  &-group-operate {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 16px;
-    transform: translate(-50%, -50%);
-
-    &-text {
-      width: 16px;
-      height: 16px;
-      font-size: 12px;
-      line-height: 16px;
-      text-align: center;
-
-      .__default-hover();
-
-      &:first-child {
-        border-radius: @border-radius-sx @border-radius-sx 0px 0px;
-      }
-
-      &:last-child {
-        border-radius: 0px 0px @border-radius-sx @border-radius-sx;
-      }
-
-      &.active {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-  }
-
-  &-item-container {
-    flex: 1;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-condition {
+  display: flex;
+
+  /* 是筛选条件组 */
+  &-group-handle {
+    position: relative;
+    width: 1px;
+    margin-right: 16px;
+    margin-left: 8px;
+    background: @border-color-base;
+  }
+
+  &-group-operate {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 16px;
+    transform: translate(-50%, -50%);
+
+    &-text {
+      width: 16px;
+      height: 16px;
+      font-size: 12px;
+      line-height: 16px;
+      text-align: center;
+
+      .__default-hover();
+
+      &:first-child {
+        border-radius: @border-radius-sx @border-radius-sx 0px 0px;
+      }
+
+      &:last-child {
+        border-radius: 0px 0px @border-radius-sx @border-radius-sx;
+      }
+
+      &.active {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+  }
+
+  &-item-container {
+    flex: 1;
+  }
+}

package/es/attrConditions/styles/index.less

@@ -1,151 +1,151 @@
-@import '../../assets/styles/inner.less';
-
-/* 筛选条件 */
-.biz-condition-item {
-  &-panel {
-    display: flex;
-    width: 100%;
-    > :nth-child(1) {
-      margin-right: 8px;
-    }
-
-    .biz-condition-item-multi-select {
-      width: calc(100% - 108px);
-      min-width: 100px;
-    }
-
-    .biz-condition-item-multi-select-empty {
-      // width: calc(100% - 108px);
-      flex: 1;
-
-      .biz-condition-item-multi-select {
-        width: 100%;
-      }
-    }
-  }
-
-  &:not(:last-child) {
-    margin-bottom: 8px;
-  }
-
-  /* 覆盖属性组件样式 */
-  /* --- start --- */
-  .biz-attr-select-handle {
-    width: 100%;
-    max-width: 100%;
-    margin-bottom: 2px;
-    padding: 0;
-  }
-
-  .biz-attr-select-del-icon {
-    background-color: #fff;
-
-    &:hover {
-      .__error-hover();
-    }
-  }
-
-  // 自定义下拉框样式
-  .biz-select-handle-input {
-    background-color: @background-color-base;
-    // border: none;
-  }
-
-  /* --- end --- */
-
-  &-multi-select {
-    flex: 1;
-  }
-  &-nplace {
-    .ant-space-item:nth-of-type(3) {
-      min-width: 60px !important;
-      .ant-input-number {
-        width: 60px;
-        background-color: #fafafb;
-        border-radius: 4px;
-      }
-    }
-    &-text {
-      white-space: nowrap;
-    }
-  }
-
-  &-single-select {
-    width: 100px;
-    &.gray {
-      color: @text-color-secondary;
-
-      &:hover {
-        color: @primary-color;
-      }
-    }
-  }
-
-  &-value-content {
-    display: flex;
-    flex: 1;
-
-    .biz-select-handle {
-      margin-left: @margin-xs;
-    }
-  }
-
-  &-input {
-    &.ant-input {
-      background-color: @background-color-base;
-      border-color: @background-color-base;
-    }
-
-    &.ant-input-affix-wrapper {
-      background-color: @background-color-base !important;
-
-      input {
-        background-color: @background-color-base !important;
-      }
-
-      &.ant-input-affix-wrapper-focused {
-        background-color: #fff !important;
-        border: 1px solid @primary-color;
-
-        input {
-          background-color: #fff !important;
-        }
-      }
-    }
-
-    &:focus {
-      border: 1px solid @primary-color;
-    }
-
-    .ant-input-group-addon {
-      // background-color: @background-color-gray !important;
-      border: none;
-    }
-
-    &-select {
-      width: 60px;
-      border: none;
-      // border-left: 1px solid @border-color-split;
-    }
-  }
-
-  &-date.ant-picker {
-    flex: 1;
-    border-color: transparent;
-
-    &.ant-picker {
-      background-color: @background-color-base;
-
-      &:hover {
-        background-color: @background-color-base;
-        border-color: @primary-color;
-      }
-
-      &.ant-picker-focused {
-        background-color: @background-color-base;
-        border-color: @primary-color;
-        box-shadow: @box-shadow-base;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+
+/* 筛选条件 */
+.biz-condition-item {
+  &-panel {
+    display: flex;
+    width: 100%;
+    > :nth-child(1) {
+      margin-right: 8px;
+    }
+
+    .biz-condition-item-multi-select {
+      width: calc(100% - 108px);
+      min-width: 100px;
+    }
+
+    .biz-condition-item-multi-select-empty {
+      // width: calc(100% - 108px);
+      flex: 1;
+
+      .biz-condition-item-multi-select {
+        width: 100%;
+      }
+    }
+  }
+
+  &:not(:last-child) {
+    margin-bottom: 8px;
+  }
+
+  /* 覆盖属性组件样式 */
+  /* --- start --- */
+  .biz-attr-select-handle {
+    width: 100%;
+    max-width: 100%;
+    margin-bottom: 2px;
+    padding: 0;
+  }
+
+  .biz-attr-select-del-icon {
+    background-color: #fff;
+
+    &:hover {
+      .__error-hover();
+    }
+  }
+
+  // 自定义下拉框样式
+  .biz-select-handle-input {
+    background-color: @background-color-base;
+    // border: none;
+  }
+
+  /* --- end --- */
+
+  &-multi-select {
+    flex: 1;
+  }
+  &-nplace {
+    .ant-space-item:nth-of-type(3) {
+      min-width: 60px !important;
+      .ant-input-number {
+        width: 60px;
+        background-color: #fafafb;
+        border-radius: 4px;
+      }
+    }
+    &-text {
+      white-space: nowrap;
+    }
+  }
+
+  &-single-select {
+    width: 100px;
+    &.gray {
+      color: @text-color-secondary;
+
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+
+  &-value-content {
+    display: flex;
+    flex: 1;
+
+    .biz-select-handle {
+      margin-left: @margin-xs;
+    }
+  }
+
+  &-input {
+    &.ant-input {
+      background-color: @background-color-base;
+      border-color: @background-color-base;
+    }
+
+    &.ant-input-affix-wrapper {
+      background-color: @background-color-base !important;
+
+      input {
+        background-color: @background-color-base !important;
+      }
+
+      &.ant-input-affix-wrapper-focused {
+        background-color: #fff !important;
+        border: 1px solid @primary-color;
+
+        input {
+          background-color: #fff !important;
+        }
+      }
+    }
+
+    &:focus {
+      border: 1px solid @primary-color;
+    }
+
+    .ant-input-group-addon {
+      // background-color: @background-color-gray !important;
+      border: none;
+    }
+
+    &-select {
+      width: 60px;
+      border: none;
+      // border-left: 1px solid @border-color-split;
+    }
+  }
+
+  &-date.ant-picker {
+    flex: 1;
+    border-color: transparent;
+
+    &.ant-picker {
+      background-color: @background-color-base;
+
+      &:hover {
+        background-color: @background-color-base;
+        border-color: @primary-color;
+      }
+
+      &.ant-picker-focused {
+        background-color: @background-color-base;
+        border-color: @primary-color;
+        box-shadow: @box-shadow-base;
+      }
+    }
+  }
+}

package/es/attrConditions/types.d.ts

@@ -19,6 +19,7 @@ export declare namespace AttrConditionTypes {
         attrNameStr?: string;
         type?: PropType;
         propCategory?: 'userProp' | 'eventProp' | 'envProp' | string;
+        encryptionType?: number;
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
         operator?: OperateTypes;

package/es/attributeSelector/listPanel.js

@@ -228,7 +228,7 @@ var AttrListPanel = function AttrListPanel(props) {
       });
       var childList = [];
       group.children.forEach(function (option) {
-        if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test((option === null || option === void 0 ? void 0 : option.alias) || (option === null || option === void 0 ? void 0 : option.label))) return;
+        if (searchValue && !(new RegExp(_.escapeRegExp(searchValue), 'i').test(" ".concat(option === null || option === void 0 ? void 0 : option.alias)) || new RegExp(_.escapeRegExp(searchValue), 'i').test(" ".concat(option === null || option === void 0 ? void 0 : option.label)))) return;
         var disabled = false;
         disableItemlist === null || disableItemlist === void 0 ? void 0 : disableItemlist.forEach(function (item) {
           if (item.key === option.key) disabled = true;