fix: '流程中心设计流程点击接口传参NAN,建表字段名称正则提示修改，管网配置表格增加loading

src/pages/bsmanager/base/standingBook/EditTable.jsx

@@ -280,7 +280,7 @@ const EditableCell = ({
         },
         {
           pattern: /^(?!(\d+)$)[\u4e00-\u9fffa-zA-Z0-9_]+$/,
-          message: '不能输入特殊符号或者纯数字',
+          message: '不能输入特殊符号或者数字开头',
         },
       ];
     }

src/pages/bsmanager/base/tablemanager/components/TableView.jsx

@@ -261,7 +261,7 @@ const EditableCell = ({
         },
         {
           pattern: /^[^\d][\u4e00-\u9fffA-Za-z0-9_]+$/,
-          message: '不能输入特殊符号或者纯数字',
+          message: '不能输入特殊符号或者数字开头',
         },
       ];
     }

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigNodeMsg.jsx

@@ -33,7 +33,10 @@ const ConfigNodeMsg = (props, ref) => {
   }));
   useEffect(() => {
     form.resetFields();
-    getTableName();
+    if (editMsg.NodeType) {
+      getTableName();
+    }
+
     // 获取反馈类型
     // getFeedbackName();
     getFormData();
@@ -435,8 +438,9 @@ const ConfigNodeMsg = (props, ref) => {
                 ) : (
                   ''
                 )}
-                <span style={{ marginRight: '4px', color: 'red' }}>{
-                 editMsg.NodeType === '1'?'*':''}</span>
+                <span style={{ marginRight: '4px', color: 'red' }}>
+                  {editMsg.NodeType === '1' ? '*' : ''}
+                </span>
                 <span>字段编辑</span>
               </div>
             }

src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less

@@ -246,6 +246,15 @@
 .tileContainer {
   height: 100%;
   overflow-y: scroll;
+  .tableTile {
+    height: 400px;
+    .ant-table-content {
+      height: 341px;
+      .ant-table-row {
+        height: 57px;
+      }
+    }
+  }
 
   .ant-table-wrapper {
     height: 100%;

src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx

@@ -565,9 +565,6 @@ const Map = props => {
         // setFirstList({ ...aa });
         break;
       case 'schemename':
-        // let asd = mapInfo.current?.map.layers;
-        // console.log(asd);
-        // debugger;
         const filterLyrs = mapInfo.current?.map.layers.filter(item => {
           return item.pipenetImark;
         });

src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx

@@ -32,6 +32,7 @@ const VectorData = props => {
   const [searchValue, setSearchValue] = useState('');
   const [radioType, setRadioType] = useState('1');
   const [addVisible, setAddVisible] = useState(false); // 弹窗
+  const [treeTileLoading, setTreeTileLoading] = useState(false);
   const [name, setName] = useState([]);
   const { Search } = Input;
   const columns = [
@@ -327,13 +328,13 @@ const VectorData = props => {
   };
 
   const renderTileSliced = () => {
-    setTreeLoading(true);
+    setTreeTileLoading(true);
     GettMaplayer({
       terminalType: 'base',
       isBaseMap: true,
     })
       .then(res => {
-        setTreeLoading(false);
+        setTreeTileLoading(false);
         if (res.code == '0') {
           let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
           setTileSlicedData(newdata);
@@ -350,6 +351,7 @@ const VectorData = props => {
         }
       })
       .catch(err => {
+        setTreeTileLoading(false);
         if (err.message.indexOf('timeout') !== -1) {
           notification.error({
             message: '提示',
@@ -363,7 +365,6 @@ const VectorData = props => {
             description: err.message,
           });
         }
-        setTreeLoading(false);
       });
   };
   // 搜索
@@ -420,93 +421,92 @@ const VectorData = props => {
   return (
     <>
       <div className={styles.pipeNetwork}>
-        <Spin tip="loading..." spinning={treeLoading}>
-          <div className={styles.tileBtnVe}>
-            <div className={styles.tileBtnLeft}>
-              <span>管网类型：</span>
-              <Radio.Group defaultValue="1" value={radioType} onChange={e => handleSelect(e)}>
-                <Radio.Button value="1" style={{ width: '90px', textAlign: 'center' }}>
-                  管网
-                </Radio.Button>
-                <Radio.Button value="2" style={{ width: '90px', textAlign: 'center' }}>
-                  切片管网
-                </Radio.Button>
-              </Radio.Group>
-            </div>
-            <div className={styles.tileBtnRight}>
-              {radioType == 1 && (
-                <>
-                  <span style={{ marginLeft: '20px', marginRight: '5px' }}>快速检索</span>
-                  <Search
-                    allowClear
-                    placeholder="请输入服务名或工程名"
-                    onSearch={handleSearch}
-                    onChange={handleChange}
-                    value={searchValue}
-                    enterButton
-                    style={{ width: '300px', marginRight: '20px' }}
-                  />
-                  <Button
-                    type="primary"
-                    onClick={() => {
-                      updateAll();
-                    }}
-                    loading={allLoading}
-                    style={{ marginRight: '20px' }}
-                  >
-                    批量更新
-                  </Button>
-                </>
-              )}
-              <Button
-                type="primary"
-                onClick={() => {
-                  handleAdd();
-                }}
-              >
-                新增
-              </Button>
-            </div>
+        <div className={styles.tileBtnVe}>
+          <div className={styles.tileBtnLeft}>
+            <span>管网类型：</span>
+            <Radio.Group defaultValue="1" value={radioType} onChange={e => handleSelect(e)}>
+              <Radio.Button value="1" style={{ width: '90px', textAlign: 'center' }}>
+                管网
+              </Radio.Button>
+              <Radio.Button value="2" style={{ width: '90px', textAlign: 'center' }}>
+                切片管网
+              </Radio.Button>
+            </Radio.Group>
           </div>
-          <div style={{ height: 'calc(100% - 51px)', width: '100%' }}>
-            <Table
-              columns={radioType == 1 ? columns : columnsPart}
-              dataSource={radioType == 1 ? tileData : tileSlicedData}
-              bordered
-              rowKey="CreateTime"
-              scroll={{ y: 'calc(100% - 70px)' }}
-              pagination={{
-                showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
+          <div className={styles.tileBtnRight}>
+            {radioType == 1 && (
+              <>
+                <span style={{ marginLeft: '20px', marginRight: '5px' }}>快速检索</span>
+                <Search
+                  allowClear
+                  placeholder="请输入服务名或工程名"
+                  onSearch={handleSearch}
+                  onChange={handleChange}
+                  value={searchValue}
+                  enterButton
+                  style={{ width: '300px', marginRight: '20px' }}
+                />
+                <Button
+                  type="primary"
+                  onClick={() => {
+                    updateAll();
+                  }}
+                  loading={allLoading}
+                  style={{ marginRight: '20px' }}
+                >
+                  批量更新
+                </Button>
+              </>
+            )}
+            <Button
+              type="primary"
+              onClick={() => {
+                handleAdd();
               }}
-            />
+            >
+              新增
+            </Button>
           </div>
-          <AddModal
-            visible={visible}
-            onCancel={() => setVisible(false)}
-            callBackSubmit={onSubmit}
-            type={type}
-            formObj={formObj}
-            solutionNames={solutionNames}
-          />
-          <PreviewModal
-            visible={previewVisible}
-            onCancel={() => setPreviewVisible(false)}
-            metaData={currentMetaData}
-          />
-          <MeteDataModal
-            visible={meteDataVisible}
-            onCancel={() => setMeteDataVisible(false)}
-            metaData={currentMetaData}
-          />
-          <AddSlicedModal
-            visible={addVisible}
-            onCancel={() => setAddVisible(false)}
-            callBackSubmit={onSubmit}
-            type={type}
-            formObj={record}
-            name={name}
+        </div>
+        <div style={{ height: 'calc(100% - 51px)', width: '100%' }}>
+          <Table
+            loading={radioType == 1 ? treeLoading : treeTileLoading}
+            columns={radioType == 1 ? columns : columnsPart}
+            dataSource={radioType == 1 ? tileData : tileSlicedData}
+            bordered
+            rowKey="CreateTime"
+            scroll={{ y: 'calc(100% - 70px)' }}
+            pagination={{
+              showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
+            }}
           />
-        </Spin>
+        </div>
+        <AddModal
+          visible={visible}
+          onCancel={() => setVisible(false)}
+          callBackSubmit={onSubmit}
+          type={type}
+          formObj={formObj}
+          solutionNames={solutionNames}
+        />
+        <PreviewModal
+          visible={previewVisible}
+          onCancel={() => setPreviewVisible(false)}
+          metaData={currentMetaData}
+        />
+        <MeteDataModal
+          visible={meteDataVisible}
+          onCancel={() => setMeteDataVisible(false)}
+          metaData={currentMetaData}
+        />
+        <AddSlicedModal
+          visible={addVisible}
+          onCancel={() => setAddVisible(false)}
+          callBackSubmit={onSubmit}
+          type={type}
+          formObj={record}
+          name={name}
+        />
       </div>
     </>
   );