@zgfe/modules-settings 2.1.0-zhongyuan.2 → 2.1.0-zhongyuan.21

package/es/modules/pointMap/styles/tree.less

@@ -93,6 +93,7 @@
     overflow: hidden;
     .gengduocaozuo1 {
       color: #354354;
+      transform: translateY(4px);
     }
     .gengduocaozuo1:hover {
       color: #165dff;
@@ -135,6 +136,23 @@
           margin-right: 10px;
         }
       }
+      &-iconList {
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        display: none;
+        justify-content: space-around;
+        width: 85px;
+        font-size: 16px;
+        background: #ffffff;
+        .anticon:hover {
+          color: #165dff;
+        }
+      }
+      &:hover &-iconList {
+        display: flex;
+      }
     }
     .ant-tree-title {
       display: block;

package/es/modules/pointMap/tree.js

@@ -16,7 +16,7 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { Button, Dropdown, Empty, Input, message, Modal, Select, Tree, Popover, Spin, Tag, Checkbox } from 'antd';
-import { QuestionCircleOutlined, EnvironmentOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined, EnvironmentOutlined, PlusCircleOutlined, MinusCircleOutlined, EditOutlined } from '@ant-design/icons';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import './styles/tree.less';
 import { BizDialog, BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
@@ -58,7 +58,9 @@ var formatTreeArr = function formatTreeArr(list, arrTemp, parentName) {
         arrTemp.push({
           id: item.id,
           name: parentName ? parentName + ' / ' + item.name : item.name,
-          tagJson: '字典标签1'
+          tagJson: item.labels.map(function (res) {
+            return res.labelName;
+          }).join('')
         });
         if (item.children.length > 0) {
           formatTreeArr(item.children, arrTemp, item.name);
@@ -98,7 +100,8 @@ var pointMap = function pointMap(props) {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     route = _useContext.route,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
     pointVersionList = _useState12[0],
@@ -143,12 +146,17 @@ var pointMap = function pointMap(props) {
     _useState32 = _slicedToArray(_useState31, 2),
     isShowDel = _useState32[0],
     setIsShowDel = _useState32[1];
-  var _useState33 = useState(!!props.pageStatusIsEdit),
+  var _useState33 = useState([]),
     _useState34 = _slicedToArray(_useState33, 2),
-    pageStatusIsEdit = _useState34[0],
-    setPageStatusIsEdit = _useState34[1];
+    pointList = _useState34[0],
+    setPointList = _useState34[1];
+  var _useState35 = useState(!!props.pageStatusIsEdit),
+    _useState36 = _slicedToArray(_useState35, 2),
+    pageStatusIsEdit = _useState36[0],
+    setPageStatusIsEdit = _useState36[1];
   useEffect(function () {
     pointGetVersion();
+    getPointList();
   }, []);
   useEffect(function () {
     setPageStatusIsEdit(!!props.pageStatusIsEdit);
@@ -186,6 +194,7 @@ var pointMap = function pointMap(props) {
     });
   };
   var getPointTree = function getPointTree() {
+    var fn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () {};
     request(apis.getPointTree, {
       method: 'post',
       data: {
@@ -194,7 +203,7 @@ var pointMap = function pointMap(props) {
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
-        pageNum = res === null || res === void 0 ? void 0 : res.data.length;
+        pageNum = ((res === null || res === void 0 ? void 0 : res.data.length) || 0) + 1;
         setTreeData(formatTreeData((res === null || res === void 0 ? void 0 : res.data) || []));
         setTreeArr(formatTreeArr((res === null || res === void 0 ? void 0 : res.data) || [], [], '') || []);
         if (!selectedKeys) {
@@ -206,11 +215,32 @@ var pointMap = function pointMap(props) {
           // props.onChangePage(res?.data ? { ...res?.data[0], currentPointVersion } : undefined);
         }
         setChangeNameId(undefined);
+        fn();
       }
     }).catch(function (err) {
       console.log(err);
     });
   };
+  //查询位置标签
+  var getPointList = function getPointList() {
+    request(apis.dict.getTagList, {
+      method: 'post',
+      data: {
+        labelType: 1,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (res && res.code == 100000) {
+        setPointList(res.data.map(function (res) {
+          return {
+            label: res.labelName,
+            value: res.id,
+            labelType: 1
+          };
+        }));
+      }
+    });
+  };
   var addPage = function addPage(operationType, parentId, targetPageId) {
     request(apis.createPage, {
       method: 'post',
@@ -341,8 +371,7 @@ var pointMap = function pointMap(props) {
     }
   };
   var titleRender = function titleRender(nodeData) {
-    var onItemClick = function onItemClick(_ref) {
-      var key = _ref.key;
+    var onItemClick = function onItemClick(key) {
       switch (key) {
         case '0':
           if (nodeData.storey >= 20) {
@@ -374,18 +403,84 @@ var pointMap = function pointMap(props) {
       // message.info(`Click on item ${key}`);
     };
     //位置标签list
-    var pointContent = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tag, {
-      color: "magenta"
-    }, "magenta"), /*#__PURE__*/React.createElement(Tag, {
-      color: "red"
-    }, "red"), /*#__PURE__*/React.createElement(Tag, {
-      color: "volcano"
-    }, "volcano"), /*#__PURE__*/React.createElement(Tag, {
-      color: "orange"
-    }, "orange"), /*#__PURE__*/React.createElement(Tag, {
-      color: "gold"
-    }, "gold"));
-    return /*#__PURE__*/React.createElement("div", {
+    var color = ['magenta', 'red', 'volcano', 'orange', 'gold', 'lime', 'green', 'cyan', 'blue', 'geekblue', 'purple'];
+    var pointContent = /*#__PURE__*/React.createElement(React.Fragment, null, nodeData.labels && nodeData.labels.map(function (res, index) {
+      return /*#__PURE__*/React.createElement(Tag, {
+        key: index,
+        color: color[index]
+      }, res.labelName);
+    }));
+    var pointIds = nodeData.labels && nodeData.labels.map(function (res) {
+      return res.id;
+    }) || [];
+    var menu = {
+      items: [{
+        label: '添加子页面',
+        icon: /*#__PURE__*/React.createElement(IconFont, {
+          type: "tianjia3"
+        }),
+        key: '0'
+      }, {
+        label: '上方添加页面',
+        icon: /*#__PURE__*/React.createElement(IconFont, {
+          type: "shangfangtianjia"
+        }),
+        key: '1'
+      }, {
+        label: '下方添加页面',
+        icon: /*#__PURE__*/React.createElement(IconFont, {
+          type: "xiafangtianjia"
+        }),
+        key: '2'
+      }, {
+        label: '选择位置标签',
+        icon: /*#__PURE__*/React.createElement(EnvironmentOutlined, null),
+        key: '5',
+        children: pointList.map(function (res) {
+          return {
+            key: '5' + res.value,
+            label: (/*#__PURE__*/React.createElement(Checkbox, {
+              defaultChecked: pointIds.indexOf(res.value) != -1,
+              onChange: function onChange(e) {
+                onChangeTag(e, nodeData, res);
+              },
+              onClick: function onClick(e) {
+                e.stopPropagation();
+              }
+            }, res.label)),
+            disabled: true
+          };
+        })
+      }, {
+        type: 'divider'
+      }, {
+        label: '重命名',
+        icon: /*#__PURE__*/React.createElement(IconFont, {
+          type: "bianji1"
+        }),
+        key: '3'
+      }, {
+        type: 'divider'
+      }, {
+        label: '删除',
+        icon: /*#__PURE__*/React.createElement(IconFont, {
+          type: "shanchu2"
+        }),
+        key: '4'
+      }],
+      onClick: function onClick(item) {
+        item.domEvent.stopPropagation();
+        onItemClick(item.key);
+      }
+    };
+    return /*#__PURE__*/React.createElement(Dropdown, {
+      disabled: !authority[1724922805],
+      menu: menu,
+      overlayStyle: {
+        width: 156
+      },
+      trigger: ['contextMenu']
+    }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-tree-item")
     }, changeNameId === nodeData.id ? (/*#__PURE__*/React.createElement(Input, {
       style: {
@@ -431,118 +526,95 @@ var pointMap = function pointMap(props) {
       }
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-tree-item-title-name")
-    }, nodeData.name, " (1) "), /*#__PURE__*/React.createElement(Popover, {
+    }, nodeData.name, " (", nodeData.pointSum || 0, ")"), /*#__PURE__*/React.createElement(Popover, {
       placement: "topLeft",
       title: "\u4F4D\u7F6E\u6807\u7B7E",
       content: pointContent
-    }, /*#__PURE__*/React.createElement(Tag, {
-      color: "magenta"
-    }, "magenta"), /*#__PURE__*/React.createElement(Tag, {
-      color: "red"
-    }, "red"), /*#__PURE__*/React.createElement(Tag, {
-      color: "volcano"
-    }, "volcano"), /*#__PURE__*/React.createElement(Tag, {
-      color: "orange"
-    }, "orange"), /*#__PURE__*/React.createElement(Tag, {
-      color: "gold"
-    }, "gold"))))), /*#__PURE__*/React.createElement(Dropdown, {
+    }, pointContent)))), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-tree-item-iconList")
+    }, /*#__PURE__*/React.createElement(EditOutlined, {
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        onItemClick('3');
+      }
+    }), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        onItemClick('4');
+      }
+    }), /*#__PURE__*/React.createElement(PlusCircleOutlined, {
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        onItemClick('2');
+      }
+    }), /*#__PURE__*/React.createElement(Dropdown, {
       disabled: !authority[1724922805],
-      placement: 'bottomRight',
-      menu: {
-        items: [{
-          label: '添加子页面',
-          icon: /*#__PURE__*/React.createElement(IconFont, {
-            type: "tianjia3"
-          }),
-          key: '0'
-        }, {
-          label: '上方添加页面',
-          icon: /*#__PURE__*/React.createElement(IconFont, {
-            type: "shangfangtianjia"
-          }),
-          key: '1'
-        }, {
-          label: '下方添加页面',
-          icon: /*#__PURE__*/React.createElement(IconFont, {
-            type: "xiafangtianjia"
-          }),
-          key: '2'
-        }, {
-          label: '选择位置标签',
-          icon: /*#__PURE__*/React.createElement(EnvironmentOutlined, null),
-          key: '5',
-          children: [{
-            key: '3-1',
-            label: (/*#__PURE__*/React.createElement(Checkbox, {
-              onChange: function onChange(e) {
-                onChangeTag(e, 'key');
-              }
-            }, "\u6807\u7B7E1")),
-            disabled: true
-          }, {
-            key: '3-2',
-            label: (/*#__PURE__*/React.createElement(Checkbox, {
-              onChange: function onChange(e) {
-                onChangeTag(e, 'key');
-              }
-            }, "\u6807\u7B7E2")),
-            disabled: true
-          }]
-        }, {
-          type: 'divider'
-        }, {
-          label: '重命名',
-          icon: /*#__PURE__*/React.createElement(IconFont, {
-            type: "bianji1"
-          }),
-          key: '3'
-        }, {
-          type: 'divider'
-        }, {
-          label: '删除',
-          icon: /*#__PURE__*/React.createElement(IconFont, {
-            type: "shanchu2"
-          }),
-          key: '4'
-        }],
-        onClick: onItemClick
-      },
+      menu: menu,
       overlayStyle: {
         width: 156
       },
       trigger: ['click']
     }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "gengduocaozuo1",
       onClick: function onClick(e) {
         e.stopPropagation();
-      },
-      type: "gengduocaozuo1"
-    })));
+      }
+    })))));
   };
-  var onChangeTag = function onChangeTag(e, key) {
-    console.log(e, key, 'onChangeTag');
+  var onChangeTag = function onChangeTag(e, node, option) {
+    labelRelation(e.target.checked, node, option);
   };
-  var _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    isOpen = _useState36[0],
-    setIsOpen = _useState36[1];
+  //绑定和解绑标签
+  var labelRelation = function labelRelation(checked, node, option) {
+    request(checked ? apis.dict.addLabelRelation : apis.dict.delLabelRelation, {
+      method: 'post',
+      data: {
+        id: option.value,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        labelType: 1,
+        eventId: node.id
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        getPointTree(function () {
+          var labels = node.labels;
+          if (checked) {
+            labels.push(option);
+          } else {
+            labels = labels.filter(function (res) {
+              return res.id != option.value;
+            });
+          }
+          node.labels = labels;
+          props.onChangePage(_objectSpread(_objectSpread({}, node), {}, {
+            currentPointVersion: currentPointVersion
+          }));
+        });
+      }
+    });
+  };
+  var _useState37 = useState(false),
+    _useState38 = _slicedToArray(_useState37, 2),
+    isOpen = _useState38[0],
+    setIsOpen = _useState38[1];
   var downloadHelpFile = function downloadHelpFile() {
     window.open("/\u63A8\u8350\u57CB\u70B9\u65B9\u6848.xlsx");
   };
   // 分享看板二维码
-  var _useState37 = useState(''),
-    _useState38 = _slicedToArray(_useState37, 2),
-    qrCodeShare = _useState38[0],
-    setqrCodeShare = _useState38[1];
-  // 分享看板二维码-显示控制
-  var _useState39 = useState(false),
+  var _useState39 = useState(''),
     _useState40 = _slicedToArray(_useState39, 2),
-    qrCodeShareShow = _useState40[0],
-    setqrCodeShareShow = _useState40[1];
-  // 二维码加载中
+    qrCodeShare = _useState40[0],
+    setqrCodeShare = _useState40[1];
+  // 分享看板二维码-显示控制
   var _useState41 = useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    qrCodeLoading = _useState42[0],
-    setQrCodeLoading = _useState42[1];
+    qrCodeShareShow = _useState42[0],
+    setqrCodeShareShow = _useState42[1];
+  // 二维码加载中
+  var _useState43 = useState(false),
+    _useState44 = _slicedToArray(_useState43, 2),
+    qrCodeLoading = _useState44[0],
+    setQrCodeLoading = _useState44[1];
   var onOpenChangeShare = function onOpenChangeShare(open) {
     setqrCodeShareShow(open);
     if (qrCodeShare === '') {
@@ -580,8 +652,8 @@ var pointMap = function pointMap(props) {
           key: item
         };
       }),
-      onClick: function onClick(_ref2) {
-        var key = _ref2.key;
+      onClick: function onClick(_ref) {
+        var key = _ref.key;
         setIsOpen(false);
         setValue('');
         setSelectedKeys(undefined);
@@ -620,7 +692,7 @@ var pointMap = function pointMap(props) {
   })))), /*#__PURE__*/React.createElement("a", {
     className: "".concat(classPrefix, "-select-box"),
     onClick: downloadHelpFile
-  }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null), "\u5E2E\u52A9"), /*#__PURE__*/React.createElement("a", {
+  }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null), "\u5E2E\u52A9"), showProdDownload && (/*#__PURE__*/React.createElement("a", {
     className: "".concat(classPrefix, "-select-box"),
     onClick: function onClick() {
       if (!authority[1724922774]) {
@@ -631,7 +703,7 @@ var pointMap = function pointMap(props) {
     }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"
-  }), "\u5BFC\u5165\u9875\u9762")), /*#__PURE__*/React.createElement("div", {
+  }), "\u5BFC\u5165\u9875\u9762"))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-search")
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
     className: "".concat(classPrefix, "-search-selectType"),
@@ -645,6 +717,7 @@ var pointMap = function pointMap(props) {
     }],
     onChange: function onChange(value) {
       setSearchType(value);
+      setValue(undefined);
     }
   })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
     value: value,
@@ -661,6 +734,7 @@ var pointMap = function pointMap(props) {
       value: 'id',
       label: 'name'
     },
+    allowClear: true,
     options: treeArr,
     popupClassName: "".concat(classPrefix, "-search-popup")
   })), /*#__PURE__*/React.createElement("div", {

package/es/modules/systemSetting/dictionaryItem/dictionaryManagement/create.js

@@ -22,7 +22,8 @@ var clearDict = function clearDict(_ref) {
     onSetclose = _ref.onSetclose,
     currentDictDetail = _ref.currentDictDetail;
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    showProdDownload = _useContext.showProdDownload;
   var _useState = useState(addDictShow),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -36,7 +37,7 @@ var clearDict = function clearDict(_ref) {
     openImportModal = _useState6[0],
     setOpenImportModal = _useState6[1];
   var columns = [{
-    title: '字典名',
+    title: '属性值',
     dataIndex: 'name',
     key: 'name',
     render: function render(text, record, index) {
@@ -80,12 +81,13 @@ var clearDict = function clearDict(_ref) {
     request((currentDictDetail === null || currentDictDetail === void 0 ? void 0 : currentDictDetail.id) ? apis.dict.dictUpdate : apis.dict.dictSave, {
       method: 'post',
       data: {
+        id: (currentDictDetail === null || currentDictDetail === void 0 ? void 0 : currentDictDetail.id) || undefined,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        name: values.name,
+        dictName: values.dictName,
         remark: values.remark,
-        dictValue: dictList.map(function (res) {
+        dictValue: _toConsumableArray(new Set(dictList.map(function (res) {
           return res.name;
-        })
+        })))
       }
     }).then(function (res) {
       if (!res) return;
@@ -136,11 +138,12 @@ var clearDict = function clearDict(_ref) {
   //初始请求初始化
   useEffect(function () {
     if (currentDictDetail) {
+      var _currentDictDetail$di;
       dictForm.setFieldsValue({
-        name: currentDictDetail.name,
+        dictName: currentDictDetail.dictName,
         remark: currentDictDetail.remark
       });
-      setDictList(currentDictDetail.dictValue.map(function (res) {
+      setDictList((_currentDictDetail$di = currentDictDetail.dictValue) === null || _currentDictDetail$di === void 0 ? void 0 : _currentDictDetail$di.split(',').map(function (res) {
         return {
           name: res,
           key: Math.random() * 10000
@@ -155,10 +158,7 @@ var clearDict = function clearDict(_ref) {
     title: /*#__PURE__*/React.createElement("div", null, currentDictDetail ? '修改' : '创建', "\u5C5E\u6027\u5B57\u5178", /*#__PURE__*/React.createElement("div", {
       className: "clearDict-drawerCloseIcon",
       onClick: onClose
-    }, /*#__PURE__*/React.createElement(CloseOutlined, {
-      onPointerEnterCapture: undefined,
-      onPointerLeaveCapture: undefined
-    }))),
+    }, /*#__PURE__*/React.createElement(CloseOutlined, null))),
     onClose: onClose,
     closeIcon: false,
     open: open,
@@ -179,22 +179,22 @@ var clearDict = function clearDict(_ref) {
       span: 20
     },
     initialValues: {
-      name: '',
+      dictName: '',
       desctiption: ''
     },
     onFinish: onFinish,
     labelAlign: "right"
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u5C5E\u6027\u503C",
-    name: "name",
+    label: "\u5C5E\u6027\u5B57\u5178\u540D",
+    name: "dictName",
     rules: [{
       required: true,
-      message: '请输入属性值'
+      message: '请输入属性字典名'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     showCount: true,
     maxLength: 50,
-    placeholder: "\u8BF7\u8F93\u5165\u5C5E\u6027\u503C"
+    placeholder: "\u8BF7\u8F93\u5165\u5C5E\u6027\u5B57\u5178\u540D"
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5907\u6CE8",
     name: "remark"
@@ -214,17 +214,17 @@ var clearDict = function clearDict(_ref) {
     columns: columns,
     pagination: false,
     scroll: {
-      y: 396
+      y: 'calc(100vh - 430px)'
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "clearDict-addListBtn"
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: onHandlePush
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u6DFB\u52A0\u503C"), /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u6DFB\u52A0\u503C"), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: onHandleUploading
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u4ECE\u6587\u4EF6\u6DFB\u52A0"))), openImportModal && (/*#__PURE__*/React.createElement(ImportMetaDialog, {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u4ECE\u6587\u4EF6\u6DFB\u52A0")))), openImportModal && (/*#__PURE__*/React.createElement(ImportMetaDialog, {
     uploadFile: apis.dict.dictUpload,
     downloadTempleUrl: apis.dict.dictTemplate,
     fileName: "\u5C5E\u6027\u503C\u5BFC\u5165\u6A21\u677F",
@@ -232,7 +232,13 @@ var clearDict = function clearDict(_ref) {
       setOpenImportModal(false);
     },
     onSuccess: function onSuccess(result) {
-      console.log(result);
+      setDictList([].concat(_toConsumableArray(dictList), _toConsumableArray(result.map(function (res) {
+        return {
+          name: res,
+          key: Math.random() * 10000
+        };
+      }))));
+      setOpenImportModal(false);
     }
   })));
 };

package/es/modules/systemSetting/dictionaryItem/dictionaryManagement/css/index.less

@@ -38,10 +38,11 @@
   &-tableContainer {
     margin-top: 10px;
     .ant-table {
-      min-height: 448px !important; /* 设置表格最小高度 */
+      height: calc(100vh - 380px);
+      min-height: 410px !important; /* 设置表格最小高度 */
     }
     .ant-empty-normal {
-      height: 299px; /* 设置表格最小高度 */
+      height: 260px; /* 设置表格最小高度 */
     }
   }
 }

package/es/modules/systemSetting/dictionaryItem/dictionaryManagement/index.js

@@ -36,9 +36,9 @@ var DictionaryManagement = function DictionaryManagement() {
     },
     width: 80
   }, {
-    title: '字典名',
-    dataIndex: 'name',
-    key: 'name',
+    title: '属性字典名',
+    dataIndex: 'dictName',
+    key: 'dictName',
     render: function render(text) {
       return /*#__PURE__*/React.createElement(Tooltip, {
         title: text
@@ -53,8 +53,8 @@ var DictionaryManagement = function DictionaryManagement() {
     }
   }, {
     title: '创建人',
-    dataIndex: 'createUser',
-    key: 'createUser',
+    dataIndex: 'creatorName',
+    key: 'creatorName',
     width: 140
   }, {
     title: '备注',
@@ -98,6 +98,7 @@ var DictionaryManagement = function DictionaryManagement() {
     setAddDictShow = _useState4[1];
   var handleAddDict = function handleAddDict() {
     setAddDictShow(true);
+    setDictDetail(undefined);
   };
   /**
    * 字典列表， 搜索名称 删除字典
@@ -123,7 +124,7 @@ var DictionaryManagement = function DictionaryManagement() {
   }, []);
   //分页搜索
   var getList = function getList() {
-    request(apis.dict.getDictList, {
+    request(apis.dict.getDictPage, {
       method: 'post',
       data: {
         pageNo: tableParams.current,
@@ -133,7 +134,7 @@ var DictionaryManagement = function DictionaryManagement() {
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        setDictList(res.data.data);
+        setDictList(res.data.dictList);
         // 总页数
         setTableParams(function (pre) {
           return _objectSpread(_objectSpread({}, pre), {}, {
@@ -191,7 +192,8 @@ var DictionaryManagement = function DictionaryManagement() {
     columns: columns,
     onChange: handlePage,
     scroll: {
-      x: 992
+      x: 992,
+      y: 390
     }
   }), addDictShow && (/*#__PURE__*/React.createElement(CreateDict, {
     addDictShow: addDictShow,

package/es/modules/systemSetting/dictionaryItem/dictionaryManagement/type/index.d.ts

@@ -1,8 +1,8 @@
 export interface DictDetailType {
     id: number;
-    name: string;
+    dictName: string;
     remark: string;
-    dictValue: string[];
+    dictValue: string;
 }
 export interface DictList {
     name: string;