Compare commits
	
		
			7 Commits 
		
	
	
		
			master
			...
			20240620-R
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								 | 
						65917f0130 | |
| 
							
							
								 | 
						1b22b584af | |
| 
							
							
								 | 
						693cf8cc96 | |
| 
							
							
								 | 
						d40c66571b | |
| 
							
							
								 | 
						3f74ac2bbf | |
| 
							
							
								 | 
						20d1e2d7f0 | |
| 
							
							
								 | 
						8402a11818 | 
| 
						 | 
					@ -1,10 +1,8 @@
 | 
				
			||||||
@Library('jgpl') _
 | 
					@Library('jgpl') _
 | 
				
			||||||
webPipeline([
 | 
					webPipeline([
 | 
				
			||||||
        onBuildInstallShell:{->
 | 
					        onBuildInstallShell:{->
 | 
				
			||||||
                        return """
 | 
					            return """
 | 
				
			||||||
                        npm install url-loader --userconfig ${env.NPM_CONFIG_USERCONFIG} --no-package-lock
 | 
					            pnpm install --no-prefer-frozen-lockfile
 | 
				
			||||||
                        pnpm install -no-frozen-lockfile   
 | 
					            pnpm run build || echo 'Ignore build error !!!'
 | 
				
			||||||
                        pnpm run build || echo 'Ignore build error !!!'
 | 
					        """}
 | 
				
			||||||
                       """
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
])
 | 
					])
 | 
				
			||||||
							
								
								
									
										195
									
								
								package.json
								
								
								
								
							
							
						
						
									
										195
									
								
								package.json
								
								
								
								
							| 
						 | 
					@ -1,103 +1,98 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    "name": "cop-web",
 | 
					  "name": "cop-web",
 | 
				
			||||||
    "version": "5.6.0",
 | 
					  "version": "5.6.0",
 | 
				
			||||||
    "private": true,
 | 
					  "private": true,
 | 
				
			||||||
    "author": "Haijun Zhang <zhanghaijun@beyondcent.com>",
 | 
					  "author": "Haijun Zhang <zhanghaijun@beyondcent.com>",
 | 
				
			||||||
    "scripts": {
 | 
					  "scripts": {
 | 
				
			||||||
        "dev": "vite",
 | 
					    "serve": "vue-cli-service serve",
 | 
				
			||||||
        "serve": "vue-cli-service serve",
 | 
					    "build": "vue-cli-service build"
 | 
				
			||||||
        "build": "vue-cli-service build",
 | 
					  },
 | 
				
			||||||
        "lint": "vue-cli-service lint",
 | 
					  "dependencies": {
 | 
				
			||||||
        "fix": "vue-cli-service lint --fix",
 | 
					    "@vue/composition-api": "^1.0.0-rc.2",
 | 
				
			||||||
        "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit",
 | 
					    "axios": "^0.21.1",
 | 
				
			||||||
        "precommit": "lint-staged",
 | 
					    "clipboard": "^2.0.6",
 | 
				
			||||||
        "upload": "node upload.js",
 | 
					    "cmp-echarts": "2.0.0-5.6-release",
 | 
				
			||||||
        "deploy": "yarn build && yarn upload"
 | 
					    "cmp-element": "1.0.0-5.6-release",
 | 
				
			||||||
    },
 | 
					    "cmp-graph-editor": "1.0.0-5.6-release",
 | 
				
			||||||
    "dependencies": {
 | 
					    "cmp-socket": "1.0.0",
 | 
				
			||||||
        "@vue/composition-api": "^1.0.0-rc.2",
 | 
					    "codemirror": "5.60",
 | 
				
			||||||
        "axios": "^0.21.1",
 | 
					    "core-js": "^3.3.2",
 | 
				
			||||||
        "clipboard": "^2.0.6",
 | 
					    "crypto-js": "^3.1.9-1",
 | 
				
			||||||
        "cmp-echarts": "2.0.0-5.6-release",
 | 
					    "dayjs": "^1.10.4",
 | 
				
			||||||
        "cmp-element": "1.0.0-5.6-release",
 | 
					    "element-ui": "2.13.0",
 | 
				
			||||||
        "cmp-graph-editor": "1.0.0-5.6-release",
 | 
					    "jquery": "^3.6.0",
 | 
				
			||||||
        "cmp-socket": "1.0.0",
 | 
					    "js-cookie": "^2.2.0",
 | 
				
			||||||
        "core-js": "^3.3.2",
 | 
					    "lodash-es": "^4.17.21",
 | 
				
			||||||
        "crypto-js": "^3.1.9-1",
 | 
					    "mergely": "4.0.15",
 | 
				
			||||||
        "dayjs": "^1.10.4",
 | 
					    "nprogress": "^0.2.0",
 | 
				
			||||||
        "element-ui": "2.13.0",
 | 
					    "qs": "^6.7.0",
 | 
				
			||||||
        "jquery": "^3.6.0",
 | 
					    "sortablejs": "^1.8.4",
 | 
				
			||||||
        "js-cookie": "^2.2.0",
 | 
					    "url-loader": "^4.1.1",
 | 
				
			||||||
        "lodash-es": "^4.17.21",
 | 
					    "vue": "2.6.14",
 | 
				
			||||||
        "mergely": "4.0.15",
 | 
					    "vue-class-component": "^7.0.2",
 | 
				
			||||||
        "nprogress": "^0.2.0",
 | 
					    "vue-code-diff": "^0.0.4",
 | 
				
			||||||
        "qs": "^6.7.0",
 | 
					    "vue-i18n": "^8.15.0",
 | 
				
			||||||
        "sortablejs": "^1.8.4",
 | 
					    "vue-property-decorator": "^8.3.0",
 | 
				
			||||||
        "vue": "2.6.14",
 | 
					    "vue-router": "^3.3.4",
 | 
				
			||||||
        "vue-class-component": "^7.0.2",
 | 
					    "vue2-animate": "^1.0.4",
 | 
				
			||||||
        "vue-code-diff": "^0.0.4",
 | 
					    "vuex": "^3.0.1"
 | 
				
			||||||
        "vue-i18n": "^8.15.0",
 | 
					  },
 | 
				
			||||||
        "vue-property-decorator": "^8.3.0",
 | 
					  "devDependencies": {
 | 
				
			||||||
        "vue-router": "^3.3.4",
 | 
					    "@commitlint/cli": "^11.0.0",
 | 
				
			||||||
        "vue2-animate": "^1.0.4",
 | 
					    "@commitlint/config-conventional": "^11.0.0",
 | 
				
			||||||
        "vuex": "^3.0.1"
 | 
					    "@types/js-cookie": "^2.2.4",
 | 
				
			||||||
    },
 | 
					    "@types/lodash-es": "^4.17.5",
 | 
				
			||||||
    "devDependencies": {
 | 
					    "@types/nprogress": "^0.2.0",
 | 
				
			||||||
        "@commitlint/cli": "^11.0.0",
 | 
					    "@types/qs": "^6.5.3",
 | 
				
			||||||
        "@commitlint/config-conventional": "^11.0.0",
 | 
					    "@typescript-eslint/eslint-plugin": "^2.18.0",
 | 
				
			||||||
        "@types/js-cookie": "^2.2.4",
 | 
					    "@typescript-eslint/parser": "^2.18.0",
 | 
				
			||||||
        "@types/lodash-es": "^4.17.5",
 | 
					    "@vue/cli-plugin-babel": "~4.4.1",
 | 
				
			||||||
        "@types/nprogress": "^0.2.0",
 | 
					    "@vue/cli-plugin-eslint": "~4.4.1",
 | 
				
			||||||
        "@types/qs": "^6.5.3",
 | 
					    "@vue/cli-plugin-router": "~4.4.1",
 | 
				
			||||||
        "@typescript-eslint/eslint-plugin": "^2.18.0",
 | 
					    "@vue/cli-plugin-typescript": "~4.4.1",
 | 
				
			||||||
        "@typescript-eslint/parser": "^2.18.0",
 | 
					    "@vue/cli-plugin-vuex": "~4.4.1",
 | 
				
			||||||
        "@vue/cli-plugin-babel": "~4.4.1",
 | 
					    "@vue/cli-service": "~4.4.1",
 | 
				
			||||||
        "@vue/cli-plugin-eslint": "~4.4.1",
 | 
					    "@vue/eslint-config-standard": "^5.1.0",
 | 
				
			||||||
        "@vue/cli-plugin-router": "~4.4.1",
 | 
					    "@vue/eslint-config-typescript": "^5.0.1",
 | 
				
			||||||
        "@vue/cli-plugin-typescript": "~4.4.1",
 | 
					    "autoprefixer": "9.8.6",
 | 
				
			||||||
        "@vue/cli-plugin-vuex": "~4.4.1",
 | 
					    "babel-plugin-transform-vite-meta-glob": "^1.0.3",
 | 
				
			||||||
        "@vue/cli-service": "~4.4.1",
 | 
					    "chalk": "^4.1.1",
 | 
				
			||||||
        "@vue/eslint-config-standard": "^5.1.0",
 | 
					    "compress-webpack-plugin": "^1.0.6",
 | 
				
			||||||
        "@vue/eslint-config-typescript": "^5.0.1",
 | 
					    "cross-env": "^5.2.0",
 | 
				
			||||||
        "autoprefixer": "9.8.6",
 | 
					    "eslint": "^6.7.2",
 | 
				
			||||||
        "babel-plugin-transform-vite-meta-glob": "^1.0.3",
 | 
					    "eslint-plugin-import": "^2.20.1",
 | 
				
			||||||
        "chalk": "^4.1.1",
 | 
					    "eslint-plugin-node": "^11.0.0",
 | 
				
			||||||
        "compress-webpack-plugin": "^1.0.6",
 | 
					    "eslint-plugin-promise": "^4.2.1",
 | 
				
			||||||
        "cross-env": "^5.2.0",
 | 
					    "eslint-plugin-standard": "^4.0.0",
 | 
				
			||||||
        "eslint": "^6.7.2",
 | 
					    "eslint-plugin-vue": "^6.1.2",
 | 
				
			||||||
        "eslint-plugin-import": "^2.20.1",
 | 
					    "husky": "^1.3.1",
 | 
				
			||||||
        "eslint-plugin-node": "^11.0.0",
 | 
					    "increase-memory-limit": "^1.0.6",
 | 
				
			||||||
        "eslint-plugin-promise": "^4.2.1",
 | 
					    "lint-staged": "^8.1.5",
 | 
				
			||||||
        "eslint-plugin-standard": "^4.0.0",
 | 
					    "ora": "^5.4.0",
 | 
				
			||||||
        "eslint-plugin-vue": "^6.1.2",
 | 
					    "sass": "^1.19.0",
 | 
				
			||||||
        "husky": "^1.3.1",
 | 
					    "sass-loader": "^8.0.0",
 | 
				
			||||||
        "increase-memory-limit": "^1.0.6",
 | 
					    "svg-sprite-loader": "^6.0.2",
 | 
				
			||||||
        "lint-staged": "^8.1.5",
 | 
					    "typescript": "^4.4.4",
 | 
				
			||||||
        "ora": "^5.4.0",
 | 
					    "unplugin-auto-import": "^0.6.1",
 | 
				
			||||||
        "sass": "^1.19.0",
 | 
					    "unplugin-vue-components": "^0.17.21",
 | 
				
			||||||
        "sass-loader": "^8.0.0",
 | 
					    "vue-template-compiler": "2.6.14",
 | 
				
			||||||
        "svg-sprite-loader": "^6.0.2",
 | 
					    "webpack-cli": "^4.9.2"
 | 
				
			||||||
        "typescript": "^4.4.4",
 | 
					  },
 | 
				
			||||||
        "unplugin-auto-import": "^0.6.1",
 | 
					  "eslintConfig": {
 | 
				
			||||||
        "unplugin-vue-components": "^0.17.21",
 | 
					    "parserOptions": {
 | 
				
			||||||
        "vue-template-compiler": "2.6.14",
 | 
					      "parser": "@typescript-eslint/parser"
 | 
				
			||||||
        "webpack-cli": "^4.9.2"
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    "eslintConfig": {
 | 
					 | 
				
			||||||
        "parserOptions": {
 | 
					 | 
				
			||||||
            "parser": "@typescript-eslint/parser"
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    "lint-staged": {
 | 
					 | 
				
			||||||
        "src/**/*.{js,vue}": [
 | 
					 | 
				
			||||||
            "eslint --fix",
 | 
					 | 
				
			||||||
            "git add"
 | 
					 | 
				
			||||||
        ]
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    "husky": {
 | 
					 | 
				
			||||||
        "hooks": {
 | 
					 | 
				
			||||||
            "pre-commit": "lint-staged",
 | 
					 | 
				
			||||||
            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  "lint-staged": {
 | 
				
			||||||
 | 
					    "src/**/*.{js,vue}": [
 | 
				
			||||||
 | 
					      "eslint --fix",
 | 
				
			||||||
 | 
					      "git add"
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  "husky": {
 | 
				
			||||||
 | 
					    "hooks": {
 | 
				
			||||||
 | 
					      "pre-commit": "lint-staged",
 | 
				
			||||||
 | 
					      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
							
								
								
									
										1055
									
								
								pnpm-lock.yaml
								
								
								
								
							
							
						
						
									
										1055
									
								
								pnpm-lock.yaml
								
								
								
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
					@ -14,7 +14,7 @@ function resolve(dir) {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
const httpType = 'https://'
 | 
					const httpType = 'https://'
 | 
				
			||||||
// const proxyUrl = 'develop.cmp56.com:60006/' // 代理地址设置
 | 
					// const proxyUrl = 'develop.cmp56.com:60006/' // 代理地址设置
 | 
				
			||||||
const proxyUrl = '10.20.12.56:60006/' // 代理地址设置
 | 
					const proxyUrl = '23.33.3.22:60006/' // 代理地址设置
 | 
				
			||||||
// const publicPath = process.env.NODE_ENV === 'production' ? '/cop-web/' : '/cop-web/';
 | 
					// const publicPath = process.env.NODE_ENV === 'production' ? '/cop-web/' : '/cop-web/';
 | 
				
			||||||
const publicPath = '/cop-web/'
 | 
					const publicPath = '/cop-web/'
 | 
				
			||||||
module.exports = {
 | 
					module.exports = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue