页面微调

src/pages/internalEvaluation/configuration/datasetconfig.tsx

@@ -185,7 +185,7 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
           }
         ]} label="数据集编号"/>
             <SDFormText name="dataSetName" rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]} label="数据集名称"/>
-            <SDFormDict dictKey="@selectDataSource" name="dataSourcesNo" rules={[{required:true}]} label="数据源编号"/>
+            <SDFormDict dictKey="@selectDataSource" name="dataSourcesNos" rules={[{required:true}]} multiple={true} label="数据源编号"/>
         </SDModalForm>
       )}
         </SDPage>

src/pages/internalEvaluation/configuration/datasources.tsx

@@ -351,6 +351,9 @@ const datasources : React.FC<widowRush> = (prop:widowRush) => {
           onClick={()=>{
             setEditType('create');
             setDetailVisible(true);
+            setInputParamList([]);
+            setQueryLogicList([]);
+            setDataItemConfigList([]);
           }}
           >
             新增

src/pages/internalEvaluation/configuration/indexconfig.tsx

@@ -6,7 +6,7 @@ import type { IndexConfigModel, IndexSourceModel } from '@/services/internalEval
 import { WomanOutlined } from "@ant-design/icons";
 import { ProductProps } from "@/sundataImport";
 import { deleteRows, getDataList, selectDetailData, updateExistData, createData } from "@/services/internalEvaluation/configuration/indexconfig";
-import { countChineseChars } from "../utils/rwacheckutils";
+import { countChineseChars, firstCharIsNotNumber } from "../utils/rwacheckutils";
 import { useModel } from '@umijs/max';
 
 type widowRush = {
@@ -221,6 +221,7 @@ const indexconfig : React.FC<widowRush> = (prop:widowRush) => {
           onClick={()=>{
             setEditType('create');
             setDetailVisible(true);
+            setIndexSourceList([]);
           }}
           >
             新增
@@ -252,7 +253,22 @@ const indexconfig : React.FC<widowRush> = (prop:widowRush) => {
           formRef={formRef}
         >
             <SDAreaTtile title='指标配置信息'/>
-            <SDFormText name="indexNo"  readonlyCond="update" required={true} rules={[{required:true},{validator:validateFun.number,message:'请输入数字'}]}  label="指标编号"/>
+            <SDFormText name="indexNo"  readonlyCond="update"
+            rules={[
+              { required: true, message: '请输入编号' },
+              {
+                validator:validateFun.account
+              },
+              {
+                validator: (rule, value, callback)=> {
+                  if (firstCharIsNotNumber(value)>0) {
+                    callback('编号不能以数字开头');
+                  } else {
+                    callback();
+                  }
+    
+                }
+              }]}  label="指标编号"/>
             <SDFormText name="indexName" rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]} label="指标名称"/>
             <SDFormText type="textarea" name="indexLogic"  label="指标逻辑"/>
 

src/services/internalEvaluation/configuration/datasetconfig.ts

@@ -8,6 +8,7 @@ export type DataSetConfigModel = {
     dataSetName?: string;
     // 数据源编号
     dataSourcesNo?: string;
+    dataSourcesNos?:string[];
   } & BasePageModel;
 
   /** 获取页面初始化查询 POST*/