From df5d390820c8b0d9989493f0e90c62090674784f Mon Sep 17 00:00:00 2001 From: shaoying Date: Mon, 30 Sep 2019 09:34:06 +0800 Subject: [PATCH] opt love --- src/contexts/cli/version.go | 5 +--- src/plugin/love/index.css | 13 ++++++--- src/plugin/love/index.js | 12 +++++---- src/plugin/love/index.shy | 53 ++++++++++++++----------------------- src/plugin/love/maps.js | 8 ++++-- usr/librarys/example.css | 8 +++--- 6 files changed, 48 insertions(+), 51 deletions(-) diff --git a/src/contexts/cli/version.go b/src/contexts/cli/version.go index 4ba4fbe0..2ff85fb9 100644 --- a/src/contexts/cli/version.go +++ b/src/contexts/cli/version.go @@ -1,11 +1,8 @@ package cli - var version = struct { - init []string time string host string self int }{ - []string{"2017-11-01 01:02:03", "2019-07-13 18:02:21"}, - `2019-09-29 19:53:06`, `centos`, 619, + "2019-09-29 22:27:58", "mac", 612, } diff --git a/src/plugin/love/index.css b/src/plugin/love/index.css index e9914bb6..eb199f94 100644 --- a/src/plugin/love/index.css +++ b/src/plugin/love/index.css @@ -3,17 +3,24 @@ fieldset.item.love.date table td.today { border:solid 2px red; } fieldset.item.love.date table td { + word-break:break-all; text-align:center; min-width:40px; } fieldset.item.love.days div.day { - margin:8px; - border:solid 2px cyan; - padding:8px; opacity:0; + padding:8px; + border:solid 2px cyan; + margin:8px; float:left; } +fieldset.item.love.days div.day span.day { + font-size:18px; + font-weight:bold; + font-style:italic; + margin-right:5px; +} fieldset.item.love.days span.what { font-size:24px; } diff --git a/src/plugin/love/index.js b/src/plugin/love/index.js index 4e8fcd44..ecaadea6 100644 --- a/src/plugin/love/index.js +++ b/src/plugin/love/index.js @@ -7,7 +7,7 @@ return { kit.classList.add(item.parentNode, "select") item.parentNode.title = value[option.where.value] }) - }, 500) + }, 200) }) }, show_after: function(msg) { @@ -17,7 +17,7 @@ return { }, Order: function(t, cb, cbs) {var plugin = field.Plugin var msg = plugin.msg, now = new Date() - kit.List(ctx.Table(msg).concat([{when: "9999-01-08", what: "最后一次爱你"}]), function(line, index, array) { + kit.List(ctx.Table(msg).concat([{when: "9999-01-08", what: "最后一次爱你", where: "北京市"}]), function(line, index, array) { var day = new Date(line.when) var mis = parseInt((day.getTime() - now.getTime()) / 1000 / 3600 / 24) if (index == array.length-1) { @@ -25,17 +25,19 @@ return { } var list = kit.Span() - list.span(["距", "day"], line.when.split(" ")[0]).span([line.what, "what"]) + list.span(["距", "day"], line.when.split(" ")[0]) + list.span(["在", "day"], line.where) + list.span([line.what, "what"]) list.span(mis>0? "还有": "过去", [mis, mis>0? "day1": "day0"], "天") kit.Opacity(cb(output, [{text: [list.join(""), "div", "day"]}]).last) }, t, cbs) }, Flash: function(event) {var plugin = field.Plugin - plugin.Order(3000, function(output, list) { + plugin.Order(1000, function(output, list) { return kit.AppendChilds(output, list) }, function() { - output.innerHTML = "", plugin.Order(1000, function(output, list) { + output.innerHTML = "", plugin.Order(400, function(output, list) { return kit.AppendChild(output, list) }) }) diff --git a/src/plugin/love/index.shy b/src/plugin/love/index.shy index f30d9f7f..fa22dec7 100644 --- a/src/plugin/love/index.shy +++ b/src/plugin/love/index.shy @@ -1,47 +1,20 @@ -fun meet "第一眼" protected \ - text "love" name table imports plugin_table \ - text "" name when init date \ - text "" name where \ - button "操作" - - if $2 == "" || $3 == "" - copy skip ssh.data show _ - else - copy ssh.data insert _ when _ where - end -end - -kit date "日历" "index.js" "index.css" protected "cli.date" _ nature _ \ +kit date "每一天" "index.js" "index.css" protected "cli.date" _ nature _ \ \ space true format '%s' "s20060102" \ text "2019-07-08" name "起始时间" \ text "" name "截止时间" init date \ - text "love" name "table" imports plugin_table \ - text "when" name "when" \ - text "where" name "where" \ + text "love" name "table" imports plugin_table view tiny \ + text "when" name "when" view tiny \ + text "where" name "where" view tiny \ button "查看" action auto \ button "显示" cb show -fun days "每一天" "index.js" "index.css" protected \ - text "days" name table imports plugin_table \ - text "" name when init date \ - text "" name what view long \ - button "记录" \ - button "展示" cb Flash - - if $2 == "" || $3 == "" - copy skip ssh.data show _ - else - copy ssh.data insert _ when _ what __ - end -end - fun maps "每一面" "maps.js" "index.css" protected \ - text "maps" name table imports plugin_table \ + text "love" name table imports plugin_table \ text "" name when init date \ text "" name what view long \ text "北京市" name city view tiny \ - text "弘源首著" name where view long \ + text "弘源首著" name where \ button "本地" cb Current \ button "搜索" cb Search action auto \ button "记录" cb Record \ @@ -54,6 +27,20 @@ fun maps "每一面" "maps.js" "index.css" protected \ end end +fun days "每一次" "index.js" "index.css" protected \ + text "love" name table imports plugin_table \ + text "" name when init date \ + text "" name what view long \ + button "记录" \ + button "展示" cb Flash + + if $2 == "" || $3 == "" + copy skip ssh.data show _ + else + copy ssh.data insert _ when _ what __ + end +end + fun delay "以后告诉你" protected \ text "delay" name table imports plugin_table \ text "" name when init date\ diff --git a/src/plugin/love/maps.js b/src/plugin/love/maps.js index 78af75eb..fe074dc1 100644 --- a/src/plugin/love/maps.js +++ b/src/plugin/love/maps.js @@ -40,7 +40,7 @@ return { }, Flashs: function() {var plugin = field.Plugin plugin.initMap(), run(event, [option.table.value], function(msg) { - kit.List(ctx.Table(msg), function(line) { + kit.List(ctx.Table(msg), function(line, index) { var p = new BMap.Point(line.longitude, line.latitude) map.centerAndZoom(p, line.scale) @@ -49,8 +49,12 @@ return { output.style.opacity = 0 kit.Opacity(output) - }, 3000) + }, 1000) }) }, + Demo: function() { + var info = new BMap.InfoWindow("hello"+"
"+"world", {width: 200, height: 100, title: "haha"}) + map.openInfoWindow(info, map.getCenter()) + }, }}} diff --git a/usr/librarys/example.css b/usr/librarys/example.css index 4e2ddaf1..f5d7751f 100644 --- a/usr/librarys/example.css +++ b/usr/librarys/example.css @@ -96,11 +96,11 @@ fieldset>div.output div.code span.green { color:green; } fieldset>div.output table td { - word-break:break-all; + word-break:break-word; } fieldset>div.output table td.when { + word-break:break-word; text-align:center; - min-width:140px; } fieldset>div.output table.edit { } @@ -294,8 +294,8 @@ fieldset table th.order { fieldset table td { max-width:1200px; font-family:monospace; - padding-left: 10px; - padding-right: 20px; + padding-left: 6px; + padding-right: 6px; } fieldset table td.clip { background-color:red;