@zgfe/modules-dm 1.0.42-alpha.9 → 1.0.56-zhongyuan.10

package/es/modules/dataPlan/search.js

@@ -1,10 +1,11 @@
-import { IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select } from 'antd';
-var Option = Select.Option;
-import React from 'react';
+import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
+import { Input, Button } from 'antd';
+import React, { useContext } from 'react';
 import './styles/index.less';
 var Search = function Search(props) {
   var classPrefix = 'search-box';
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   var searchChange = function searchChange(e) {
     props.setSearchData(e.currentTarget.value);
   };
@@ -34,6 +35,6 @@ var Search = function Search(props) {
     onClick: function onClick() {
       props.setVisible(true);
     }
-  }, "\u624B\u52A8\u6DFB\u52A0", props.type == 'event' ? '事件' : '用户属性'));
+  }, "\u624B\u52A8\u6DFB\u52A0", props.type == 'event' ? '事件' : (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) != 'user' ? '主体属性' : '用户属性'));
 };
 export default Search;

package/es/modules/dataPlan/styles/index.less

@@ -1,316 +1,316 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.plan-list {
-  position: relative;
-  height: 100%;
-  padding: 24px;
-  background: #fff;
-  border-radius: 8px;
-  .clearfix:after {
-    display: block;
-    clear: both;
-    height: 0;
-    content: '';
-  }
-  &-form {
-    position: relative;
-    margin-top: 5px;
-    .ant-form-item {
-      width: 35%;
-      margin-right: 80px;
-    }
-    .ant-form-item-label {
-      color: @text-color-secondary;
-    }
-    .ant-form-item-label {
-      text-align: left;
-    }
-  }
-  &-submit {
-    position: absolute;
-    top: 0;
-    right: 90px;
-  }
-  &-reset {
-    position: absolute;
-    top: 0;
-    right: 0;
-  }
-  &-switchbox {
-    // margin-top: 26px;
-    // padding-top: 26px;
-    // border-top: 1px solid #e8efff;
-    .switch-div {
-      float: left;
-      .ant-switch {
-        width: 24px;
-        margin-top: -2px;
-      }
-      span {
-        margin-right: 20px;
-      }
-    }
-    .add {
-      float: right;
-      line-height: 20px;
-    }
-  }
-  &-table-see {
-    margin-right: 20px;
-    color: #165dff;
-    cursor: pointer;
-    user-select: none;
-  }
-  &-table-del {
-    color: #165dff;
-    cursor: pointer;
-    user-select: none;
-  }
-  &-table {
-    height: 550px;
-    margin-top: 20px;
-    overflow-y: scroll;
-  }
-  &-pagination {
-    position: absolute;
-    right: 20px;
-    bottom: -50px;
-  }
-}
-
-.add-plan {
-  position: relative;
-  height: 100%;
-  &-drawer {
-    .ant-drawer-header-title {
-      height: 20px;
-      .ant-drawer-close {
-        position: absolute;
-        right: 6px;
-      }
-    }
-    .ant-drawer-mask {
-      background: rgba(0, 0, 0, 0.8);
-    }
-  }
-  .spin {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-  }
-  .point-active,
-  .point-active-null {
-    display: inline-block;
-    width: 6px;
-    height: 6px;
-    margin-right: 5px;
-    vertical-align: 2px;
-    border-radius: 50%;
-  }
-  .point-active {
-    background: @primary-color;
-  }
-  .point-active-null {
-    background: #fb5547;
-  }
-  &-top {
-    position: relative;
-    display: flex;
-    margin-top: -8px;
-    .input-waring {
-      position: absolute;
-      bottom: -30px;
-      left: 0;
-      color: red;
-    }
-    > :nth-child(1) {
-      line-height: 30px;
-    }
-    .plan-name-div {
-      display: flex;
-      height: 32px;
-      margin-top: -10px;
-      margin-bottom: -8px;
-      color: #242541;
-      font-weight: 500;
-      font-size: 16px;
-      line-height: 32px;
-      .bsicon {
-        margin-right: 40px;
-        margin-left: 10px;
-        color: @primary-color;
-      }
-    }
-    .plan-name {
-      width: 200px;
-      margin-right: 20px;
-      // margin: 0 50px;
-    }
-    .cancel {
-      margin-right: 20px;
-    }
-    .back {
-      cursor: pointer;
-    }
-  }
-  &-tabs {
-    position: relative;
-    // display: flex;
-    // margin-bottom: 15px;
-    > :nth-child(1) {
-      border-radius: 4px 0 0 4px !important;
-    }
-    > :nth-child(2) {
-      border-radius: 0 4px 4px 0 !important;
-    }
-    .handle-box {
-      position: absolute;
-      top: 5px;
-      right: 0;
-      .bsicon {
-        margin-right: 10px;
-      }
-      .ant-btn {
-        margin-left: 20px;
-      }
-      .export-data {
-        margin-left: 20px;
-        .ant-select-selection-placeholder {
-          color: #000;
-        }
-      }
-    }
-  }
-  &-table-header {
-    .ant-table-tbody {
-      display: none;
-    }
-    .ant-table {
-      border-radius: 8px 8px 0 0 !important;
-    }
-  }
-  &-table-header.empty {
-    .ant-table {
-      border-radius: 8px !important;
-    }
-    .ant-table-tbody {
-      display: contents;
-    }
-    .ant-table-tbody > tr > td {
-      border-bottom: 0px solid #e8efff;
-    }
-  }
-  .user-list,
-  .event-list {
-    position: relative;
-    &-pagination {
-      position: absolute;
-      right: 20px;
-      bottom: -50px;
-    }
-  }
-  .event-list {
-    ant-table-thead > tr > th,
-    .ant-table-tbody > tr > td,
-    .ant-table tfoot > tr > th,
-    .ant-table tfoot > tr > td {
-      height: 48px;
-      padding: 0 !important;
-      // margin-left: 16px!important;
-    }
-    .table-multiline {
-      line-height: 48px;
-      :nth-child(1) {
-        border-top: none;
-      }
-      > div {
-        padding-left: 16px;
-        border-top: 1px solid rgb(236, 237, 240);
-      }
-    }
-    .table-single {
-      // height: 100%;
-      // line-height: 100%;
-      padding-left: 16px;
-    }
-  }
-  .table-plus {
-    &-table {
-      margin-top: -2px;
-      .ant-table-thead {
-        display: none;
-      }
-      .ant-table {
-        border: none;
-        border-radius: 0;
-      }
-    }
-    // &-table-header {
-    //   display: flex;
-    //   margin: 0;
-    //   padding: 0;
-    //   list-style-type: none;
-    //   background: #fff;
-    //   li {
-    //     width: 25%;
-    //     padding: 16px;
-    //     border: 1px solid #e8efff;
-    //   }
-    // }
-    .ant-table-title {
-      text-align: center;
-      .set-button {
-        margin-left: 20px;
-        color: @primary-color;
-        user-select: none;
-      }
-    }
-    .ant-table-selection-column {
-      border: 1px solid red;
-    }
-  }
-  .add-event {
-    .set-del {
-      margin-left: 15px;
-      color: #021429;
-    }
-    .set-del-err {
-      color: #cacdd4;
-      cursor: not-allowed;
-    }
-    .ant-modal-body {
-      padding: 5px 24px 24px 24px;
-    }
-    .ant-form-item {
-      margin: 0;
-    }
-    &-add-button {
-      margin-top: 10px;
-      .bsicon {
-        margin-right: 5px;
-        line-height: 22px;
-      }
-    }
-  }
-  .search-box {
-    position: relative;
-    display: flex;
-    margin-bottom: 16px;
-    line-height: 32px;
-    &-input {
-      width: 264px;
-      height: 32px;
-      margin-right: 12px;
-    }
-    &-text {
-      span {
-        color: @primary-color;
-        font-weight: bold;
-      }
-    }
-    &-add-button {
-      position: absolute;
-      right: 0;
-      line-height: 20px;
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.plan-list {
+  position: relative;
+  height: 100%;
+  padding: 24px;
+  background: #fff;
+  border-radius: 8px;
+  .clearfix:after {
+    display: block;
+    clear: both;
+    height: 0;
+    content: '';
+  }
+  &-form {
+    position: relative;
+    margin-top: 5px;
+    .ant-form-item {
+      width: 35%;
+      margin-right: 80px;
+    }
+    .ant-form-item-label {
+      color: @text-color-secondary;
+    }
+    .ant-form-item-label {
+      text-align: left;
+    }
+  }
+  &-submit {
+    position: absolute;
+    top: 0;
+    right: 90px;
+  }
+  &-reset {
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
+  &-switchbox {
+    // margin-top: 26px;
+    // padding-top: 26px;
+    // border-top: 1px solid #e8efff;
+    .switch-div {
+      float: left;
+      .ant-switch {
+        width: 24px;
+        margin-top: -2px;
+      }
+      span {
+        margin-right: 20px;
+      }
+    }
+    .add {
+      float: right;
+      line-height: 20px;
+    }
+  }
+  &-table-see {
+    margin-right: 20px;
+    color: #165dff;
+    cursor: pointer;
+    user-select: none;
+  }
+  &-table-del {
+    color: #165dff;
+    cursor: pointer;
+    user-select: none;
+  }
+  &-table {
+    height: 550px;
+    margin-top: 20px;
+    overflow-y: scroll;
+  }
+  &-pagination {
+    position: absolute;
+    right: 20px;
+    bottom: -50px;
+  }
+}
+
+.add-plan {
+  position: relative;
+  height: 100%;
+  &-drawer {
+    .ant-drawer-header-title {
+      height: 20px;
+      .ant-drawer-close {
+        position: absolute;
+        right: 6px;
+      }
+    }
+    .ant-drawer-mask {
+      background: rgba(0, 0, 0, 0.8);
+    }
+  }
+  .spin {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+  }
+  .point-active,
+  .point-active-null {
+    display: inline-block;
+    width: 6px;
+    height: 6px;
+    margin-right: 5px;
+    vertical-align: 2px;
+    border-radius: 50%;
+  }
+  .point-active {
+    background: @primary-color;
+  }
+  .point-active-null {
+    background: #fb5547;
+  }
+  &-top {
+    position: relative;
+    display: flex;
+    margin-top: -8px;
+    .input-waring {
+      position: absolute;
+      bottom: -30px;
+      left: 0;
+      color: red;
+    }
+    > :nth-child(1) {
+      line-height: 30px;
+    }
+    .plan-name-div {
+      display: flex;
+      height: 32px;
+      margin-top: -10px;
+      margin-bottom: -8px;
+      color: #242541;
+      font-weight: 500;
+      font-size: 16px;
+      line-height: 32px;
+      .bsicon {
+        margin-right: 40px;
+        margin-left: 10px;
+        color: @primary-color;
+      }
+    }
+    .plan-name {
+      width: 200px;
+      margin-right: 20px;
+      // margin: 0 50px;
+    }
+    .cancel {
+      margin-right: 20px;
+    }
+    .back {
+      cursor: pointer;
+    }
+  }
+  &-tabs {
+    position: relative;
+    // display: flex;
+    // margin-bottom: 15px;
+    > :nth-child(1) {
+      border-radius: 4px 0 0 4px !important;
+    }
+    > :nth-child(2) {
+      border-radius: 0 4px 4px 0 !important;
+    }
+    .handle-box {
+      position: absolute;
+      top: 5px;
+      right: 0;
+      .bsicon {
+        margin-right: 10px;
+      }
+      .ant-btn {
+        margin-left: 20px;
+      }
+      .export-data {
+        margin-left: 20px;
+        .ant-select-selection-placeholder {
+          color: #000;
+        }
+      }
+    }
+  }
+  &-table-header {
+    .ant-table-tbody {
+      display: none;
+    }
+    .ant-table {
+      border-radius: 8px 8px 0 0 !important;
+    }
+  }
+  &-table-header.empty {
+    .ant-table {
+      border-radius: 8px !important;
+    }
+    .ant-table-tbody {
+      display: contents;
+    }
+    .ant-table-tbody > tr > td {
+      border-bottom: 0px solid #e8efff;
+    }
+  }
+  .user-list,
+  .event-list {
+    position: relative;
+    &-pagination {
+      position: absolute;
+      right: 20px;
+      bottom: -50px;
+    }
+  }
+  .event-list {
+    ant-table-thead > tr > th,
+    .ant-table-tbody > tr > td,
+    .ant-table tfoot > tr > th,
+    .ant-table tfoot > tr > td {
+      height: 48px;
+      padding: 0 !important;
+      // margin-left: 16px!important;
+    }
+    .table-multiline {
+      line-height: 48px;
+      :nth-child(1) {
+        border-top: none;
+      }
+      > div {
+        padding-left: 16px;
+        border-top: 1px solid rgb(236, 237, 240);
+      }
+    }
+    .table-single {
+      // height: 100%;
+      // line-height: 100%;
+      padding-left: 16px;
+    }
+  }
+  .table-plus {
+    &-table {
+      margin-top: -2px;
+      .ant-table-thead {
+        display: none;
+      }
+      .ant-table {
+        border: none;
+        border-radius: 0;
+      }
+    }
+    // &-table-header {
+    //   display: flex;
+    //   margin: 0;
+    //   padding: 0;
+    //   list-style-type: none;
+    //   background: #fff;
+    //   li {
+    //     width: 25%;
+    //     padding: 16px;
+    //     border: 1px solid #e8efff;
+    //   }
+    // }
+    .ant-table-title {
+      text-align: center;
+      .set-button {
+        margin-left: 20px;
+        color: @primary-color;
+        user-select: none;
+      }
+    }
+    .ant-table-selection-column {
+      border: 1px solid red;
+    }
+  }
+  .add-event {
+    .set-del {
+      margin-left: 15px;
+      color: #021429;
+    }
+    .set-del-err {
+      color: #cacdd4;
+      cursor: not-allowed;
+    }
+    .ant-modal-body {
+      padding: 5px 24px 24px 24px;
+    }
+    .ant-form-item {
+      margin: 0;
+    }
+    &-add-button {
+      margin-top: 10px;
+      .bsicon {
+        margin-right: 5px;
+        line-height: 22px;
+      }
+    }
+  }
+  .search-box {
+    position: relative;
+    display: flex;
+    margin-bottom: 16px;
+    line-height: 32px;
+    &-input {
+      width: 264px;
+      height: 32px;
+      margin-right: 12px;
+    }
+    &-text {
+      span {
+        color: @primary-color;
+        font-weight: bold;
+      }
+    }
+    &-add-button {
+      position: absolute;
+      right: 0;
+      line-height: 20px;
+    }
+  }
+}

package/es/modules/dataPlan/tablePlus.js

@@ -89,11 +89,11 @@ var TablePlus = function TablePlus(props) {
           onClick: function onClick() {
             tableClick(item, props.eventListDataIndex);
           }
-        }, ((_eventListData$item$ = eventListData[item][0]) === null || _eventListData$item$ === void 0 ? void 0 : _eventListData$item$.open) ? /*#__PURE__*/React.createElement("span", {
+        }, ((_eventListData$item$ = eventListData[item][0]) === null || _eventListData$item$ === void 0 ? void 0 : _eventListData$item$.open) ? (/*#__PURE__*/React.createElement("span", {
           className: "set-button"
-        }, "\u6536\u8D77") : /*#__PURE__*/React.createElement("span", {
+        }, "\u6536\u8D77")) : (/*#__PURE__*/React.createElement("span", {
           className: "set-button"
-        }, "\u5C55\u5F00")));
+        }, "\u5C55\u5F00"))));
       },
       pagination: false
     });