8000 merge · githubsunyf/cms@e35196e · GitHub
[go: up one dir, main page]
Skip to content

Commit e35196e

Browse files
starlyingstarlying
committed
merge
2 parents c8fb9c1 + dc3f428 commit e35196e

File tree

3 files changed

+40
-4
lines changed

3 files changed

+40
-4
lines changed

‎SiteServer.Web/Home/pages/contents.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ <h4 class="page-title">稿件管理</h4>
237237
<div class="col-3">
238238
<multiselect v-on:select="onPageSelect" v-model="page" placeholder="Select one" :options="pageOptions"
239239
:searchable="false" :show-labels="false">
240-
<template slot="singleLabel" slot-scope="{ option }">第 {{ option }} 页（共 {{ pages }} 页）</template>
240+
<template slot="singleLabel" slot-scope="props">第 {{ props.option }} 页（共 {{ pages }} 页）</template>
241241
<template slot="option" slot-scope="props"> 第 {{ props.option }} 页 </template>
242242
</multiselect>
243243
</div>

‎SiteServer.Web/SiteServer/Cms/contents.cshtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,11 @@ min-height: 34px;
200200
<div class="col-3">
201201
<multiselect v-on:select="onPageSelect" v-model="page" placeholder="Select one" :options="pageOptions" :searchable="false"
202202
:show-labels="false">
203-
<template slot="singleLabel" slot-scope="{ option }">第 {{ option }} 页（共 {{ pages }} 页）</template>
204-
<template slot="option" slot-scope="props"> 第 {{ props.option }} 页 </template>
203+
<template slot="singleLabel" slot-scope="props">第 {{ props.option }} 页（共 {{ pages }} 页）</template>
204+
<template slot="option" slot-scope="props">
205+
第 {{ props.option }} 页
206+
</template>
205207
</multiselect>
206208
</div>
207209
</div> @section Scripts{ <script src="../assets/lib/vue-multiselect-2.1.0/script.min.js"></script>
208-
<script src="contents.js" type="text/javascript"></script> }
210+
<script src="contents.js" type="text/javascript"></script> }

‎azure-pipelines.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# ASP.NET
2+
# Build and test ASP.NET projects.
3+
# Add steps that publish symbols, save build artifacts, deploy, and more:
4+
# https://docs.microsoft.com/azure/devops/pipelines/apps/aspnet/build-aspnet-4
5+
6+
trigger:
7+
- dev
8+
9+
pool:
10+
vmImage: 'VS2017-Win2016'
11+
12+
variables:
13+
solution: '**/*.sln'
14+
buildPlatform: 'Any CPU'
15+
buildConfiguration: 'Release'
16+
17+
steps:
18+
- task: NuGetToolInstaller@0
19+
20+
- task: NuGetCommand@2
21+
inputs:
22+
restoreSolution: '$(solution)'
23+
24+
- task: VSBuild@1
25+
inputs:
26+
solution: '$(solution)'
27+
msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)"'
28+
platform: '$(buildPlatform)'
29+
configuration: '$(buildConfiguration)'
30+
31+
- task: VSTest@2
32+
inputs:
33+
platform: '$(buildPlatform)'
34+
configuration: '$(buildConfiguration)'

0 commit comments

Comments
 (0)
0