fix: 'web配置新增网站增加功能标签配置'

src/pages/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx

@@ -97,6 +97,7 @@ const AddModal = props => {
     '二维码识别',
     '设备二维码',
     '位置坐标',
+    '富文本',
   ]);
   const [visible, setVisible] = useState(false); // 弹窗
   const [isShow, setIsShow] = useState(false); // 弹窗

src/pages/dataCenter/dictionary/WebDic.jsx

@@ -91,6 +91,15 @@ const WebDic = () => {
       title: () => <span className={styles.font}>名称</span>,
       dataIndex: 'nodeName',
       key: 'nodeName',
+      onCell: () => ({
+        style: {
+          maxWidth: 350,
+          overflow: 'hidden',
+          whiteSpace: 'nowrap',
+          textOverflow: 'ellipsis',
+          cursor: 'auto',
+        },
+      }),
       // render: item => searchStyle(item),
       render: record => (
         <Tooltip placement="topLeft" title={record}>
@@ -103,6 +112,11 @@ const WebDic = () => {
       key: 'action',
       width: 100,
       align: 'center',
+      onCell: () => ({
+        style: {
+          cursor: '	auto',
+        },
+      }),
       render: record => (
         <Space>
           <Tooltip title="编辑">
@@ -157,7 +171,7 @@ const WebDic = () => {
       key: 'ID',
       width: 60,
       align: 'center',
-      className: 'column',
+      // className: 'column',
       render: (text, record, index) => (
         <Space>
           <span>{index + 1}</span>
@@ -168,14 +182,14 @@ const WebDic = () => {
       title: () => <span className={styles.font}>名称</span>,
       dataIndex: 'nodeName',
       key: 'nodeName',
-      className: 'column',
+      // className: 'column',
       onCell: () => ({
         style: {
           maxWidth: 200,
           overflow: 'hidden',
           whiteSpace: 'nowrap',
           textOverflow: 'ellipsis',
-          cursor: 'pointer',
+          cursor: '	auto',
         },
       }),
       render: record => (
@@ -189,14 +203,14 @@ const WebDic = () => {
       dataIndex: 'nodeValue',
       key: 'nodeValue',
       // width: 400,
-      className: 'column',
+      // className: 'column',
       onCell: () => ({
         style: {
           maxWidth: 300,
           overflow: 'hidden',
           whiteSpace: 'nowrap',
           textOverflow: 'ellipsis',
-          cursor: 'pointer',
+          cursor: '	auto',
         },
       }),
       render: record => {
@@ -214,8 +228,13 @@ const WebDic = () => {
       title: () => <span className={styles.font}>操作</span>,
       key: 'action',
       width: 100,
-      className: 'column',
+      // className: 'column',
       align: 'center',
+      onCell: () => ({
+        style: {
+          cursor: '	auto',
+        },
+      }),
       render: record => (
         <Space>
           <Tooltip title="编辑">
@@ -929,13 +948,22 @@ const WebDic = () => {
             {/* 一级条目 表格 */}
             <DragTable
               size="small"
+              ItemTypes="first"
+              bordered
               rowKey={record => record.nodeID}
               columns={columns}
-              dataSource={data}
-              scroll={{ y: 'calc(100vh - 370px)' }}
-              bordered
               dragCallBack={dragCallBack}
               className={styles.pab}
+              dataSource={data}
+              scroll={{ y: 'calc(100vh - 370px)' }}
+              rowClassName={record => setRowClassName(record.nodeID)}
+              onClick={record => {
+                getData(record.nodeID);
+                setSelect(record);
+                setSelectColor(record.nodeID);
+                setSelectID(record.nodeID);
+                setName(record.nodeName);
+              }}
               title={() => (
                 <div>
                   <span>一级条目</span>
@@ -952,15 +980,6 @@ const WebDic = () => {
                   </Tooltip>
                 </div>
               )}
-              rowClassName={record => setRowClassName(record.nodeID)}
-              onClick={record => {
-                getData(record.nodeID);
-                setSelect(record);
-                setSelectColor(record.nodeID);
-                setSelectID(record.nodeID);
-                setName(record.nodeName);
-              }}
-              ItemTypes="first"
               pagination={false}
             />
           </Col>

src/pages/dataCenter/dictionary/WebDic.less

@@ -62,4 +62,10 @@
     max-width: 98%;
     margin-left: 2%;
   }
+  .ant-table-cell > div {
+    overflow: hidden;
+    max-width: 350px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 }

src/pages/productCenter/webConfig/components/siteConfigDrawer.js

@@ -246,6 +246,16 @@ export default props => {
             ))}
           </Select>
         </Form.Item>
+        <Form.Item label="功能标签" name="mdi">
+          <Select placeholder="请选择功能标签">
+            <Option value="MDI" key="0">
+              多标签模式
+            </Option>
+            <Option value="SDI" key="1">
+              单标签模式
+            </Option>
+          </Select>
+        </Form.Item>
         <Form.Item label="二维码地址" name="qrcode">
           <Input placeholder="请输入二维码地址" autoComplete="off" />
         </Form.Item>