Skip to content

W
web-tool
Commit 9ee703b8 authored by xinglei's avatar xinglei
Browse files
Options

Merge remote-tracking branch 'origin/develop_cxy' into develop

parents 9efc4bde c9d12f72
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 535 additions and 34 deletions
.vscode/settings.json 0 → 100644
View file @ 9ee703b8
{
"editor.fontSize": 16
}
\ No newline at end of file
packages/graphmod-assets/src/index.js
View file @ 9ee703b8
This diff is collapsed.
packages/graphmod-ccs/extra/RiskSituation/101/svginfo.min.js
View file @ 9ee703b8
/** /**
* svgfile-umd-demo v1.0.0 * svgfile-umd-demo1 v1.0.0
* *
* released date Fri Nov 19 2021 16:33:17 GMT+0800 (GMT+08:00). * released date Fri Nov 19 2021 16:33:17 GMT+0800 (GMT+08:00).
* Copyright 2016-present, AMOS.ilex.ray * Copyright 2016-present, AMOS.ilex.ray
......
packages/graphmod-ccs/extra/RiskSituation/102/svginfo.min.js
View file @ 9ee703b8
/** /**
* svgfile-umd-demo v1.0.0 * svgfile-umd-demo1 v1.0.0
* *
* released date Fri Nov 19 2021 16:33:17 GMT+0800 (GMT+08:00). * released date Fri Nov 19 2021 16:33:17 GMT+0800 (GMT+08:00).
* Copyright 2016-present, AMOS.ilex.ray * Copyright 2016-present, AMOS.ilex.ray
......
packages/graphmod-common/src/userSelectPerson/index.scss
View file @ 9ee703b8
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
width: 10px; width: 10px;
height: 7px; height: 7px;
margin-top: -3.5px; margin-top: -3.5px;
background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat; //background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat;
background-size: cover; background-size: cover;
} }
......
packages/graphmod-common/src/userSelector/index.scss
View file @ 9ee703b8
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
width: 10px; width: 10px;
height: 7px; height: 7px;
margin-top: -3.5px; margin-top: -3.5px;
background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat; //background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat;
background-size: cover; background-size: cover;
} }
......
packages/graphmod-scripts/src/_proxy.js
View file @ 9ee703b8
...@@ -3,34 +3,26 @@ const proxy = { ...@@ -3,34 +3,26 @@ const proxy = {
// target: 'http://172.16.10.72:10005/', // target: 'http://172.16.10.72:10005/',
// pathRewrite: { '^/baseURI': '' } // pathRewrite: { '^/baseURI': '' }
// }, // },
// '/bizURI/openapi': { '/baseURI/jcs': {
// target: 'http://172.16.3.3:11001/', // target: 'http://172.16.10.72:10005/',
// pathRewrite: { '^/bizURI': '' } target: 'http://172.16.0.120:20000/',
// }, changeOrigin: true,
// '/bizURI': { pathRewrite: { '^/baseURI': '' }
// // target: 'http://172.16.3.20:11100/', // 苏 },
// // target: 'http://172.16.3.89:11100/', // 田 '/bizURI/openapi': {
// target: 'http://172.16.10.72:10005/', target: 'http://172.16.3.3:11001/',
// // target: 'http://172.16.3.20:8807/', // 田 pathRewrite: { '^/bizURI': '' }
// // target: 'http://172.16.3.89:11000/', // 田 },
// // target: 'http://113.134.211.174:10005/', // 李 '/bizURI': {
// // target: 'http://172.16.3.41:11100/', // 唐 // target: 'http://172.16.3.20:11100/', // 苏
// // target: 'http://172.16.3.4:11100/', // 陈 // target: 'http://172.16.3.89:11100/', // 田
// pathRewrite: { '^/bizURI': '' } target: 'http://172.16.10.72:10005/',
// }, // target: 'http://172.16.3.20:8807/', // 田
'/baseURI':{ // target: 'http://172.16.3.89:11000/', // 田
target:'http://localhost:30201', // target: 'http://113.134.211.174:10005/', // 李
changeOrigin:true, // target: 'http://172.16.3.41:11100/', // 唐
pathRewrite:{'^/baseURI':''} // target: 'http://172.16.3.4:11100/', // 陈
}, pathRewrite: { '^/bizURI': '' }
'/bizURI/jcs':{
target:'http://localhost:30201',
pathRewrite:{'^/bizURI':''}
},
'/bizURI':{
target:'http://localhost:30201',
changeOrigin:true,
pathRewrite:{'^/bizURI':''}
}, },
// '/baseURI':{ // '/baseURI':{
......
packages/graphmod-tool/package-lock.json 0 → 100644
View file @ 9ee703b8
{
"name": "@gm/graphmod-tool",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@gm/graphmod-assets": {
"version": "1.0.0",
"dev": true
},
"@gm/graphmod-common": {
"version": "1.0.0",
"dev": true,
"dependencies": {
"@gm/graphmod-assets": {},
"@gm/graphmod-utils": {}
}
},
"@gm/graphmod-scripts": {
"version": "1.0.0",
"dev": true
},
"@gm/graphmod-utils": {
"version": "1.0.0",
"dev": true
}
}
}
packages/graphmod-tool/src/api.js
View file @ 9ee703b8
// 该模块存放系统通用 api 接口 // 该模块存放系统通用 api 接口
// 各自模块的 api 存放在自己模块根目录下 // 各自模块的 api 存放在自己模块根目录下
import * as endConf from 'amos-processor/lib/config/endconf';
import { request, gateWay } from '@gm/graphmod-utils'; import { request, gateWay } from '@gm/graphmod-utils';
const completePrefix = endConf.completePrefix;
const AmosConfig = endConf.AmosConfig;
const baseURI = AmosConfig.httpURI.baseURI;
const { const {
commonGet, commonGet,
commonPost, commonPost,
commonPut, commonPut,
formatUrl, formatUrl,
completePrefix,
commonDelete, commonDelete,
formatObjUrl, formatObjUrl,
fileDownload fileDownload
...@@ -16,6 +20,14 @@ const { ...@@ -16,6 +20,14 @@ const {
export const UrlConsts = { export const UrlConsts = {
deleteAgency: (url) => completePrefix(baseURI, 'jcs/Agency/relation/{agencyCodeId}/{sequenceNbrs}'),
};
/**
* 删除机构
*/
export const deleteByAgencyCode = ( agencyCodeId, sequenceNbrs) => {
console.log(formatUrl(UrlConsts.deleteAgency(), { agencyCodeId, sequenceNbrs }))
return commonDelete(formatUrl(UrlConsts.deleteAgency(), { agencyCodeId, sequenceNbrs }));
}; };
packages/graphmod-tool/src/demo1/DeleteModel.js 0 → 100644
View file @ 9ee703b8
import React from 'react';
import PropTypes from 'prop-types';
import { Form, Input } from 'amos-framework';
import { withModalForm, BaseForm } from 'amos-designer';
import { tools } from '@gm/graphmod-utils';
import * as api from '../api'
const { deleteByAgencyCode } = api;
const FormItem = Form.Item;
/**
* 导入数据
* @class ImportData
* @extends {Component}
*/
@withModalForm({
width: 400,
title: '导出SQL脚本'
})
// class DeleteModel extends BaseForm {
// constructor(props) {
// super(props);
// const user = {};
// this.state = {
// form: {
// agencyCode: user.agencyCode ?? ''
// }
// };
// }
class DeleteModel extends BaseForm {
constructor(props) {
super(props);
const user = {};
this.state = {
form: {
agencyCode: user.agencyCode ?? ''
}
};
}
onCancel = () => {
this.setState({ form: {} }, () => {
this.props.onClose && this.props.onClose();
});
};
onSubmit = () => {
const { selectedRowKeys = [], dataConfig = {} } = this.props;
this.props.onClose();
this.props.handleOpen('logsVisible');
if (dataConfig.dimension && selectedRowKeys.length > 0) {
dataConfig[dataConfig.dimension] = selectedRowKeys.join(',');
}
deleteByAgencyCode(dataConfig);
};
render() {
const { form } = this.state;
return (
<Form
style={{ paddingRight: 20 }}
ref={this.props.saveFormRef}
model={form}
labelWidth="8em"
filled
>
<FormItem label="所属机构" field="agencyCode">
<Input placeholder="请输入" value={form.agencyCode} onChange={this.genHandle('agencyCode')} />
</FormItem>
</Form>
);
}
}
DeleteModel.propTypes = {
saveFormRef: PropTypes.func,
visible: PropTypes.bool,
onClose: PropTypes.func
};
export default DeleteModel;
packages/graphmod-tool/src/demo1/DeleteView.js 0 → 100644
View file @ 9ee703b8
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { BarGroup, IconButton, briskWarningTip } from 'amos-designer';
import * as api from '../api';
import { connectGlobalPage } from '@gm/graphmod-common';
import ExecuteProgress from './ExecuteProgress';
import DeleteModel from './DeleteModel';
const { deleteByAgencyCode } = api;
/**
* 导出sql脚本模块
* @class DeleteView
* @extends {Component}
*/
// @connectGlobalPage({
// testDataConfig: {
// resourceCode: 'StudioApplication', // 标识
// dimension: 'appSeq', // 字段
// appSeq: '1620614032232841218',
// mqttUrl: 'ws://172.16.3.18:8088/mqtt',
// position:'header'
// }
// })
@connectGlobalPage({
testDataConfig: {
agencyCodeId: '1397143491787747330',//机构ID
sequenceNbrs: '1676795341917782033,1676795341917782024',//数据库连接sequenceNbrs
mqttUrl: 'ws://172.16.3.18:8088/mqtt'
}
})
class DeleteView extends Component {
constructor(props) {
super(props);
this.state = {
downloadVisible: false,
logsVisible: false,
selectId: ''
};
}
handleClose = (key) => {
this.setState({
[key]: false
});
};
handleOpen = (key) => {
this.setState({
[key]: true
});
};
handleItemClick = () => {
const { selectedRowKeys = [], dataConfig, record } = this.props;
if (selectedRowKeys.length > 0 || record) {
this.setState({ selectId: selectedRowKeys.length === 0 ? record.id ?? record.sequenceNbr : '', logsVisible: true }, () => {
if (dataConfig.sequenceNbrs && (selectedRowKeys.length > 0 || record)) {
dataConfig[dataConfig.sequenceNbrs] = (record ? record.id ?? record.sequenceNbr : null) || selectedRowKeys.join(',');
deleteByAgencyCode({ agencyCodeId: dataConfig.agencyCodeId, sequenceNbrs: dataConfig.sequenceNbrs });
}
});
} else {
briskWarningTip('至少选择一个数据库和一个机构');
}
// const { selectedRowKeys = [], dataConfig, record } = this.props;
// if (selectedRowKeys.length === 0 ) {
// this.setState({ selectId: dataConfig.sequenceNbrs, logsVisible: true }, () => {
// deleteByAgencyCode( dataConfig.agencyCodeId, dataConfig.sequenceNbrs );
// });
// } else {
// briskWarningTip('至少选择一个数据库');
// }
// debugger
// const { selectedRowKeys = [], dataConfig, record } = this.props;
// if (selectedRowKeys.length > 0 || record) {
// this.setState({ selectId: selectedRowKeys.length === 0 ? record.id ?? record.sequenceNbr : selectedRowKeys[0], logsVisible: true }, () => {
// if (dataConfig.dimension && (selectedRowKeys.length > 0 || record)) {
// dataConfig[dataConfig.dimension] = (record ? record.id ?? record.sequenceNbr : null) || selectedRowKeys.join(',');
// templateDownload({ resourceCode: dataConfig.resourceCode, dimension: dataConfig.dimension, [dataConfig.dimension]: dataConfig[dataConfig.dimension] });
// }
// });
// } else {
// briskWarningTip('至少选择一行数据');
// }
};
render() {
const { dataConfig = {} } = this.props;
const { logsVisible, selectId, downloadVisible } = this.state;
return (
<div>
{dataConfig.position === 'header' ?
<div className="ig-stage-toolbar-right">
<BarGroup label="导出脚本" mode="none" position="right">
<IconButton colorful icon="export" title="导出SQL脚本" style={{ borderRadius: 4 }} onClick={() => this.handleItemClick()} />
</BarGroup>
</div>
:
<p onClick={this.handleItemClick}>删除</p>
}
<DeleteModel
visible={this.downloadVisible}
onClose={() => this.handleClose('downloadVisible')}
handleOpen={() => this.handleOpen()}
dataConfig={dataConfig}
/>
<ExecuteProgress visible={logsVisible} mqttUrl={dataConfig.mqttUrl} exeId={selectId} onClose={() => this.handleClose('logsVisible')} />
</div>
);
}
}
DeleteView.propTypes = {
selectedRowKeys: PropTypes.array,
dataConfig: PropTypes.object,
record: PropTypes.object
};
export default DeleteView;
packages/graphmod-tool/src/demo1/ExecuteProgress.js 0 → 100644
View file @ 9ee703b8
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withSubscribeMQTT, parseMessage, MQTTProvider } from 'amos-mqtt';
import { Modal, briskWarningTip } from 'amos-designer';
import ExecuteProgressContent from './ExecuteProgressContent';
/**
* 执行进度
* @class ExecuteProgress
* @extends {ExecuteProgress}
*/
class ExecuteProgress extends Component {
constructor(props) {
super(props);
this.state = {
content: null,
data: {}
};
}
componentDidMount() {
this.initMqttTopic();
}
componentDidUpdate(prevProps, prevState) {
if (this.props.exeId !== prevProps.exeId) {
this.initMqttTopic();
}
}
initMqttTopic = () => {
const { exeId } = this.props;
if (exeId) {
const content = withSubscribeMQTT({
topic: `/topicTable/solidify/${exeId.indexOf(',') !== -1 ? exeId.split(',')[0] : exeId}`,
dispatch: (_topic, message, packet) => {
const newMsg = parseMessage(message);
this.setState({ data: { message: newMsg, messageFlag: Date.now() } });
}
})(ExecuteProgressContent);
this.setState({ content });
}
}
cancel = () => {
const { data } = this.state;
if (!data.message || data.message.status === 'running') {
}
this.props.onClose && this.props.onClose();
}
render() {
const { visible, mqttUrl } = this.props;
const { data, content: Content } = this.state;
if (!Content) {
return null;
}
return (
<MQTTProvider url={mqttUrl || '/mqtt'}>
<Modal
header="立即执行进度"
visible={visible}
width={474}
noDefaultFooter
showMax
onCancel={this.cancel}
outterClosable={false}
content={
<Content message={data.message} messageFlag={data.messageFlag} />
}
/>
</MQTTProvider>
);
}
}
ExecuteProgress.propTypes = {
visible: PropTypes.bool,
onClose: PropTypes.func,
exeId: PropTypes.string,
mqttUrl: PropTypes.string
};
export default ExecuteProgress;
packages/graphmod-tool/src/demo1/ExecuteProgressContent.js 0 → 100644
View file @ 9ee703b8
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Progress } from 'amos-framework';
/**
* 立即执行进度
* @class ExecuteProgressContent
* @extends {ExecuteProgress}
*/
class ExecuteProgressContent extends Component {
constructor(props) {
super(props);
this.state = {
percent: 0,
status: 'running',
flag: false,
logs: []
};
}
componentDidMount() {
this.onMessage();
}
componentDidUpdate(prevProps, prevState) {
if (prevProps.messageFlag !== this.props.messageFlag) {
this.onMessage();
}
}
onMessage = () => {
const { message } = this.props;
const { status, percent } = message || {};
if (status) {
const { logs } = this.state;
logs.push(message);
this.setState({ logs, percent, status }, () => {
this.scrollToBottom();
});
}
}
scrollToBottom = () => {
if (this.content && this.content.scrollHeight > this.content.clientHeight) {
const state = 10;
if (this.content.scrollHeight - this.content.clientHeight > state) {
this.content.scrollTop = this.content.scrollHeight - this.content.clientHeight;
}
}
}
render() {
const { logs, status, percent } = this.state;
return (
<div className="ig-execute-progress">
<Progress percent={percent} strokeWidth={16} status={status === 'error' ? 'exception' : status === 'finished' ? undefined : 'active'} />
<div className="ig-execute-progress-switch">进度详情</div>
<div className="ig-execute-progress-content" ref={node => this.content = node}>
<ul>
{
logs.map((e, index) => (
<li key={index} style={{ color: e.status === 'error' ? 'red' : '' }}>[{e.time}] {e.logInfo}{e.detail}</li>
))
}
</ul>
</div>
</div>
);
}
}
ExecuteProgressContent.propTypes = {
messageFlag: PropTypes.number,
message: PropTypes.object
};
export default ExecuteProgressContent;
packages/graphmod-tool/src/demo1/ccs.js 0 → 100644
View file @ 9ee703b8
import mods1 from '@gm/graphmod-ccs';
import mods2 from '@gm/graphmod-command';
import { configs, initConfig } from './config';
initConfig(configs);
const graghmod = {
...mods1,
...mods2
};
export default graghmod;
packages/graphmod-tool/src/demo1/config.js 0 → 100644
View file @ 9ee703b8
// 根据不同项目引用不同子项目的config.json配置
const configs = [
// { name: 'team', source: 'packages/graphmod-team/config.json' }
];
// 加载配置
function initConfig() {
window.gmconfig = {};
configs.forEach(e => {
const version = window.hybridModular.version || '';
const prefix = version.includes('/') ? version : `/external/graphmod/${version}`;
fetch(`${prefix}/${e.name}.config.json`)
.then(respone => respone.json())
.then(d => {
window.gmconfig = { ...window.gmconfig, ...d || {} };
});
});
}
module.exports = {
configs,
initConfig
};
packages/graphmod-tool/src/demo1/index.js 0 → 100644
View file @ 9ee703b8
import DeleteView from './DeleteView';
import './index.scss';
export default [
{
key: 'dataBase-delete',
component: DeleteView
}
];
packages/graphmod-tool/src/demo1/index.scss 0 → 100644
View file @ 9ee703b8
.ig-execute-progress {
.amos-progress {
margin-bottom: 12px;
&.amos-progress-status-exception {
.amos-progress-bg {
background-color: red;
border-radius: 0;
}
}
.amos-progress-inner {
background-image: linear-gradient(180deg, #eaeaea 0%, white 100%);
border: 1px solid #e6e6e6;
border-radius: 0;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16);
}
.amos-progress-bg {
background-color: #25ae16;
border-radius: 0;
}
}
&-switch {
margin-bottom: 18px;
}
&-content {
height: 300px;
padding: 15px 18px;
overflow-y: auto;
font-size: 13px;
line-height: 20px;
color: #0060ff;
border: 1px solid #e2e2e2;
}
}
packages/graphmod-tool/src/demo1/tool.js 0 → 100644
View file @ 9ee703b8
import mods1 from '@gm/graphmod-tool';
import { configs, initConfig } from './config';
initConfig(configs);
const graghmod = {
...mods1
};
export default graghmod;
packages/graphmod-tool/src/index.js
View file @ 9ee703b8
...@@ -3,9 +3,11 @@ import { chainModResult } from 'amos-viz/lib/widgets/modLoader'; ...@@ -3,9 +3,11 @@ import { chainModResult } from 'amos-viz/lib/widgets/modLoader';
import './index.scss'; import './index.scss';
import './cssvar.scss'; import './cssvar.scss';
import Shifting from './siftingSort'; import Shifting from './siftingSort';
import demo1 from './demo1';
const IMods = [ const IMods = [
...Shifting ...demo1,
...Shifting
]; ];
export default chainModResult(IMods).mods; export default chainModResult(IMods).mods;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment