From 46c792fc942f5b4d562736cdf056a62b07f3d61f Mon Sep 17 00:00:00 2001 From: shylinux Date: Mon, 13 Apr 2020 10:52:10 +0800 Subject: [PATCH] opt color --- page/black.css | 5 +++++ pane/Header.js | 19 ++++++++++++------- plugin/input.js | 7 ++++++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/page/black.css b/page/black.css index d2c1c4a3..65d3e847 100644 --- a/page/black.css +++ b/page/black.css @@ -14,6 +14,11 @@ fieldset.item.select { /* background-color:gold; */ border:ridge 2px red; } +fieldset.item legend { + color:cyan; + border:ridge 2px cyan; + margin-bottom:4px; +} fieldset.input { border:solid 2px yellow; diff --git a/pane/Header.js b/pane/Header.js index c49b282c..dc8c194a 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -1,14 +1,19 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, output, action, option, field) {output.innerHTML = ""; - conf.title && can.page.Append(can, output, [{view: "title", - list: [{text: conf.title, className: "title"}], click: function(event) {can.Export(event, conf.title, "title")}}]) + can.run({}, [], function(msg) { + can.core.List(msg.result, function(title) { + can.page.Append(can, output, [{view: "title", list: [{text: title, className: "title"}], + click: function(event) {can.Export(event, conf.title, "title")}, + }]) + }) - can.ui = can.page.Append(can, output, [{view: "state", list: can.core.List(conf.state, function(item) { - return {text: conf[item]||"", className: item, click: function(event) {can.Export(event, conf[item], item)}}; - })}]) + can.ui = can.page.Append(can, output, [{view: "state", list: can.core.List(conf.state, function(item) { + return {text: conf[item]||"", className: item, click: function(event) {can.Export(event, conf[item], item)}}; + })}]) - can.timer = can.Timer({interval: 1000, length: -1}, function(event) { - can.onimport.time(event, can, can.base.Time().split(" ")[1], "time") + can.timer = can.Timer({interval: 1000, length: -1}, function(event) { + can.onimport.time(event, can, can.base.Time().split(" ")[1], "time") + }) }) }, title: function(event, can, value, cmd, field) { diff --git a/plugin/input.js b/plugin/input.js index c197c084..a0a95f46 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -3,7 +3,11 @@ Volcanos("onimport", {help: "导入数据", list: [], var input = {type: "input", name: name, data: item}; switch (item.type = item.type || item._type || item._input) { case "upfile": item.type = "file"; break - case "button": item.value = item.value || item.name; break + case "button": + item.cb = item.cb || item.value; + item.action = item.action || item.value + item.value = item.name || item.value; + break case "select": item.values = typeof item.values == "string"? item.values.split(" "): item.values; input.type = "select", input.list = item.values.map(function(value) { @@ -17,6 +21,7 @@ Volcanos("onimport", {help: "导入数据", list: [], case "password": // no break case "text": + item.cb = item.cb || item.value || ""; item.className || can.page.ClassList.add(can, item, item.position||"args"); item.value = value || item.value || ""; item.autocomplete = "off";