Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

FormInsertDiy/AffairPage/ApplyPage/JustApply.js

@@ -32,24 +32,6 @@ export default class AffairPage extends React.Component {
 			message.error('您的数据未同步,请联系管理员!');
 			return false;
 		}
-		// window.addEventListener(
-		// 	'message',
-		// 	(event) => {
-		// 		// 和Iframe页进行通迅
-		// 		if (event.data === 'returnList') {
-		// 			this.returnList(true);
-		// 		}
-		// 		if (event && event.data && event.data.indexOf && event.data.indexOf('iframeHeight') > -1) {
-		// 			let height = Number(event.data.split('-')[1]);
-		// 			const iframe = document.getElementById('applyIframeId');
-		// 			if (iframe) {
-		// 				iframe.height = height;
-		// 			}
-		// 		}
-		// 	},
-		// 	false,
-		// );
-
 		return true;
 	}
 
@@ -89,26 +71,8 @@ export default class AffairPage extends React.Component {
            {...this.props}
            id={workId}
            returnList={this.returnList}
-           init={encodeURIComponent(JSON.stringify(init))}
+           init={init}
          />
-				{/*	<iframe
-						src={iframeUrl}
-						frameBorder={0}
-						id="applyIframeId"
-						name="applyIframe"
-						marginWidth="0"
-						marginHeight="0"
-						allowtransparency="yes"
-						seamless
-						scrolling={'auto'}
-						style={{
-							width: '100%',
-							minHeight: '800px',
-							overflowY: 'hidden',
-							backgroundColor: '#fff',
-						}}
-					/>*/}
-					: null
 				</div>
 			</PageHeaderWrapper>
 		);

one_stop_public/App/ImportUtil.js

@@ -241,9 +241,9 @@ export default class ImportUtil extends React.PureComponent {
 		fetch(transformApi, {
 			method: 'POST',
 			body: FormdataWrapper(newParams.datas),
-			headers: {
-				apis: headersApi,
-			},
+			// headers: {
+			// 	apis: headersApi,
+			// },
 		})
 			.then((res) => {
 			  console.log(res.status);

one_stop_public/Base16/SplitBase16Index.js

@@ -35,10 +35,11 @@ function giveKey(key, datas) {
 }
 
 export async function countAllValues(datas, item) {
+  // console.log(datas);
   if (item.setNull) {
     datas.allValues = JSON.stringify({});
   } else {
-    if (item.query) {
+    if (item.query && !datas.isMeta) {
       if (datas?.sqlKey.length < 13) {
         const response = await apiRequest('/SqlManageEntityApi/findParamsKey', {
           sqlKey: datas.sqlKey,

one_stop_public/Base16/binaryEncode.js

@@ -8,7 +8,8 @@ import { countAllValues } from '@/webPublic/one_stop_public/Base16/SplitBase16In
 import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils';
 import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform';
 import { strToBinary } from './strToBinary'; // 字符串转二进制 混淆代码
-import { binaryToStr } from './binaryToStr'; // 二进制字符串转JSON字符串 混淆代码
+import { binaryToStr } from './binaryToStr';
+import { getVisitorToken } from '@/webPublic/zyd_public/utils/getHeaders'; // 二进制字符串转JSON字符串 混淆代码
 
 const test = !!(getUrlInfo().test);
 
@@ -93,8 +94,8 @@ export async function requestFileInfo(url, datas) {
   //   datas = await testPromise(datas);
   // }
   const formData = new FormData();
-  if (getToken()) {
-    datas.token = getToken();
+  if (getVisitorToken()) {
+    datas.token = getVisitorToken();
   }
   for (let key in datas) {
     formData.append(key, datas[key]);
@@ -115,7 +116,7 @@ export async function requestFileInfo(url, datas) {
     headers: {
       Accept: 'application/json',
       ...getHeaders(transformApi).headers,
-      apis: headersApi,
+      // apis: headersApi,
       // axxx: `select * from user123 where id = 1`,
     },
     method: 'POST',

one_stop_public/ForZydApply/index.js

@@ -49,7 +49,8 @@ export default class IframeForApply extends React.Component {
     } = props;
     this.state = {
       id, // 传入id
-      init: init && isJSON(init) ? JSON.parse(decodeURIComponent(init)) : undefined,
+      init: init || undefined,
+      // 2022年8月9日 发起页面的默认值可以通过这个init 传进来
       value: '', // 紧急度选择
       btnList: [], // 紧急度按钮返回数据
       noNeedApply,

one_stop_public/Table/ZdyTable.jsx

@@ -19,6 +19,7 @@ import getActiveJson from '@/webPublic/one_stop_public/Table/getActiveJson';
 export default class ZdyTable extends Component {
   constructor(props) {
     super(props);
+    console.log(props);
     this.state = {
       objRealTime: {},
       isChange: false,

one_stop_public/Table/globalFunction.js

@@ -796,9 +796,9 @@ export async function downloadFile(url, params, fileName = '导出文件', ext =
   let headers = {
     Authorization: `bearer ${localStorage.getItem('antd-pro-token-onestop')}`,
   };
-  if(headersApi){
-    headers.apis = headersApi;
-  }
+  // if(headersApi){
+  //   headers.apis = headersApi;
+  // }
   fetch(transformApi, {
     method: 'POST',
     body: FormdataWrapper(params),
@@ -840,9 +840,9 @@ export async function downloadFileAndShowModal(url, params, fileName = '导出
   let headers = {
     Authorization: `bearer ${localStorage.getItem('antd-pro-token-onestop')}`,
   };
-  if(headersApi){
-    headers.apis = headersApi;
-  }
+  // if(headersApi){
+  //   headers.apis = headersApi;
+  // }
   fetch(transformApi, {
     method: 'POST',
     body: FormdataWrapper(params),

one_stop_public/libs/TableSelect.js

-import React from "react";
-import { Button, message, Table, Tag } from "antd";
-import FormList from "./formList/index";
-import { connect } from "dva";
+import React from 'react';
+import { Button, message, Table, Tag } from 'antd';
+import FormList from './formList/index';
+import { connect } from 'dva';
 import { getModal } from '@/webPublic/one_stop_public/utils/utils';
 import TableSelectNormal from '@/webPublic/one_stop_public/libs/Split/TableSelectNormal';
 import styles from './Split/styles.less';
+
 const Modal = getModal();
 
 
-@connect(({ DataColumn, SqlManageEntity, loading }) => ({
+@connect(({
+            DataColumn,
+            SqlManageEntity,
+            loading
+          }) => ({
   DataColumn,
   SqlManageEntity,
   loading: loading.models.DataColumn || loading.models.SqlManageEntity,
@@ -22,7 +27,7 @@ export default class TableSelect extends React.Component {
       try {
         this.otherProps = new Function(props.json.otherProps)();
       } catch (e) {
-        console.log('TableSelect组件 otherProps 获取失败')
+        console.log('TableSelect组件 otherProps 获取失败');
       }
     }
     this.state = {
@@ -67,7 +72,10 @@ export default class TableSelect extends React.Component {
   select = (obj) => {
     var { selects } = this.state;
     const {
-			json: { isMultiple, optionType },
+      json: {
+        isMultiple,
+        optionType
+      },
     } = this.props;
     let valueName = this.props.json.valueName;
 
@@ -81,7 +89,12 @@ export default class TableSelect extends React.Component {
       return;
     }
     if (!isMultiple) {
-			selects = { [kk]: { ...obj, selectKey: kk } };
+      selects = {
+        [kk]: {
+          ...obj,
+          selectKey: kk
+        }
+      };
     } else {
       selects[kk] = obj;
       selects[kk].selectKey = kk;
@@ -94,8 +107,14 @@ export default class TableSelect extends React.Component {
 
   selectAll = () => {
     let { selects } = this.state;
-		const { dataSource, json } = this.props;
-		let { valueName, optionType } = json;
+    const {
+      dataSource,
+      json
+    } = this.props;
+    let {
+      valueName,
+      optionType
+    } = json;
     const { list } = dataSource;
     if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
       valueName = this.props.dataColumn.referenceCodeName;
@@ -122,13 +141,22 @@ export default class TableSelect extends React.Component {
   };
 
   close = (i) => {
-		var { values, labels } = this.state;
+    var {
+      values,
+      labels
+    } = this.state;
     values.splice(i, 1);
     labels.splice(i, 1);
     if (!('value' in this.props)) {
-			this.setState({ values, labels });
+      this.setState({
+        values,
+        labels
+      });
     }
-		this.triggerChange({ values, labels });
+    this.triggerChange({
+      values,
+      labels
+    });
   };
 
   open = () => {
@@ -150,7 +178,10 @@ export default class TableSelect extends React.Component {
   cancelOne = (record) => {
     var { selects } = this.state;
     const {
-			json: { isMultiple, optionType },
+      json: {
+        isMultiple,
+        optionType
+      },
     } = this.props;
     let valueName = this.props.json.valueName;
 
@@ -174,16 +205,25 @@ export default class TableSelect extends React.Component {
 
   render() {
     const {
-			json: { isMultiple, sql, optionType, showTable, isShowQuanXuan },
+      json: {
+        isMultiple,
+        sql,
+        optionType,
+        showTable,
+        isShowQuanXuan
+      },
       dataColumn: { referenceObjId },
       sqlModel,
       columns,
       dataSource,
-			disabled,
     } = this.props;
+    let disabled = this.props.disabled || this.props.json.disabled; // 禅道 28713
     const { cardSelectModalProps = {} } = this.otherProps;
 
-    let { valueName, labelName } = this.props.json;
+    let {
+      valueName,
+      labelName
+    } = this.props.json;
     if (optionType == 'reference' && referenceObjId) {
       valueName = this.props.dataColumn.referenceCodeName;
       labelName = this.props.dataColumn.referenceNameName;
@@ -191,21 +231,29 @@ export default class TableSelect extends React.Component {
     if (valueName == null || valueName == '') {
       return <>请指定取值的列名</>;
     }
-		const { selects, visiable, labels } = this.state;
+    const {
+      selects,
+      visiable,
+      labels
+    } = this.state;
     const keys = [];
     for (let i in selects) {
       keys.push(selects[i][valueName]);
     }
     const columns2 = [
       ...columns,
-			{
+    ];
+    if (!disabled) {
+      columns2.push({
         title: '操作',
         render: (val, record) => <a onClick={this.remove.bind(this, record.selectKey)}>移除</a>,
-			},
-		];
+      },);
+    }
     const columns3 = [
       ...columns,
-			{
+    ];
+    if (!disabled) {
+      columns3.push( {
         title: '操作',
         render: (val, record) =>
           keys.includes(record[valueName]) ? (
@@ -218,8 +266,10 @@ export default class TableSelect extends React.Component {
           ) : (
             <a onClick={this.select.bind(this, record)}>选择</a>
           ),
-			},
-		];
+      },);
+    }
+
+
     const custom = {
       isAll: this.state.isAll,
       querys: this.state.querys,
@@ -260,7 +310,8 @@ export default class TableSelect extends React.Component {
               pagination={false}
             />
           ) : (
-						Object.keys(selects).map((k) => (
+            Object.keys(selects)
+              .map((k) => (
                 <Tag key={k} closable={!disabled} onClose={this.remove.bind(this, k)}>
                   {selects[k][labelName]}
                 </Tag>

one_stop_public/libs/formList/TreeList.js

@@ -248,18 +248,7 @@ class TreeList extends React.Component {
 				});
 			},
 		});
-		// } else {
-		//   router.push({
-		//     pathname: '/admin/ddl/dataObj/formEdit',
-		//     state: {
-		//       id: this.state.objId,
-		//       recordId: record[this.state.primaryKey],
-		//       recordKey: this.state.primaryKey,
-		//       isAdd: false,
-		//       isView:false
-		//     },
-		//   });
-		// }
+
 	};
 
 	view = (record) => {
@@ -271,18 +260,7 @@ class TreeList extends React.Component {
 			isAdd: false,
 			isView: true,
 		});
-		// } else {
-		//   router.push({
-		//     pathname: '/admin/ddl/dataObj/formEdit',
-		//     state: {
-		//       id: this.state.objId,
-		//       recordId: record[this.state.primaryKey],
-		//       recordKey: this.state.primaryKey,
-		//       isAdd: false,
-		//       isView:true
-		//     },
-		//   });
-		// }
+
 	};
 
 	isJSON = (str) => {

one_stop_public/tableCompon/Split_Index/giveVarcharLength.js

@@ -18,6 +18,9 @@ export default function giveVarcharRules({
     res.push({
       max: dataColumn.length,
       message: `不能超过${dataColumn.length}个字符`,
+      transform: function(value){
+        return value + '';
+      },
     });
   }
   return res;

one_stop_public/utils/request.js

@@ -20,6 +20,7 @@ import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils';
 import { getHeaders, getIsBei_Dian } from '@/webPublic/zyd_public/utils/utils';
 import { proxyChangeUrl } from '@/webPublic/zyd_public/request/proxyChangeUrl';
 import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform';
+import { getVisitorToken } from '@/webPublic/zyd_public/utils/getHeaders';
 
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
@@ -245,7 +246,7 @@ export async function requestOrigin(url, data, options = {}){
       });
   } else {
     const pp = {
-      token: getToken(), // 部分接口 只需要传入假token 所以这里优先级是 data中的token > getToken;
+      token: getVisitorToken(), // 部分接口 只需要传入假token 所以这里优先级是 data中的token > getToken;
       ...data,
       version_: version,
     };
@@ -260,10 +261,7 @@ export async function requestOrigin(url, data, options = {}){
 
     // 由于自动添加前缀 这里暂时修改getUrl(url)
     let fetchRequest = url.indexOf('UserApi/login') > -1 ? loginUmiRequest : umiRequest;
-    if (process.env.NODE_ENV !== 'production' && url.indexOf('UserApi/login') > -1) {
-      url = '/UserApi/login'; // 通过 proxy代理 解决登录接口本地跨域问题
-      options.prefix = '';
-    }
+
     if (getToken()) {
       options.headers = getHeaders(url).headers;
     }
@@ -273,11 +271,11 @@ export async function requestOrigin(url, data, options = {}){
       if(options.headers){
         options.headers = {
           ...options.headers,
-          apis: headersApi,
+          // apis: headersApi,
         };
       }else{
         options.headers = {
-          apis: headersApi,
+          // apis: headersApi,
         };
       }
     }

zyd_public/utils/getHeaders.js

@@ -5,8 +5,18 @@ import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils';
 
 const isTest = getUrlInfo().test;
 
+export function getVisitorToken(){
+  let token = getToken();
+  const visitor_client = sessionStorage.getItem('visitor_client') === 'true' || !!getUrlInfo().visitor;
+  if(visitor_client && (token === 'null' || !token)){ // 访客token 欢哥喊加的
+    token = '704d693b-cc68-49a7-8888-4acc73b5ca73';
+  }
+  return token;
+}
+
+
 export function getHeaders(url = '', headersApi = undefined) {
-  const token = getToken();
+  let token = getVisitorToken();
   const currentInfo = getCurrentUser() || {};
   const user = getUserInfo() || {};
   const userId = user.id || currentInfo.xgUserId;
@@ -16,6 +26,9 @@ export function getHeaders(url = '', headersApi = undefined) {
     headers: {},
   };
 
+  if(url && typeof url === 'string' && url.indexOf('oauthPub=true') > -1){ // 公共接口不需要token
+    return res;
+  }
   if (!token || token === 'null') {
     return res;
   } else {
@@ -26,9 +39,9 @@ export function getHeaders(url = '', headersApi = undefined) {
     res.headers.Authorization = `bearer ${token}`;
     res.headers.auth = gg5xxxxx(secretString);
     res.headers.timestamp = timestamp;
-    if (headersApi) {
-      res.headers.apis = headersApi;
-    }
+    // if (headersApi) {
+    //   res.headers.apis = headersApi;
+    // }
   }
   return res;
 }