提交 dcc47691 编写于 作者: W wq1234wq

Vue3

上级 54b621bf
# These are supported funding model platforms
github: cipchk
open_collective: ng-alain
custom: # Replace with a single custom sponsorship URL
<!--
IMPORTANT: Please use the following link to create a new issue:
https://ng-alain.com/issue-helper/index.html#en
If your issue was not created using the app above, it will be closed immediately.
-->
<!--
注意:请使用下面的链接来新建 issue:
https://ng-alain.com/issue-helper/index.html#zh
不是用上面的链接创建的 issue 会被立即关闭。
-->
blank_issues_enabled: true
contact_links:
- name: Create new issue
url: https://ng-alain.com/issue-helper/index.html#en
about: The issue which is not created via issue-helper will be closed immediately.
- name: 报告问题
url: https://ng-alain.com/issue-helper/index.html#zh
about: 注意:不是用 issue-helper 创建的 issue 会被立即关闭。使用问题请加QQ Group:428749721
## PR Checklist
Please check if your PR fulfills the following requirements:
- [ ] The commit message follows our guidelines: https://github.com/ng-alain/ng-alain/blob/master/CONTRIBUTING.md#commit
- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)
## PR Type
What kind of change does this PR introduce?
<!-- Please check the one that applies to this PR using "x". -->
```
[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Application (the showcase website) / infrastructure changes
[ ] Other... Please describe:
```
## What is the current behavior?
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
Issue Number: N/A
## What is the new behavior?
## Does this PR introduce a breaking change?
```
[ ] Yes
[ ] No
```
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
## Other information
issue:
translate:
replay: |
Translation of this issue:
---
## {title}
{body}
needReproduce:
label: Need Reproduce
afterLabel: Need More Info
replay: |
Hello @{user}. Please provide a online reproduction by forking this link https://stackblitz.com/edit/ng-alain-setup or a minimal GitHub repository.
Issues labeled by `Need Reproduce` will be closed if no activities in 7 days.
你好 @{user}, 我们需要你提供一个在线的重现实例以便于我们帮你排查问题。你可以通过点击 [此处](https://stackblitz.com/edit/ng-alain-setup) 创建一个 stackblitz 或者提供一个最小化的 GitHub 仓库
被标记为 `Need Reproduce` 的 issue 7 天内未跟进将会被自动关闭。
![](https://gw.alipayobjects.com/zos/antfincdn/y9kwg7DVCd/reproduce.gif)
invalid:
mark: ng-alain-issue-helper
labels: Invalid
replay: |
Hello @{user}, your issue has been closed because it does not conform to our issue requirements.
Please use the [Issue Helper](https://ng-alain.com/issue-helper/index.html#en) to create an issue, thank you!
你好 @{user},为了能够进行高效沟通,我们对 issue 有一定的格式要求,你的 issue 因为不符合要求而被自动关闭。
你可以通过 [issue 助手](https://ng-alain.com/issue-helper/index.html#zh) 来创建 issue 以方便我们定位错误。谢谢配合!
# Configuration for lock-threads - https://github.com/dessant/lock-threads
# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 365
# Comment to post before locking. Set to `false` to disable
lockComment: >
This thread has been automatically locked because it has not had recent activity. Please open a new issue for related bugs and link to relevant comments in this thread.
# Issues or pull requests with these labels will not be locked
# exemptLabels:
# - no-locking
# Limit to only `issues` or `pulls`
only: issues
# Configuration for probot-no-response - https://github.com/probot/no-response
# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 7
# Label requiring a response
responseRequiredLabel: Need More Info
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response to our request for more information from the original author. With only the information that is currently in the issue, we don't have enough information to take action. If you can provide more information, feel free to ping anyone of our maintainers to reopen this issue. Thank you for your contributions. --- 这个 issue 已经被自动关闭,因为您没有向我们提供更多的信息。仅凭目前的描述我们无法采取任 何行动,如果您能提供更多的信息请随时联系我们的开发人员重新打开这个 issue。 感谢您的贡献。
titleAndCommits: true
types:
- feat
- fix
- docs
- style
- refactor
- perf
- test
- build
- ci
- chore
- revert
- release
name: Deploy website
# on: push
on:
push:
branches:
- 'publish-**'
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@master
- name: install
run: npm install
- name: build
shell: bash
run: bash ./scripts/_ci/deploy-pipelines.sh
- name: deploy-to-surge
uses: dswistowski/surge-sh-action@v1
with:
login: ${{ secrets.SURGE_LOGIN }}
token: ${{ secrets.SURGE_TOKEN }}
domain: https://ng-alain.surge.sh
project: ./dist
- name: deploy-to-gh-pages
uses: peaceiris/actions-gh-pages@v2
env:
PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PUBLISH_BRANCH: gh-pages
PUBLISH_DIR: ./dist
with:
emptyCommits: false
name: GiteeMirror
on: [push]
jobs:
to_gitee:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: pixta-dev/repository-mirroring-action@v1
with:
target_repo_url: git@gitee.com:ng-alain/ng-alain.git
ssh_private_key: ${{ secrets.GITEE_SSH_PRIVATE_KEY }}
......@@ -31,5 +31,8 @@
// Angular schematics 插件: https://marketplace.visualstudio.com/items?itemName=cyrilletuzi.angular-schematics
"ngschematics.schematics": [
"ng-alain"
],
"i18n-ally.localesPaths": [
"src/app/core/i18n"
]
}
......@@ -758,6 +758,19 @@
"tslib": "^2.0.3"
}
},
"@antv/x6": {
"version": "1.24.4",
"resolved": "https://registry.npmjs.org/@antv/x6/-/x6-1.24.4.tgz",
"integrity": "sha512-cStVuqaNY6wMzJFCkqohtkHLVI5XFfl3JEJ9nBDcgWN+giykb5T6G5EoqrHdg38aMstkmu/+pgZgSQbUtcxmNg==",
"requires": {
"csstype": "^3.0.3",
"jquery": "^3.5.1",
"jquery-mousewheel": "^3.1.13",
"lodash-es": "^4.17.15",
"mousetrap": "^1.6.5",
"utility-types": "^3.10.0"
}
},
"@babel/code-frame": {
"version": "7.12.13",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
......@@ -5031,6 +5044,11 @@
"css-tree": "^1.1.2"
}
},
"csstype": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
"integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
},
"currently-unhandled": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
......@@ -8490,6 +8508,16 @@
}
}
},
"jquery": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
"integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
},
"jquery-mousewheel": {
"version": "3.1.13",
"resolved": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz",
"integrity": "sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU="
},
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
......@@ -9041,6 +9069,11 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"lodash-es": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
},
"lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
......@@ -9732,6 +9765,11 @@
"commander": "*"
}
},
"mousetrap": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz",
"integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA=="
},
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
......@@ -19243,6 +19281,11 @@
"object.getownpropertydescriptors": "^2.1.0"
}
},
"utility-types": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz",
"integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="
},
"utils-merge": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
......
Vue3 @ ddf116da
Subproject commit ddf116da14a9cd09ea3757215fbf421f299f2e75
......@@ -120,8 +120,7 @@ namespace IoTSharp.Controllers
var t = (DateTime.Now.AddDays(1).Ticks - TimeZone.CurrentTimeZone
.ToLocalTime(new System.DateTime(1970, 1, 1, 0, 0, 0, 0)).Ticks) / 10000;
var t = (DateTime.Now.AddDays(1).Ticks - TimeZoneInfo.ConvertTimeFromUtc(new System.DateTime(1970, 1, 1, 0, 0, 0, 0), TimeZoneInfo.Local).Ticks) / 10000;
var token = new TokenEntity
{
access_token = new JwtSecurityTokenHandler().WriteToken(tokeOptions),
......
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
namespace IoTSharp.Controllers
{
/// <summary>
/// this is test purpose
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class MenuController : ControllerBase
{
[AllowAnonymous]
[HttpGet("[action]")]
public JsonResult getMenuList()
{
return new JsonResult(new[]
{
new
{
fullPath="/dashboard",
component="/@/layouts/default/index.vue",
meta=new
{
icon="ion:tv-outline",
title="routes.demo.iframe.frame", single=true
},
name="WelcomeParent",
alias="",
redirect="",
caseSensitive="false",
},
});
}
[AllowAnonymous]
[HttpGet("[action]")]
public JsonResult getPermCode()
{
return new JsonResult(new[]
{
"this","is","test"
});
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册