vue2-client 1.12.62 → 1.12.64
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -35,9 +35,13 @@ export default {
|
|
|
35
35
|
})
|
|
36
36
|
},
|
|
37
37
|
handleClick (index) {
|
|
38
|
-
const
|
|
39
|
-
this.$emit('listClick',
|
|
40
|
-
}
|
|
38
|
+
const row = this.data[index]
|
|
39
|
+
this.$emit('listClick', row)
|
|
40
|
+
},
|
|
41
|
+
refreshList () {
|
|
42
|
+
this.getData(this.queryParamsName)
|
|
43
|
+
},
|
|
44
|
+
|
|
41
45
|
}
|
|
42
46
|
}
|
|
43
47
|
</script>
|
|
@@ -65,6 +69,8 @@ export default {
|
|
|
65
69
|
border: 1px solid #D9D9D9;
|
|
66
70
|
box-sizing: border-box;
|
|
67
71
|
margin-bottom: 16px;
|
|
72
|
+
white-space: nowrap;
|
|
73
|
+
overflow: clip;
|
|
68
74
|
}
|
|
69
75
|
|
|
70
76
|
/* 自定义滚动条样式 */
|
|
@@ -52,8 +52,8 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
|
|
|
52
52
|
routerResource.example = {
|
|
53
53
|
path: 'example',
|
|
54
54
|
name: '示例主页面',
|
|
55
|
-
component: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
|
|
56
|
-
|
|
55
|
+
// component: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
|
|
56
|
+
component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
|
|
57
57
|
// component: () => import('@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'),
|
|
58
58
|
// component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
|
|
59
59
|
// component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
|
package/vue.config.js
CHANGED
|
@@ -1,214 +1,214 @@
|
|
|
1
|
-
const path = require('path')
|
|
2
|
-
const webpack = require('webpack')
|
|
3
|
-
const ThemeColorReplacer = require('webpack-theme-color-replacer')
|
|
4
|
-
const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
|
|
5
|
-
const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
|
|
6
|
-
const CompressionWebpackPlugin = require('compression-webpack-plugin')
|
|
7
|
-
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
|
|
8
|
-
// const CopyPlugin = require('copy-webpack-plugin')
|
|
9
|
-
|
|
10
|
-
const productionGzipExtensions = ['js', 'css']
|
|
11
|
-
const isProd = process.env.NODE_ENV === 'production'
|
|
12
|
-
|
|
13
|
-
// v4 产品演示
|
|
14
|
-
const v3Server = 'http://aote-office.8866.org:31567'
|
|
15
|
-
// const gateway = 'http://192.168.50.67:31467'
|
|
16
|
-
// const testUpload = 'http://123.60.214.109:8406'
|
|
17
|
-
const OSSServerDev = 'http://192.168.50.67:30351'
|
|
18
|
-
// const revenue = 'http://aote-office.8866.org:31567'
|
|
19
|
-
const revenue = 'http://aote-office.8866.org:31567'
|
|
20
|
-
// const OSSServerProd = 'http://192.168.50.67:31351'
|
|
21
|
-
// const testUploadLocal = 'http://127.0.0.1:9001'
|
|
22
|
-
// v3 铜川
|
|
23
|
-
// const v3Server = 'http://61.134.55.234:8405'
|
|
24
|
-
// const gateway = 'http://61.134.55.234:8456/webmeter'
|
|
25
|
-
// v3 涉县
|
|
26
|
-
// const v3Server = 'http://221.193.244.147:9600'
|
|
27
|
-
// const gateway = 'http://221.193.244.147:9600/webmeter'
|
|
28
|
-
// 本地
|
|
29
|
-
// const local = 'http://localhost:8080'
|
|
30
|
-
|
|
31
|
-
module.exports = {
|
|
32
|
-
devServer: {
|
|
33
|
-
// development server port 8000
|
|
34
|
-
port: 8020,
|
|
35
|
-
// If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
|
|
36
|
-
proxy: {
|
|
37
|
-
// '/apply-image': {
|
|
38
|
-
// target: revenue,
|
|
39
|
-
// },
|
|
40
|
-
'/rs': {
|
|
41
|
-
target: v3Server,
|
|
42
|
-
ws: false,
|
|
43
|
-
changeOrigin: true
|
|
44
|
-
},
|
|
45
|
-
// '/api/af-system/resource': {
|
|
46
|
-
// pathRewrite: { '^/api/af-system': '/' },
|
|
47
|
-
// target: testUpload,
|
|
48
|
-
// changeOrigin: true
|
|
49
|
-
// },
|
|
50
|
-
'/api/af-revenue/logic/openapi/': {
|
|
51
|
-
// pathRewrite: { '^/api/af-revenue/logic/openapi/': '/logic/' },
|
|
52
|
-
target: revenue,
|
|
53
|
-
changeOrigin: true
|
|
54
|
-
},
|
|
55
|
-
'/api/af-scada': {
|
|
56
|
-
target: revenue,
|
|
57
|
-
changeOrigin: true
|
|
58
|
-
},
|
|
59
|
-
'/api/af-revenue': {
|
|
60
|
-
// pathRewrite: { '^/api/af-revenue/': '/' },
|
|
61
|
-
target: revenue,
|
|
62
|
-
changeOrigin: true
|
|
63
|
-
},
|
|
64
|
-
'/api/af-liuli': {
|
|
65
|
-
// pathRewrite: { '^/api/af-liuli/': '/' },
|
|
66
|
-
// target: 'http://127.0.0.1:9014',
|
|
67
|
-
target: revenue,
|
|
68
|
-
changeOrigin: true
|
|
69
|
-
},
|
|
70
|
-
'/api/af-gaslink': {
|
|
71
|
-
// pathRewrite: { '^/api/af-gaslink/': '/' },
|
|
72
|
-
// target: 'http://127.0.0.1:9036',
|
|
73
|
-
target: revenue,
|
|
74
|
-
changeOrigin: true
|
|
75
|
-
},
|
|
76
|
-
'/api': {
|
|
77
|
-
// v3用
|
|
78
|
-
// pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
|
|
79
|
-
// pathRewrite: { '^/api/': '/' },
|
|
80
|
-
target: revenue,
|
|
81
|
-
changeOrigin: true
|
|
82
|
-
},
|
|
83
|
-
'/devApi': {
|
|
84
|
-
// v3用
|
|
85
|
-
// pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
|
|
86
|
-
// pathRewrite: { '^/api/': '/' },
|
|
87
|
-
target: revenue,
|
|
88
|
-
changeOrigin: true
|
|
89
|
-
},
|
|
90
|
-
'/resource': {
|
|
91
|
-
// pathRewrite: { '^/resource': '/' },
|
|
92
|
-
target: revenue,
|
|
93
|
-
changeOrigin: true
|
|
94
|
-
},
|
|
95
|
-
'/ai': {
|
|
96
|
-
target: 'http://192.168.50.67:31761',
|
|
97
|
-
pathRewrite: { '^/ai': '/' },
|
|
98
|
-
changeOrigin: true
|
|
99
|
-
},
|
|
100
|
-
'/oss': {
|
|
101
|
-
target: OSSServerDev,
|
|
102
|
-
pathRewrite: { '^/oss': '/' },
|
|
103
|
-
changeOrigin: true
|
|
104
|
-
},
|
|
105
|
-
},
|
|
106
|
-
client: {
|
|
107
|
-
overlay: false
|
|
108
|
-
}
|
|
109
|
-
},
|
|
110
|
-
pluginOptions: {
|
|
111
|
-
'style-resources-loader': {
|
|
112
|
-
preProcessor: 'less',
|
|
113
|
-
patterns: [path.resolve(__dirname, './src/theme/theme.less')]
|
|
114
|
-
}
|
|
115
|
-
},
|
|
116
|
-
configureWebpack: config => {
|
|
117
|
-
config.devtool = 'inline-source-map'
|
|
118
|
-
// 忽略.md文件
|
|
119
|
-
config.module.rules.push(
|
|
120
|
-
{
|
|
121
|
-
test: /\.md$/,
|
|
122
|
-
exclude: /node_modules/,
|
|
123
|
-
use: 'ignore-loader'
|
|
124
|
-
}
|
|
125
|
-
)
|
|
126
|
-
config.context = path.resolve(__dirname, './')
|
|
127
|
-
config.resolve = {
|
|
128
|
-
extensions: ['.js', '.vue', '.json'],
|
|
129
|
-
alias: {
|
|
130
|
-
'@vue2-client': path.resolve('src'),
|
|
131
|
-
'@': path.resolve('src'),
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']
|
|
135
|
-
config.performance = {
|
|
136
|
-
hints: false
|
|
137
|
-
}
|
|
138
|
-
if (isProd) {
|
|
139
|
-
config.plugins.push(
|
|
140
|
-
new ThemeColorReplacer({
|
|
141
|
-
fileName: 'css/theme-colors-[contenthash:8].css',
|
|
142
|
-
matchColors: getThemeColors(),
|
|
143
|
-
injectCss: true,
|
|
144
|
-
resolveCss
|
|
145
|
-
})
|
|
146
|
-
)
|
|
147
|
-
}
|
|
148
|
-
// Ignore all locale files of moment.js
|
|
149
|
-
config.plugins.push(new webpack.IgnorePlugin({
|
|
150
|
-
resourceRegExp: /^\.\/locale$/,
|
|
151
|
-
contextRegExp: /moment$/
|
|
152
|
-
}))
|
|
153
|
-
|
|
154
|
-
config.plugins.push(
|
|
155
|
-
// new CopyPlugin({
|
|
156
|
-
// patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
|
|
157
|
-
// })
|
|
158
|
-
)
|
|
159
|
-
|
|
160
|
-
// 生产环境下将资源压缩成gzip格式
|
|
161
|
-
if (isProd) {
|
|
162
|
-
// add `CompressionWebpack` plugin to webpack plugins
|
|
163
|
-
config.plugins.push(new CompressionWebpackPlugin({
|
|
164
|
-
algorithm: 'gzip',
|
|
165
|
-
test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
|
|
166
|
-
threshold: 10240,
|
|
167
|
-
minRatio: 0.8
|
|
168
|
-
}))
|
|
169
|
-
}
|
|
170
|
-
// if prod, add externals
|
|
171
|
-
// if (isProd) {
|
|
172
|
-
// config.externals = assetsCDN.externals
|
|
173
|
-
// }
|
|
174
|
-
},
|
|
175
|
-
chainWebpack: config => {
|
|
176
|
-
// 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
|
|
177
|
-
if (isProd) {
|
|
178
|
-
config.optimization.minimizer('css').use(CssMinimizerPlugin, [{
|
|
179
|
-
minimizerOptions: {
|
|
180
|
-
preset: [
|
|
181
|
-
'default',
|
|
182
|
-
{
|
|
183
|
-
discardComments: { removeAll: true },
|
|
184
|
-
colormin: false,
|
|
185
|
-
}
|
|
186
|
-
],
|
|
187
|
-
ignoreOrder: true
|
|
188
|
-
}
|
|
189
|
-
}])
|
|
190
|
-
}
|
|
191
|
-
config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
|
|
192
|
-
},
|
|
193
|
-
css: {
|
|
194
|
-
extract: !isProd
|
|
195
|
-
? {
|
|
196
|
-
filename: 'css/[name].css',
|
|
197
|
-
chunkFilename: 'css/[name].css',
|
|
198
|
-
}
|
|
199
|
-
: true,
|
|
200
|
-
loaderOptions: {
|
|
201
|
-
less: {
|
|
202
|
-
lessOptions: {
|
|
203
|
-
modifyVars: modifyVars(),
|
|
204
|
-
javascriptEnabled: true
|
|
205
|
-
}
|
|
206
|
-
},
|
|
207
|
-
sass: {}
|
|
208
|
-
}
|
|
209
|
-
},
|
|
210
|
-
publicPath: process.env.VUE_APP_PUBLIC_PATH,
|
|
211
|
-
outputDir: 'dist',
|
|
212
|
-
assetsDir: 'static',
|
|
213
|
-
productionSourceMap: false
|
|
214
|
-
}
|
|
1
|
+
const path = require('path')
|
|
2
|
+
const webpack = require('webpack')
|
|
3
|
+
const ThemeColorReplacer = require('webpack-theme-color-replacer')
|
|
4
|
+
const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
|
|
5
|
+
const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
|
|
6
|
+
const CompressionWebpackPlugin = require('compression-webpack-plugin')
|
|
7
|
+
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
|
|
8
|
+
// const CopyPlugin = require('copy-webpack-plugin')
|
|
9
|
+
|
|
10
|
+
const productionGzipExtensions = ['js', 'css']
|
|
11
|
+
const isProd = process.env.NODE_ENV === 'production'
|
|
12
|
+
|
|
13
|
+
// v4 产品演示
|
|
14
|
+
const v3Server = 'http://aote-office.8866.org:31567'
|
|
15
|
+
// const gateway = 'http://192.168.50.67:31467'
|
|
16
|
+
// const testUpload = 'http://123.60.214.109:8406'
|
|
17
|
+
const OSSServerDev = 'http://192.168.50.67:30351'
|
|
18
|
+
// const revenue = 'http://aote-office.8866.org:31567'
|
|
19
|
+
const revenue = 'http://aote-office.8866.org:31567'
|
|
20
|
+
// const OSSServerProd = 'http://192.168.50.67:31351'
|
|
21
|
+
// const testUploadLocal = 'http://127.0.0.1:9001'
|
|
22
|
+
// v3 铜川
|
|
23
|
+
// const v3Server = 'http://61.134.55.234:8405'
|
|
24
|
+
// const gateway = 'http://61.134.55.234:8456/webmeter'
|
|
25
|
+
// v3 涉县
|
|
26
|
+
// const v3Server = 'http://221.193.244.147:9600'
|
|
27
|
+
// const gateway = 'http://221.193.244.147:9600/webmeter'
|
|
28
|
+
// 本地
|
|
29
|
+
// const local = 'http://localhost:8080'
|
|
30
|
+
|
|
31
|
+
module.exports = {
|
|
32
|
+
devServer: {
|
|
33
|
+
// development server port 8000
|
|
34
|
+
port: 8020,
|
|
35
|
+
// If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
|
|
36
|
+
proxy: {
|
|
37
|
+
// '/apply-image': {
|
|
38
|
+
// target: revenue,
|
|
39
|
+
// },
|
|
40
|
+
'/rs': {
|
|
41
|
+
target: v3Server,
|
|
42
|
+
ws: false,
|
|
43
|
+
changeOrigin: true
|
|
44
|
+
},
|
|
45
|
+
// '/api/af-system/resource': {
|
|
46
|
+
// pathRewrite: { '^/api/af-system': '/' },
|
|
47
|
+
// target: testUpload,
|
|
48
|
+
// changeOrigin: true
|
|
49
|
+
// },
|
|
50
|
+
'/api/af-revenue/logic/openapi/': {
|
|
51
|
+
// pathRewrite: { '^/api/af-revenue/logic/openapi/': '/logic/' },
|
|
52
|
+
target: revenue,
|
|
53
|
+
changeOrigin: true
|
|
54
|
+
},
|
|
55
|
+
'/api/af-scada': {
|
|
56
|
+
target: revenue,
|
|
57
|
+
changeOrigin: true
|
|
58
|
+
},
|
|
59
|
+
'/api/af-revenue': {
|
|
60
|
+
// pathRewrite: { '^/api/af-revenue/': '/' },
|
|
61
|
+
target: revenue,
|
|
62
|
+
changeOrigin: true
|
|
63
|
+
},
|
|
64
|
+
'/api/af-liuli': {
|
|
65
|
+
// pathRewrite: { '^/api/af-liuli/': '/' },
|
|
66
|
+
// target: 'http://127.0.0.1:9014',
|
|
67
|
+
target: revenue,
|
|
68
|
+
changeOrigin: true
|
|
69
|
+
},
|
|
70
|
+
'/api/af-gaslink': {
|
|
71
|
+
// pathRewrite: { '^/api/af-gaslink/': '/' },
|
|
72
|
+
// target: 'http://127.0.0.1:9036',
|
|
73
|
+
target: revenue,
|
|
74
|
+
changeOrigin: true
|
|
75
|
+
},
|
|
76
|
+
'/api': {
|
|
77
|
+
// v3用
|
|
78
|
+
// pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
|
|
79
|
+
// pathRewrite: { '^/api/': '/' },
|
|
80
|
+
target: revenue,
|
|
81
|
+
changeOrigin: true
|
|
82
|
+
},
|
|
83
|
+
'/devApi': {
|
|
84
|
+
// v3用
|
|
85
|
+
// pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
|
|
86
|
+
// pathRewrite: { '^/api/': '/' },
|
|
87
|
+
target: revenue,
|
|
88
|
+
changeOrigin: true
|
|
89
|
+
},
|
|
90
|
+
'/resource': {
|
|
91
|
+
// pathRewrite: { '^/resource': '/' },
|
|
92
|
+
target: revenue,
|
|
93
|
+
changeOrigin: true
|
|
94
|
+
},
|
|
95
|
+
'/ai': {
|
|
96
|
+
target: 'http://192.168.50.67:31761',
|
|
97
|
+
pathRewrite: { '^/ai': '/' },
|
|
98
|
+
changeOrigin: true
|
|
99
|
+
},
|
|
100
|
+
'/oss': {
|
|
101
|
+
target: OSSServerDev,
|
|
102
|
+
pathRewrite: { '^/oss': '/' },
|
|
103
|
+
changeOrigin: true
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
client: {
|
|
107
|
+
overlay: false
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
pluginOptions: {
|
|
111
|
+
'style-resources-loader': {
|
|
112
|
+
preProcessor: 'less',
|
|
113
|
+
patterns: [path.resolve(__dirname, './src/theme/theme.less')]
|
|
114
|
+
}
|
|
115
|
+
},
|
|
116
|
+
configureWebpack: config => {
|
|
117
|
+
config.devtool = 'inline-source-map'
|
|
118
|
+
// 忽略.md文件
|
|
119
|
+
config.module.rules.push(
|
|
120
|
+
{
|
|
121
|
+
test: /\.md$/,
|
|
122
|
+
exclude: /node_modules/,
|
|
123
|
+
use: 'ignore-loader'
|
|
124
|
+
}
|
|
125
|
+
)
|
|
126
|
+
config.context = path.resolve(__dirname, './')
|
|
127
|
+
config.resolve = {
|
|
128
|
+
extensions: ['.js', '.vue', '.json'],
|
|
129
|
+
alias: {
|
|
130
|
+
'@vue2-client': path.resolve('src'),
|
|
131
|
+
'@': path.resolve('src'),
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']
|
|
135
|
+
config.performance = {
|
|
136
|
+
hints: false
|
|
137
|
+
}
|
|
138
|
+
if (isProd) {
|
|
139
|
+
config.plugins.push(
|
|
140
|
+
new ThemeColorReplacer({
|
|
141
|
+
fileName: 'css/theme-colors-[contenthash:8].css',
|
|
142
|
+
matchColors: getThemeColors(),
|
|
143
|
+
injectCss: true,
|
|
144
|
+
resolveCss
|
|
145
|
+
})
|
|
146
|
+
)
|
|
147
|
+
}
|
|
148
|
+
// Ignore all locale files of moment.js
|
|
149
|
+
config.plugins.push(new webpack.IgnorePlugin({
|
|
150
|
+
resourceRegExp: /^\.\/locale$/,
|
|
151
|
+
contextRegExp: /moment$/
|
|
152
|
+
}))
|
|
153
|
+
|
|
154
|
+
config.plugins.push(
|
|
155
|
+
// new CopyPlugin({
|
|
156
|
+
// patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
|
|
157
|
+
// })
|
|
158
|
+
)
|
|
159
|
+
|
|
160
|
+
// 生产环境下将资源压缩成gzip格式
|
|
161
|
+
if (isProd) {
|
|
162
|
+
// add `CompressionWebpack` plugin to webpack plugins
|
|
163
|
+
config.plugins.push(new CompressionWebpackPlugin({
|
|
164
|
+
algorithm: 'gzip',
|
|
165
|
+
test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
|
|
166
|
+
threshold: 10240,
|
|
167
|
+
minRatio: 0.8
|
|
168
|
+
}))
|
|
169
|
+
}
|
|
170
|
+
// if prod, add externals
|
|
171
|
+
// if (isProd) {
|
|
172
|
+
// config.externals = assetsCDN.externals
|
|
173
|
+
// }
|
|
174
|
+
},
|
|
175
|
+
chainWebpack: config => {
|
|
176
|
+
// 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
|
|
177
|
+
if (isProd) {
|
|
178
|
+
config.optimization.minimizer('css').use(CssMinimizerPlugin, [{
|
|
179
|
+
minimizerOptions: {
|
|
180
|
+
preset: [
|
|
181
|
+
'default',
|
|
182
|
+
{
|
|
183
|
+
discardComments: { removeAll: true },
|
|
184
|
+
colormin: false,
|
|
185
|
+
}
|
|
186
|
+
],
|
|
187
|
+
ignoreOrder: true
|
|
188
|
+
}
|
|
189
|
+
}])
|
|
190
|
+
}
|
|
191
|
+
config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
|
|
192
|
+
},
|
|
193
|
+
css: {
|
|
194
|
+
extract: !isProd
|
|
195
|
+
? {
|
|
196
|
+
filename: 'css/[name].css',
|
|
197
|
+
chunkFilename: 'css/[name].css',
|
|
198
|
+
}
|
|
199
|
+
: true,
|
|
200
|
+
loaderOptions: {
|
|
201
|
+
less: {
|
|
202
|
+
lessOptions: {
|
|
203
|
+
modifyVars: modifyVars(),
|
|
204
|
+
javascriptEnabled: true
|
|
205
|
+
}
|
|
206
|
+
},
|
|
207
|
+
sass: {}
|
|
208
|
+
}
|
|
209
|
+
},
|
|
210
|
+
publicPath: process.env.VUE_APP_PUBLIC_PATH,
|
|
211
|
+
outputDir: 'dist',
|
|
212
|
+
assetsDir: 'static',
|
|
213
|
+
productionSourceMap: false
|
|
214
|
+
}
|