@zgfe/modules-settings 2.1.0-zhongyuan-set.4 → 2.1.0-zhongyuan-set.6

package/es/modules/companySetting/role/index.less

@@ -1,296 +1,296 @@
-@import './../../../constants/icons/iconfont.css';
-
-.role-list {
-  .ant-form-item {
-    .ant-form-item-control-input {
-      width: 392px;
-      height: 32px;
-    }
-  }
-  .ant-input {
-    border-color: @background-color-base !important;
-
-    &:focus {
-      border-color: @primary-color !important;
-    }
-  }
-
-  .ant-table-cell {
-    height: 50px;
-  }
-
-  .ant-table-row-indent + .ant-table-row-expand-icon {
-    margin-top: 0;
-  }
-
-  height: 100%;
-  padding: 0;
-  overflow: auto;
-
-  .app-list-head {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 24px;
-
-    > div {
-      color: var(--io-n, #021429);
-      font-weight: 500;
-      font-size: 16px;
-      font-family: PingFang SC;
-      font-style: normal;
-      line-height: 24px;
-      /* 150% */
-    }
-  }
-
-  .platform-icons {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    width: 100%;
-
-    span {
-      margin-right: 10px;
-      color: #cfcfcf;
-      font-size: 16px;
-    }
-  }
-
-  .role-list-content {
-    margin-top: 16px;
-
-    .c-grid-cell,
-    .c-grid-header-cell {
-      text-align: left !important;
-      border: none;
-      border-bottom: 1px solid #d1d1d1;
-    }
-
-    .c-grid-cell {
-      text-align: left !important;
-    }
-
-    .c-grid-body .c-grid-row:nth-child(2n) {
-      background: #fff !important;
-    }
-
-    .app-name {
-      cursor: pointer;
-
-      &:hover {
-        color: #00a0ea;
-      }
-    }
-
-    .operating {
-      display: flex;
-      gap: 16px;
-    }
-  }
-}
-
-.ant-select-selection-item-content {
-  .custom-item-right {
-    display: none;
-  }
-}
-
-.appIdsPopupClassName {
-  .ant-select-tree-treenode-checkbox-checked {
-    .custom-item-right {
-      color: #165dff;
-    }
-  }
-}
-
-.add-drawer {
-  z-index: 999 !important;
-  .ant-drawer-header-title {
-    flex-direction: row-reverse;
-  }
-
-  .ant-drawer-close {
-    margin-right: 0 !important;
-  }
-}
-
-.custom-item {
-  display: flex;
-  justify-content: space-between;
-  > :nth-child(1) {
-    max-width: 400px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-  .tishi {
-    color: #9aa1a9;
-  }
-}
-.biz-select-option.active {
-  .custom-item {
-    > :nth-child(1) {
-      max-width: 260px;
-    }
-  }
-}
-.custom-item.v2 {
-  > :nth-child(1) {
-    max-width: 330px;
-  }
-}
-.ant-select-tree-treenode-checkbox-checked {
-  .custom-item.v2 {
-    > :nth-child(1) {
-      max-width: 250px;
-    }
-  }
-}
-.role-dialog-content {
-  .group-config {
-    display: flex;
-    margin-bottom: 24px;
-    padding-left: 120px;
-
-    .config-name {
-      margin-right: 12px;
-      color: #5f6085;
-      font-size: 14px;
-      line-height: 30px;
-      white-space: nowrap;
-    }
-
-    .biz-user-condition-type-label {
-      margin-left: -7px;
-    }
-  }
-
-  .ant-form-item {
-    .ant-form-item-control-input {
-      width: 484px;
-      min-height: 32px;
-    }
-  }
-
-  .ant-input {
-    border-color: @background-color-base !important;
-
-    &:focus {
-      border-color: @primary-color !important;
-    }
-  }
-
-  .ant-select-selector {
-    border-color: @background-color-base !important;
-  }
-
-  .biz-select-handle-input {
-    .ant-input {
-      border-color: @background-color-base !important;
-
-      &:focus {
-        border-color: @background-color-base !important;
-      }
-    }
-
-    &:focus {
-      border-color: @primary-color !important;
-    }
-  }
-
-  .ant-input-status-error {
-    border: 1px solid #fb5547 !important;
-
-    &:focus {
-      border-color: #fb5547 !important;
-    }
-  }
-
-  .ant-select-status-error {
-    border: none !important;
-
-    &:focus {
-      box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
-    }
-  }
-
-  .biz-select-handle-status-error.active:not(.disable) {
-    box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
-  }
-
-  .biz-select-handle-status-error {
-    .ant-input.ant-input-status-error:focus:not(.ant-input-disable):not(.ant-input-borderless),
-    .ant-input.ant-input-status-error-focused:not(.ant-input-disable):not(.ant-input-borderless) {
-      box-shadow: none !important;
-    }
-  }
-
-  .ant-form-item:last-of-type {
-    margin-bottom: 0;
-  }
-
-  color: #5f6085;
-
-  .ant-form-item-label {
-    width: 80px;
-    text-align: right;
-  }
-
-  .menuCode-map {
-    .ant-form-item-label::before {
-      display: inline-block;
-      margin-right: 4px;
-      color: #ff4d4f;
-      font-size: 14px;
-      font-family: SimSun, sans-serif;
-      line-height: 1;
-      content: '*';
-    }
-
-    .ant-form-item-control-input {
-      width: 100%;
-      height: auto;
-      padding: 14px 16px;
-      border: 1px solid var(--io-n-1, #e6e7ea);
-      border-radius: 4px;
-
-      .ant-form-item {
-        margin-bottom: 8px;
-      }
-
-      .ant-input {
-        border: 1px solid #fafafb;
-
-        &:focus {
-          border-color: @primary-color !important;
-        }
-      }
-
-      .ant-form-item-control-input {
-        width: 484px;
-        padding: 0;
-        border: none;
-      }
-    }
-  }
-
-  .is-encryption {
-    .ant-form-item-label {
-      width: 116px;
-      text-align: right;
-    }
-  }
-}
-
-.ant-tooltip {
-  z-index: 9999;
-}
-
-.label-group-overlay {
-  display: none;
-}
-
-.set-data-dialog {
-  width: 2000px;
-}
+@import './../../../constants/icons/iconfont.css';
+
+.role-list {
+  .ant-form-item {
+    .ant-form-item-control-input {
+      width: 392px;
+      height: 32px;
+    }
+  }
+  .ant-input {
+    border-color: @background-color-base !important;
+
+    // &:focus {
+    //   border-color: @primary-color !important;
+    // }
+  }
+
+  .ant-table-cell {
+    height: 50px;
+  }
+
+  .ant-table-row-indent + .ant-table-row-expand-icon {
+    margin-top: 0;
+  }
+
+  height: 100%;
+  padding: 0;
+  overflow: auto;
+
+  .app-list-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 24px;
+
+    > div {
+      color: var(--io-n, #021429);
+      font-weight: 500;
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: 24px;
+      /* 150% */
+    }
+  }
+
+  .platform-icons {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    width: 100%;
+
+    span {
+      margin-right: 10px;
+      color: #cfcfcf;
+      font-size: 16px;
+    }
+  }
+
+  .role-list-content {
+    margin-top: 16px;
+
+    .c-grid-cell,
+    .c-grid-header-cell {
+      text-align: left !important;
+      border: none;
+      border-bottom: 1px solid #d1d1d1;
+    }
+
+    .c-grid-cell {
+      text-align: left !important;
+    }
+
+    .c-grid-body .c-grid-row:nth-child(2n) {
+      background: #fff !important;
+    }
+
+    .app-name {
+      cursor: pointer;
+
+      &:hover {
+        color: #00a0ea;
+      }
+    }
+
+    .operating {
+      display: flex;
+      gap: 16px;
+    }
+  }
+}
+
+.ant-select-selection-item-content {
+  .custom-item-right {
+    display: none;
+  }
+}
+
+.appIdsPopupClassName {
+  .ant-select-tree-treenode-checkbox-checked {
+    .custom-item-right {
+      color: #165dff;
+    }
+  }
+}
+
+.add-drawer {
+  z-index: 999 !important;
+  .ant-drawer-header-title {
+    flex-direction: row-reverse;
+  }
+
+  .ant-drawer-close {
+    margin-right: 0 !important;
+  }
+}
+
+.custom-item {
+  display: flex;
+  justify-content: space-between;
+  > :nth-child(1) {
+    max-width: 400px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  .tishi {
+    color: #9aa1a9;
+  }
+}
+.biz-select-option.active {
+  .custom-item {
+    > :nth-child(1) {
+      max-width: 260px;
+    }
+  }
+}
+.custom-item.v2 {
+  > :nth-child(1) {
+    max-width: 330px;
+  }
+}
+.ant-select-tree-treenode-checkbox-checked {
+  .custom-item.v2 {
+    > :nth-child(1) {
+      max-width: 250px;
+    }
+  }
+}
+.role-dialog-content {
+  .group-config {
+    display: flex;
+    margin-bottom: 24px;
+    padding-left: 120px;
+
+    .config-name {
+      margin-right: 12px;
+      color: #5f6085;
+      font-size: 14px;
+      line-height: 30px;
+      white-space: nowrap;
+    }
+
+    .biz-user-condition-type-label {
+      margin-left: -7px;
+    }
+  }
+
+  .ant-form-item {
+    .ant-form-item-control-input {
+      width: 484px;
+      min-height: 32px;
+    }
+  }
+
+  .ant-input {
+    border-color: @background-color-base !important;
+
+    &:focus {
+      border-color: @primary-color !important;
+    }
+  }
+
+  .ant-select-selector {
+    border-color: @background-color-base !important;
+  }
+
+  .biz-select-handle-input {
+    .ant-input {
+      border-color: @background-color-base !important;
+
+      &:focus {
+        border-color: @background-color-base !important;
+      }
+    }
+
+    &:focus {
+      border-color: @primary-color !important;
+    }
+  }
+
+  .ant-input-status-error {
+    border: 1px solid #fb5547 !important;
+
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
+  .ant-select-status-error {
+    border: none !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+    }
+  }
+
+  .biz-select-handle-status-error.active:not(.disable) {
+    box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+  }
+
+  .biz-select-handle-status-error {
+    .ant-input.ant-input-status-error:focus:not(.ant-input-disable):not(.ant-input-borderless),
+    .ant-input.ant-input-status-error-focused:not(.ant-input-disable):not(.ant-input-borderless) {
+      box-shadow: none !important;
+    }
+  }
+
+  .ant-form-item:last-of-type {
+    margin-bottom: 0;
+  }
+
+  color: #5f6085;
+
+  .ant-form-item-label {
+    width: 80px;
+    text-align: right;
+  }
+
+  .menuCode-map {
+    .ant-form-item-label::before {
+      display: inline-block;
+      margin-right: 4px;
+      color: #ff4d4f;
+      font-size: 14px;
+      font-family: SimSun, sans-serif;
+      line-height: 1;
+      content: '*';
+    }
+
+    .ant-form-item-control-input {
+      width: 100%;
+      height: auto;
+      padding: 14px 16px;
+      border: 1px solid var(--io-n-1, #e6e7ea);
+      border-radius: 4px;
+
+      .ant-form-item {
+        margin-bottom: 8px;
+      }
+
+      .ant-input {
+        border: 1px solid #fafafb;
+
+        &:focus {
+          border-color: @primary-color !important;
+        }
+      }
+
+      .ant-form-item-control-input {
+        width: 484px;
+        padding: 0;
+        border: none;
+      }
+    }
+  }
+
+  .is-encryption {
+    .ant-form-item-label {
+      width: 116px;
+      text-align: right;
+    }
+  }
+}
+
+.ant-tooltip {
+  z-index: 9999;
+}
+
+.label-group-overlay {
+  display: none;
+}
+
+.set-data-dialog {
+  width: 2000px;
+}

package/es/modules/companySetting/user/index.js

@@ -518,12 +518,21 @@ var User = function User(props) {
                 transferorId: havePhoneFlg[0].id
               }
             }).then(function (res) {
-              setBtnLoading(false);
               if (res.code == '100000') {
                 message.success('交接成功！');
               }
             }).catch(function (err) {
+              setMoveWorkModal(false);
               setBtnLoading(false);
+              // 数据清空
+              form.setFieldsValue({
+                toType: [],
+                toUser: ''
+              });
+              setNumber({
+                value: '',
+                errorMsg: ''
+              });
               message.success('交接失败！，请联系管理员');
               return false;
             });

package/es/modules/demandManage/index.js

@@ -287,6 +287,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }, "\u67E5\u770B"), /*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
+      disabled: props.record.demandStatus == 102,
       onClick: function onClick() {
         Modal.confirm({
           wrapClassName: "".concat(classPrefix, "-confirm"),
@@ -319,7 +320,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           }
         });
       }
-    }, "\u590D\u5236"), [101, 102].indexOf(props.record.demandStatus) == -1 && (/*#__PURE__*/React.createElement(Button, {
+    }, "\u590D\u5236"), [101, 102, 103].indexOf(props.record.demandStatus) == -1 && (/*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
       onClick: function onClick() {

package/es/modules/personalSetting/securityLog/index.js

@@ -83,7 +83,7 @@ var SecurityLog = function SecurityLog() {
     }).then(function (res) {
       if (parseInt(res === null || res === void 0 ? void 0 : res.code) == 100000) {
         setDateLoading(false);
-        var maxDate = res.data[res.data.length - 1] || '';
+        var maxDate = res.data[0] || '';
         setDateRange(res.data);
         setCondition(function (v) {
           return _objectSpread(_objectSpread({}, v), {}, {

package/es/modules/pointMap/createMetaDrawer.js

@@ -342,6 +342,7 @@ var CreateMeta = function CreateMeta(props) {
         disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
+          changeItemInfo(index, 'prop_type', e);
           changeItemInfo(index, 'type', e);
         },
         options: [{
@@ -417,6 +418,7 @@ var CreateMeta = function CreateMeta(props) {
         disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
+          changeItemInfo(index, 'encryption_type', e);
           changeItemInfo(index, 'encryptionType', e);
         },
         options: [{

package/es/modules/pointMap/pageInfo.js

@@ -295,6 +295,7 @@ var PageInfo = function PageInfo(props) {
             id: id,
             pageName: pageName,
             imgUrl: imgUrl,
+            pageId: props.pageData.id,
             describe: describe
           }
         }).then(function (res) {

package/es/modules/systemSetting/index.less

@@ -1,169 +1,175 @@
-.system-setting-approval-process-create-bg {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 10;
-  background: #fafafb;
-}
-.authUrlPageClass {
-  &-search {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 0px 0px 16px;
-  }
-}
-.DictionaryPage {
-  &-emptyDom {
-    margin: 50px 0px 0px;
-    text-align: center;
-    &-img {
-      display: block;
-      width: 248px;
-      height: 200px;
-      margin: auto;
-      background-image: url('./img/empty-data.png');
-      background-size: 100%;
-    }
-    &-tip {
-      margin: 0px 0px 10px;
-      color: #999;
-    }
-  }
-  .ant-tabs-nav {
-    padding-right: 10%;
-  }
-  &-header {
-    position: relative;
-    &-search {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: 0px 0px 16px;
-      .ant-btn {
-        color: #407fff;
-        border-color: #407fff;
-      }
-    }
-  }
-  &-tabsRight-text {
-    position: absolute;
-    top: 13%;
-    right: 0;
-    width: 10%;
-    color: #165dff;
-    text-align: center;
-    vertical-align: middle;
-    border-left: 1px solid #ccc;
-    cursor: pointer;
-  }
-  &-modal {
-    color: #021429;
-    &-header {
-      height: 50px;
-      padding: 0px 16px;
-      line-height: 50px;
-      background-color: #f2f3f4;
-      &-left {
-        display: inline-block;
-        width: 80%;
-        vertical-align: middle;
-      }
-      &-operation {
-        display: inline-block;
-        width: 20%;
-        text-align: center;
-        vertical-align: middle;
-      }
-    }
-    .ant-input-affix-wrapper {
-      vertical-align: middle;
-    }
-    .DictionaryPage-modal-content {
-      padding: 10px 16px 0px;
-    }
-    &-content {
-      height: 292px;
-      overflow-y: auto;
-      &-item {
-        display: flex;
-        align-items: center;
-        height: 50px;
-        line-height: 50px;
-        border-bottom: 1px solid #f2f3f4;
-      }
-      &-itemLeft {
-        position: relative;
-        display: inline-block;
-        flex: 1;
-        height: 100%;
-        .error-tip {
-          position: absolute;
-          bottom: -28px;
-          left: 3px;
-          width: 100%;
-          color: red;
-          font-size: 14px;
-          letter-spacing: 1px;
-        }
-      }
-      &-itemRight {
-        display: inline-block;
-        width: 40px;
-        color: #165dff;
-        text-align: center;
-        cursor: pointer;
-      }
-      .ant-typography.ant-typography-ellipsis.ant-typography-single-line {
-        height: 50px;
-        margin-bottom: 0px;
-        line-height: 50px;
-        border-bottom: 1px solid #f2f3f4;
-      }
-      .ant-typography-edit {
-        float: right;
-        width: 20%;
-        text-align: center;
-      }
-    }
-    &-footer {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: 16px 0px;
-    }
-  }
-}
-
-// 文档库管理
-.DocumentSetting {
-  &-header {
-    height: 48px;
-    line-height: 48px;
-    border-bottom: 1px solid #e8efff;
-  }
-  &-search {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 16px 0px 16px;
-  }
-  &-emptyDom {
-    margin: 50px 0px 0px;
-    text-align: center;
-    &-img {
-      display: block;
-      width: 248px;
-      height: 200px;
-      margin: auto;
-      background-image: url('./img/empty-data.png');
-      background-size: 100%;
-    }
-    &-tip {
-      margin: 0px 0px 10px;
-      color: #999;
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.system-setting-approval-process-create-bg {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 10;
+  background: #fafafb;
+}
+.authUrlPageClass {
+  &-search {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 0px 0px 16px;
+  }
+}
+.DictionaryPage {
+  &-emptyDom {
+    margin: 50px 0px 0px;
+    text-align: center;
+    &-img {
+      display: block;
+      width: 248px;
+      height: 200px;
+      margin: auto;
+      background-image: url('./img/empty-data.png');
+      background-size: 100%;
+    }
+    &-tip {
+      margin: 0px 0px 10px;
+      color: #999;
+    }
+  }
+  .ant-tabs-nav {
+    padding-right: 10%;
+  }
+  &-header {
+    position: relative;
+    &-search {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 0px 0px 16px;
+      .ant-btn {
+        color: #407fff;
+        border-color: #407fff;
+      }
+    }
+  }
+  &-tabsRight-text {
+    position: absolute;
+    top: 13%;
+    right: 0;
+    width: 10%;
+    color: #165dff;
+    text-align: center;
+    vertical-align: middle;
+    border-left: 1px solid #ccc;
+    cursor: pointer;
+  }
+  &-modal {
+    color: #021429;
+    &-header {
+      height: 50px;
+      padding: 0px 16px;
+      line-height: 50px;
+      background-color: #f2f3f4;
+      &-left {
+        display: inline-block;
+        width: 80%;
+        vertical-align: middle;
+      }
+      &-operation {
+        display: inline-block;
+        width: 20%;
+        text-align: center;
+        vertical-align: middle;
+      }
+    }
+    .ant-input-affix-wrapper {
+      vertical-align: middle;
+    }
+    .DictionaryPage-modal-content {
+      padding: 10px 16px 0px;
+    }
+    &-content {
+      height: 292px;
+      overflow-y: auto;
+      &-item {
+        display: flex;
+        align-items: center;
+        height: 50px;
+        line-height: 50px;
+        border-bottom: 1px solid #f2f3f4;
+      }
+      &-itemLeft {
+        position: relative;
+        display: inline-block;
+        flex: 1;
+        height: 100%;
+        .error-tip {
+          position: absolute;
+          bottom: -28px;
+          left: 3px;
+          width: 100%;
+          color: red;
+          font-size: 14px;
+          letter-spacing: 1px;
+        }
+      }
+      &-itemRight {
+        display: inline-block;
+        width: 40px;
+        color: #165dff;
+        text-align: center;
+        cursor: pointer;
+      }
+      .ant-typography.ant-typography-ellipsis.ant-typography-single-line {
+        height: 50px;
+        margin-bottom: 0px;
+        line-height: 50px;
+        border-bottom: 1px solid #f2f3f4;
+      }
+      .ant-typography-edit {
+        float: right;
+        width: 20%;
+        text-align: center;
+      }
+    }
+    &-footer {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 16px 0px;
+    }
+  }
+}
+
+// 文档库管理
+.DocumentSetting {
+  &-header {
+    height: 48px;
+    line-height: 48px;
+    border-bottom: 1px solid #e8efff;
+  }
+  &-search {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 16px 0px 16px;
+    .ant-input {
+      &:focus {
+        border-color: @primary-color !important;
+      }
+    }
+  }
+  &-emptyDom {
+    margin: 50px 0px 0px;
+    text-align: center;
+    &-img {
+      display: block;
+      width: 248px;
+      height: 200px;
+      margin: auto;
+      background-image: url('./img/empty-data.png');
+      background-size: 100%;
+    }
+    &-tip {
+      margin: 0px 0px 10px;
+      color: #999;
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan-set.4",
+  "version": "2.1.0-zhongyuan-set.6",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "951f03df5e401e76a1684ed0f3aca177c69a1c1c",
+  "gitHead": "43df423b2aa90852139c77f2aa6f0dbcc656dcb5",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }