From 527fcc1b3dfc3e019a2ff63813e106aa51bc7891 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sat, 23 Nov 2019 14:57:20 +0800
Subject: [PATCH] 1.0.0-rc.102
Former-commit-id: 6c3ebb543a41d4e89029da9741db134ec034f6e7
---
.../Views/Shared/DisplayTemplates/Cron.cshtml | 1 +
projects/Infrastructure/wwwroot/js/site.js | 35 ++++++++++--------
projects/IoTCenter/appsettings.json | 2 +-
projects/IoTClient/.gitignore | 2 +-
.../StreamingAssets/wwwroot/device.html | 30 +++++++--------
.../Assets/StreamingAssets/wwwroot/js/app.js | Bin 55976 -> 0 bytes
.../Assets/StreamingAssets/wwwroot/js/page.js | 1 +
.../StreamingAssets/wwwroot/lib/chart.js.meta | 8 ++++
.../wwwroot/lib/chart.js/Chart.bundle.min.js | 7 ++++
.../chart.js/Chart.bundle.min.js.meta} | 2 +-
.../StreamingAssets/wwwroot/product.html | 29 ++++++++-------
.../IoTClient/iotclient.apk.REMOVED.git-id | 1 +
projects/IoTNode/appsettings.json | 2 +-
13 files changed, 71 insertions(+), 49 deletions(-)
create mode 100644 projects/Infrastructure/Views/Shared/DisplayTemplates/Cron.cshtml
delete mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js
create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/chart.js.meta
create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/chart.js/Chart.bundle.min.js
rename projects/IoTClient/Assets/StreamingAssets/wwwroot/{js/app.js.meta => lib/chart.js/Chart.bundle.min.js.meta} (74%)
create mode 100644 projects/IoTClient/iotclient.apk.REMOVED.git-id
diff --git a/projects/Infrastructure/Views/Shared/DisplayTemplates/Cron.cshtml b/projects/Infrastructure/Views/Shared/DisplayTemplates/Cron.cshtml
new file mode 100644
index 00000000..6dfa3392
--- /dev/null
+++ b/projects/Infrastructure/Views/Shared/DisplayTemplates/Cron.cshtml
@@ -0,0 +1 @@
+@Html.TextBox(null, null, new { @class = "form-control cron", @style = "display:none;" })
\ No newline at end of file
diff --git a/projects/Infrastructure/wwwroot/js/site.js b/projects/Infrastructure/wwwroot/js/site.js
index c35068d0..6e9b4b52 100644
--- a/projects/Infrastructure/wwwroot/js/site.js
+++ b/projects/Infrastructure/wwwroot/js/site.js
@@ -141,22 +141,25 @@ function InitControls() {
language: "zh-CN"
});
//
- $('input.cron').jqCron({
- lang: 'cn',
- enabled_year: false,
- enabled_minute: true,
- multiple_dom: true,
- multiple_month: true,
- multiple_mins: true,
- multiple_dow: true,
- multiple_time_hours: true,
- multiple_time_minutes: true,
- bind_method: {
- set: function ($element, value) {
- $element.val('0 ' + value);
- }
- },
- no_reset_button: false
+ $('input.cron').each(function () {
+ $(this).jqCron({
+ lang: 'cn',
+ enabled_year: false,
+ enabled_minute: true,
+ multiple_dom: true,
+ multiple_month: true,
+ multiple_mins: true,
+ multiple_dow: true,
+ multiple_time_hours: true,
+ multiple_time_minutes: true,
+ default_value: $(this).val().substr(2),
+ bind_method: {
+ set: function ($element, value) {
+ $element.val('0 ' + value);
+ }
+ },
+ no_reset_button: false
+ });
});
}
function InitEditor() {
diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json
index d6bf9202..78d1fcf9 100644
--- a/projects/IoTCenter/appsettings.json
+++ b/projects/IoTCenter/appsettings.json
@@ -1,5 +1,5 @@
{
- "version": "1.0.0-rc.101",
+ "version": "1.0.0-rc.102",
"Logging": {
"LogLevel": {
"Default": "Warning",
diff --git a/projects/IoTClient/.gitignore b/projects/IoTClient/.gitignore
index a468402a..f466019c 100644
--- a/projects/IoTClient/.gitignore
+++ b/projects/IoTClient/.gitignore
@@ -3,4 +3,4 @@ Temp
Library
Logs
Packages
-Obj
\ No newline at end of file
+[oO]bj
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/device.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/device.html
index bc6256b9..9bf6fb16 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/device.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/device.html
@@ -543,20 +543,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+