init

qmj
1 parent 198ee074
Showing 67 changed files with 3401 additions and 9395 deletions
.prettierrc
package.json
public/favicon.ico
public/数字工厂MES系统操作指引.pdf
src/components/Common/CommonBase.js
src/components/Common/CommonComponent/index.js
src/components/Common/CommonHooks/useCommonBase.js
src/components/Common/CommonInstructSet.js
src/components/Common/CommonListSelect/index.js
src/components/Common/CommonTable/index.js
src/components/Common/CommonTable/index.less
src/components/Common/CommonViewDragable/index.js
src/components/Common/CommonViewDragable/rglUtils.js
src/components/Common/CommonViewTable/index.js
src/components/Common/OfficePreview/index.js
src/default.less
src/index.less
src/indexNew.less
src/mes/common/RunningStatus/index.js
src/mes/common/buttonComponent/index.js
+{
+  "printWidth": 150,
+  "eslintIntegration": true,
+  "stylelintIntegration": true,
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false,
+  "quoteProps": "as-needed",
+  "jsxSingleQuote": false,
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "htmlWhitespaceSensitivity": "css",
+  "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
+  "files.insertFinalNewline": true,
+  "useTabs": false,
+  "endOfLine": "lf",
+  "ignorePath": ".gnore",
+  "trailingComma": "es5",
+  "jsxBracketSameLine": false,
+  "bracketSameLine": false
+}
 \ No newline at end of file
@@ -3,7 +3,7 @@
   "version": "1.0.5",
   "private": true,
   "scripts": {
-    "start": "set port=8543&roadhog server --progress --watch --colors --profile",
+    "start": "set port=9005&roadhog server --progress --watch --colors --profile",
     "build": "roadhog build",
     "lint": "eslint --ext .js src test",
     "precommit": "npm run lint"
@@ -592,7 +592,7 @@ export default (ChildComponent) =&gt; {
             const returnFilterData = returnData.filter(item => commonUtils.isNotEmptyObject(item.sDivRow) && item.sDivRow !== '');
             if (commonUtils.isNotEmptyArr(returnFilterData)) {
               returnFilterData.forEach((tableDataRow, index) => {
-                /* 找到白班与晚班区间的汇总条数与工时 */
+                /* 找到早班与晚班区间的汇总条数与工时 */
                 let startIndex = 0; /* 找到开始下标 */
                 let endindex = 0; /* 找到结束下标 */
                 let sliceData = [];
@@ -310,7 +310,7 @@ export default class CommonComponent extends Component {
   onBlurText = (event, timeout = 0) => {
     const currentValue = event?.target?.value;
     if (currentValue == this.lastValue) {
-      this.props.app.globalFun?.onSetMask(false);
+      this.props.app?.globalFun?.onSetMask(false);
       return;
     }
     if (this.onExecInstructSet('blur')) {
@@ -1029,6 +1029,8 @@ export default class CommonComponent extends Component {
     } else if (this.firstDataIndex === 's') { /*   文本输入框(文本s)   */
       if (this.props.textArea) { /*   大文本输入框   */
         return <TextAreaA {...innerInputProps} />;
+      } else if (this.props.bPassWord) {
+        return <Input.Password {...innerInputProps} />
       } else { /*   普通文本输入框   */
         if (this.isReportInfo && this.props.enabled) {
           innerInputProps.addonAfter = <PlusOutlined
@@ -1423,7 +1425,7 @@ export default class CommonComponent extends Component {
   /*   获取日期innerinputprops对象(从)   */
   getDateInnerInputPropsSlave = () => {
-    let { sDateFormat, iTag } = this.props.showConfig;
+    let { sDateFormat } = this.props.showConfig;
     if (commonUtils.isEmptyStr(sDateFormat)) {
       if (this.firstDataIndex === 'm') {
         sDateFormat = 'YYYY-MM';
@@ -1472,14 +1474,6 @@ export default class CommonComponent extends Component {
     if (this.bTbTime) {
       obj.open = false;
     }
-
-    if (iTag === 88) {
-      obj.open = false;
-      obj.onClick = () => {
-        this.handleSelectOptionEvent('', moment().format(sDateFormat))
-      }
-    }
-
     /*   值填充   */
     obj.value = commonUtils.isEmpty(this.state.dataValue) ? null : moment(this.state.dataValue);
     /*   返回值   */
@@ -1519,7 +1513,7 @@ export default class CommonComponent extends Component {
         return value.replace(/\$\s?|(,*)/g, '');
       },
       formatter: (value) => {
-        if (value === '' || value === undefined || value === null || location.pathname.includes("indexPad")) {
+        if (value === '' || value === undefined || value === null) {
           return value;
         }
         // if (this.props.showConfig.iTag === 10000) {
@@ -2705,7 +2699,7 @@ export default class CommonComponent extends Component {
   /**   渲染   */
   render() {
     /*   获取innerinput控件参数   */
-    let innerInputProps = this.getInnerInputProps();
+    const innerInputProps = this.getInnerInputProps();
     const { slaveConfig = { gdsconfigformslave: [] }, bSColorSerialMemo } = this.props;
     const { gdsconfigformslave } = slaveConfig;
@@ -2713,101 +2707,6 @@ export default class CommonComponent extends Component {
     const btPopIndex = gdsconfigformslave.findIndex(item => item.sControlName === `BtnPopup.${sName}`);
     const btCostomIndex = gdsconfigformslave.findIndex(item => item.sControlName === `BtnCustom.${sName}`);
-
-    // 登记取样特殊处理
-    if(slaveConfig.sId=='12710101117346647176280'){
-        
-        if(innerInputProps.id.includes('bReturn')){
-            window.$xlyStorage = this.props.dataValue;
-        }
-
-        if(innerInputProps.id.includes('sQrcode') && this.myRef.current){
-
-          this.myRef.current.querySelector('input').addEventListener('keydown',(event)=>{
-              if (event.code === 'NumpadEnter' || event.code === 'Enter') { // 或者使用 event.keyCode === 13
-                  
-                event.preventDefault(); // 阻止默认行为
-                // console.log(this.value)
-                // const inputValue = this.value;
-                // document.getElementById('output').innerText = '你输入的内容是: ' + inputValue;
-                // 在这里添加你想要执行的其他代码
-                setTimeout(()=>{
-                  let takeBtn = gdsconfigformslave.find(e=>e.sId=='17351987980002636428040338706000');
-                  let returnBtn = gdsconfigformslave.find(e=>e.sId=='17346700000002938271207713181700');
-
-                  if(window.$xlyStorage==0 && takeBtn){
-                      // 取样
-                      this.props.onExecInstructSet({
-                          nextProps: { ...this.props},
-                          btnConfig: {
-                              showName: "条码取样",
-                              sInstruct: takeBtn.sInstruct,
-                              error:(er)=>{
-                                  this.setState({ dataValue: '' });
-                              },
-                          },
-                          callback: () => {},
-                      })
-                  }else if(window.$xlyStorage==1 && returnBtn){
-                      // 归还
-                      this.props.onExecInstructSet({
-                          nextProps: { ...this.props},
-                          btnConfig: {
-                              showName: "条码归还",
-                              sInstruct: returnBtn.sInstruct,
-                              error:(er)=>{
-                                  this.setState({ dataValue: '' });
-                              },
-                          },
-                          callback: () => {},
-                      })
-                  }
-              },300)
-              }
-          })
-
-
-            
-            // debugger
-            // innerInputProps.onPressEnter = (event2)=>{
-                // setTimeout(()=>{
-                //     let takeBtn = gdsconfigformslave.find(e=>e.sId=='17351987980002636428040338706000');
-                //     let returnBtn = gdsconfigformslave.find(e=>e.sId=='17346700000002938271207713181700');
-
-                //     if(window.$xlyStorage==0 && takeBtn){
-                //         // 取样
-                //         this.props.onExecInstructSet({
-                //             nextProps: { ...this.props},
-                //             btnConfig: {
-                //                 showName: "条码取样",
-                //                 sInstruct: takeBtn.sInstruct,
-                //                 error:(er)=>{
-                //                     this.setState({ dataValue: '' });
-                //                 },
-                //             },
-                //             callback: () => {},
-                //         })
-                //     }else if(window.$xlyStorage==1 && returnBtn){
-                //         // 归还
-                //         this.props.onExecInstructSet({
-                //             nextProps: { ...this.props},
-                //             btnConfig: {
-                //                 showName: "条码归还",
-                //                 sInstruct: returnBtn.sInstruct,
-                //                 error:(er)=>{
-                //                     this.setState({ dataValue: '' });
-                //                 },
-                //             },
-                //             callback: () => {},
-                //         })
-                //     }
-                // },300)
-            // }
-        }
-    }
-
-
-
     /*   获取innerinput控件   */
     const innerInput = btPopIndex !== -1 ? (
       <Space className={styles.commonAntSpace} size={3}>
@@ -2821,10 +2720,6 @@ export default class CommonComponent extends Component {
         {this.getInnerButtonCostom(gdsconfigformslave[btCostomIndex])}
         <div />
       </Space>
-    ) : this.props.showTooltip ? (
-      <Tooltip title={<span style={{ fontSize: 18 }}>{this.props.dataValue}</span>}>
-        {this.getInnerInput({ ...innerInputProps, disabled: false, readOnly: true })}
-      </Tooltip>
     ) : this.getInnerInput(innerInputProps);
     let viewInfo = '';
@@ -3065,27 +2960,6 @@ export default class CommonComponent extends Component {
     const fieldDecoratorProps = this.getFieldDecoratorProps();
     /*   通用组件(主表存在getFieldDecorator表单验证,而从表则不需要)   */
-    
-    // 班组报工,产量上报信息,label文字颜色特殊处理
-    if(slaveConfig.sId=='17087428780006438414984564455000'){
-        // 计件
-        if(innerInputProps.id.includes('dWageHour')){
-            outFormItemProps.label = <span style={{color:'#FF5722',fontWeight: 800,display:'flex',alignItems:'center'}}>
-                <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20"><path fill="#FF5722" d="M2 3a1 1 0 0 1 1-1h5a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1zm6 0H3v2h5zM2 9a1 1 0 0 1 1-1h5a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1zm6 0H3v2h5zm-5 5a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h5a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm0 1h5v2H3zm8-12a1 1 0 0 1 1-1h5a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-5a1 1 0 0 1-1-1zm6 0h-5v2h5zm-5 5a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1zm0 1h5v2h-5z"/></svg>
-                {this.props.showConfig.showName}
-            </span>
-        }
-        // 计时
-        if(innerInputProps.id.includes('dTimeHour')){
-            outFormItemProps.label = <span style={{color:'#9c27b0',fontWeight: 800,display:'flex',alignItems:'center'}}>
-                <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none"><path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="#9c27b0" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12S6.477 2 12 2m0 2a8 8 0 1 0 0 16a8 8 0 0 0 0-16m0 2a1 1 0 0 1 .993.883L13 7v4.586l2.707 2.707a1 1 0 0 1-1.32 1.497l-.094-.083l-3-3a1 1 0 0 1-.284-.576L11 12V7a1 1 0 0 1 1-1"/></g></svg>
-                {this.props.showConfig.showName}
-            </span>
-        }
-    }
-
-
-
     const commonAssembly = this.props.bNewForm ? innerInput:  (
       <FormItem {...outFormItemProps}>
         {viewInfo}
@@ -113,11 +113,6 @@ const useCommonBase = props =&gt; {
    */
   const handleGetModelConfig = async params => {
     const { sModelsId } = params;
-    !window.xlyFormDataCache && (window.xlyFormDataCache = {});
-    if (window.xlyFormDataCache[sModelsId]) {
-      return window.xlyFormDataCache[sModelsId];
-    }
-
     const { token, formSrcRoute } = state;
     const configUrl = `${
       commonConfig.server_host
@@ -128,7 +123,6 @@ const useCommonBase = props =&gt; {
     if (configReturn.code === 1) {
       const [configData] = configReturn.dataset.rows;
       formData = configData.formData;
-      window.xlyFormDataCache[sModelsId] = formData;
     } else {
       getServiceError(configReturn);
     }
@@ -2483,27 +2477,13 @@ const useCommonBase = props =&gt; {
   };
   // 表格行删除
-  const handleMesTableLineDel = ({
-    tableName,
-    record,
-    index: indexOld,
-    callback
-  }) => {
+  const handleMesTableLineDel = ({ tableName, record, index, callback }) => {
     const {
       [`${tableName}Data`]: data = [],
       [`${tableName}DelData`]: delData = [],
       [`${tableName}Config`]: config = {}
     } = state;
-    let index = indexOld;
-    if (
-      record.sRev &&
-      record.sRev?.startsWith("第") &&
-      record.sRev?.endsWith("转")
-    ) {
-      index = data.findIndex(item => item.sId === record.sId);
-    }
-
     const { gdsconfigformslave = [] } = config;
     const btnTableDelConfig =
       gdsconfigformslave.find(
@@ -2721,11 +2701,7 @@ const useLoadSubscriptNum = props =&gt; {
   useEffect(
     async () => {
       if (sModelsId !== sModelsId1) return;
-      if (
-        currentContent !== "scheduledTasks" &&
-        currentContent !== "productionExec"
-      )
-        return;
+      if (currentContent !== "scheduledTasks") return;
       instructSet({
         ...props,
@@ -2769,10 +2745,10 @@ const useLoadSubscriptNum = props =&gt; {
         inscallback: nextProps => {
           const { counterData = [] } = nextProps;
           const [counterRow = {}] = counterData;
-          const { table0 = 0, table1 = 0, table2 = 0, table3 = 0 } = counterRow;
+          const { table0 = 0, table1 = 0, table2 = 0 } = counterRow;
           props.dispatch({
             type: "app/setCounter",
-            payload: { table0, table1, table2, table3 }
+            payload: { table0, table1, table2 }
           });
         }
       });
@@ -2813,7 +2789,7 @@ const useGetMonitorFields = props =&gt; {
       props.onSaveState({ monitorFieldsMap });
     },
-    [!!bFinish]
+    [bFinish]
   );
 };
@@ -59,7 +59,6 @@ const getOprFun = instruct =&gt; {
     calcprocedure: handleCalcprocedure,
     clearrowkey: handleClearRowKey,
-    selectfirstline: handleSelectFirstLine,
     refreshpage: handleRefreshPage,
     "": () => ({})
   };
@@ -199,7 +198,7 @@ const instructSet = async props =&gt; {
     window.instructSetLock = true;
     await instructSetInit(props);
   } catch (error) {
-    window.debugger && console.log("=====", error);
+    console.log("=====", error);
     window.instructSetLock = false;
     props.app.globalFun.onSetMask(false);
     props.onSaveState({ pageLoading: false, loadingBtnConfig: {} });
@@ -238,27 +237,19 @@ const instructSetInit = async props =&gt; {
   let addState = {};
-  try {
-    for (let i = 0; i < sInstruct.length; i++) {
-        const instruct = sInstruct[i];
-        const operationFun = getOprFun(instruct);
-        const resultData = await operationFun({ ...props, ...addState }, instruct);
-        if (resultData.stop) {
-          throw new Error("人脸识别取消！");
-        }
-        addState = {
-          ...addState,
-          ...resultData
-        };
+  for (let i = 0; i < sInstruct.length; i++) {
+    const instruct = sInstruct[i];
+    const operationFun = getOprFun(instruct);
+    const resultData = await operationFun({ ...props, ...addState }, instruct);
+    if (resultData.stop) {
+      throw new Error("人脸识别取消！");
     }
-    
-  } catch (error) {
-    props.btnConfig.error? props.btnConfig.error(error) : '';
-    throw new Error(error);
+    addState = {
+      ...addState,
+      ...resultData
+    };
   }
-
-
   // 是否要关闭弹窗
   const bClosePop = addState.closePop;
@@ -467,7 +458,7 @@ const handleCopy = (props, instruct) =&gt; {
   let srcData = dataList[0] || [];
   // 如果数据源是循环的那条数据
-  const { fordosetName, fordosetData, datasetList = [] } = props;
+  const { fordosetName, fordosetData } = props;
   if (fordosetName && srcDataset === fordosetName && fordosetData) {
     srcData = [fordosetData];
   }
@@ -498,14 +489,7 @@ const handleCopy = (props, instruct) =&gt; {
   const resultData = [...srcDataNew];
-  const datasetListNew = datasetList.includes(newDataset)
-    ? datasetList
-    : [...datasetList, newDataset];
-
-  const result = {
-    [`${newDataset}Data`]: resultData,
-    datasetList: datasetListNew
-  };
+  const result = { [`${newDataset}Data`]: resultData };
   outputResult(result);
   return result;
@@ -1559,31 +1543,15 @@ const handleOpenSql = async (props, instruct) =&gt; {
     resultData.forEach((item = {}) => {
       const itemNew = {};
       Object.keys(item).forEach(key => {
-        const itemName = !key.endsWith("Data") ? `${key}Data` : key;
-        itemNew[itemName] = item[key];
+        if (!key.endsWith("Data")) {
+          itemNew[`${key}Data`] = item[key];
+        } else {
+          itemNew[key] = item[key];
+        }
       });
       result = { ...result, ...itemNew };
     });
-
-    const { handleType, newDataset } = item;
-    if (handleType) {
-      const { datasetList = [] } = props;
-      const datasetListNew = datasetList.includes(newDataset)
-        ? datasetList
-        : [...datasetList, newDataset];
-      result = {
-        ...result,
-        datasetList: datasetListNew
-      };
-      const itemName = !newDataset.endsWith("Data")
-        ? `${newDataset}Data`
-        : newDataset;
-      result[itemName].forEach(item => {
-        item.sId = commonUtils.createSid();
-        item.handleType = "add";
-      });
-    }
   }
   outputResult(result);
@@ -1730,15 +1698,6 @@ const handleProcedure = async (props, instruct) =&gt; {
             if (iIndex !== -1) {
               Object.keys(columnconfig[iIndex]).forEach(key => {
                 item[key] = columnconfig[iIndex][key];
-                if (key === "bNotEmpty") {
-                  if (
-                    (item.sName?.startsWith("i") ||
-                      item.sName?.startsWith("d")) &&
-                    item.bNotEmpty
-                  ) {
-                    item.bNotZero = true;
-                  }
-                }
               });
             }
           });
@@ -2238,22 +2197,6 @@ const handleClearRowKey = async (props, instruct) =&gt; {
   return {};
 };
-/************************* 选中第一行 selectfirstline ************************/
-const handleSelectFirstLine = async (props, instruct) => {
-  const { dataset = "" } = instruct;
-  const tableList = dataset.split(",");
-  const addState = {};
-  tableList.forEach(tablename => {
-    const { [`${tablename}Data`]: data = [] } = props;
-    if (data.length) {
-      addState[`${tablename}SelectedRowKeys`] = [data[0].sId];
-    }
-  });
-
-  globalAddState = { ...globalAddState, ...addState };
-  return {};
-};
-
 /************************* 页面重新加载 refreshpage ************************/
 const handleRefreshPage = () => {
   bRefreshPage = true;
@@ -2501,7 +2444,7 @@ const utils = {
       // todo
       return tableData[0];
     } else if (filterType === "last") {
-      return tableData[tableData.length - 1];
+      return [tableData[tableData.length - 1]];
     } 
     return tableData;
@@ -2635,9 +2578,10 @@ const utils = {
         // 如果是 赋值字段名称:数据集名称.数据集字段名称 格式
         const [assignField, tableValues] = partValue.split(":");
         const [tableName, fieldName] = tableValues.split(".");
+        const tableNewData = Array.isArray(dataOneObj[tableName]) && dataOneObj[tableName].length > 0 ? dataOneObj[tableName][0] : dataOneObj[tableName];
         rowData = {
           ...rowData,
-          [assignField]: dataOneObj[tableName][fieldName]
+          [assignField]: tableNewData[fieldName]
         };
       } else if (regex2.test(partValue)) {
         // 如果是 赋值字段名称:数据集字段名称 格式
@@ -3149,9 +3093,9 @@ const utils = {
     let result = "";
     try {
       // 调试模式
-      if (window.debuggerValue && stringValue.includes(window.debuggerValue)) {
-        debugger;
-      }
+      // if (window.debuggerValue && stringValue.includes(window.debuggerValue)) {
+      //   debugger;
+      // }
       // 第一遍运算（将变量转换成对应的值）
       const evalStr = eval("`" + strNew + "`");
@@ -96,14 +96,7 @@ class CommonList extends Component {
       slaveSelectedData, app, slaveSelectedRowKeys, slaveData,
     } = this.props;
     let newSlaveSelectedData = [];
-    if (location.pathname.includes("indexPad") && commonUtils.isEmptyArr(slaveSelectedData) && this.tableRef) {
-      const dataRowKeys = this.tableRef.querySelectorAll('tr[data-row-key]');
-      if (dataRowKeys.length === 1) {
-        const dataRowKey = dataRowKeys[0].getAttribute('data-row-key');
-        const slaveDataOne = slaveData.filter(item => item.sSlaveId === dataRowKey);
-        newSlaveSelectedData = slaveDataOne;
-      }
-    } else if (commonUtils.isNotEmptyArr(slaveSelectedData)) {
+    if (commonUtils.isNotEmptyArr(slaveSelectedData)) {
       newSlaveSelectedData = slaveSelectedData;
     } else if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) {
       newSlaveSelectedData = slaveData.filter(item => slaveSelectedRowKeys.includes(item.sSlaveId));
@@ -181,7 +174,6 @@ class CommonList extends Component {
               onEject={this.handleEject.bind(this)}
               onSelectTree={this.handleTreeSelect}
               onCopyTo={this.copyTo}
-              setTableRef={(ref) => { this.tableRef = ref; }}
             />
           </div>
         </Spin>
@@ -292,7 +284,6 @@ const CommonListComponent = Form.create({
             <Content
               className={`${realizeHeight <= 0 ? 'xly-normal-list' : 'xly-normal-list resize-container-select'}`}
               style={{ height: realizeHeight > 0 ? `${500 + realizeHeight}px` : 'auto', paddingLeft: '10px' }}
-              ref={ref => { props.setTableRef(ref); }}
             >
               <StaticEditTable {...tableProps} footer="hidden" showConfig={props.showConfig} {...rowSelectionProps} />
             </Content>