diff --git a/go.mod b/go.mod index 92fdbc2e..a21a8bf3 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - shylinux.com/x/ice v0.9.6 - shylinux.com/x/icebergs v1.2.3 + shylinux.com/x/ice v0.9.7 + shylinux.com/x/icebergs v1.2.4 shylinux.com/x/toolkits v0.5.9 ) diff --git a/go.sum b/go.sum index 64594995..a5b96c16 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,12 @@ shylinux.com/x/golang-story v0.4.2 h1:ieObrf9z2qyaBRuX6ea7J5771P3VZju4Sw572KdVVr shylinux.com/x/golang-story v0.4.2/go.mod h1:HIJzpPSQpG4A8kaoAO3k2zmVggsdpMTIWreCycaVaDE= shylinux.com/x/ice v0.9.6 h1:IIZI5j/FtElaTW/vIacUYVl9RqNnuPyIZ9W6UE87NNM= shylinux.com/x/ice v0.9.6/go.mod h1:pf/idmC+/Oixkr1uM/9NFGL8saTBJi9lCUVK5yqj5dI= +shylinux.com/x/ice v0.9.7 h1:n3QbvxpyYNFmqZY3Coe+ghC04LmhW9rZZ4fWB8jRhJw= +shylinux.com/x/ice v0.9.7/go.mod h1:uMfve/641WyTGwg5E5cYFHDiTaxu02J4mc8Kvg9PgY4= shylinux.com/x/icebergs v1.2.3 h1:pVNv7PHNAQSFYm12gA315bmB+AG/n6e/ruZQ6wZAiFM= shylinux.com/x/icebergs v1.2.3/go.mod h1:zCAydrOC+MFmbn5SzhgdL0dhzUALiTjeT0psU2QyQ8Y= +shylinux.com/x/icebergs v1.2.4 h1:VBmw05eV2DVxhvGbX2MuIZf4FdWYAV+tvrNO6/T89jw= +shylinux.com/x/icebergs v1.2.4/go.mod h1:zCAydrOC+MFmbn5SzhgdL0dhzUALiTjeT0psU2QyQ8Y= shylinux.com/x/linux-story v0.4.0 h1:6QtSZgCYh6Bjco848rTVGT1TMEYuVbOO5+dzO4HHzus= shylinux.com/x/linux-story v0.4.0/go.mod h1:9fyH7mKC4ORuihKljAejNRsk4BvTEe7HfT/+2f8kk3E= shylinux.com/x/mysql-story v0.4.3 h1:d6o4qpqKjpWgmFqEv6GQNUJ+eu3/nICncKYDpVcdBhg= diff --git a/src/hi/hi.css b/src/hi/hi.css deleted file mode 100644 index e69de29b..00000000 diff --git a/src/hi/hi.js b/src/hi/hi.js index 1826c7f8..e1cd3bbf 100644 --- a/src/hi/hi.js +++ b/src/hi/hi.js @@ -1,50 +1,6 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { - can.onmotion.hidden(can, can._legend) - can.onmotion.hidden(can, can._option) - can.onmotion.hidden(can, can._status) - - can.ConfHeight(can.ConfHeight()+(can.Conf(html.MARGIN_Y)||0)-(can.user.isWindows? 17: 0)) - - can.onengine.listen(can, "menu", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) - can.onengine.listen(can, "高级配置", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) - can.onengine.listen(can, "h1", function(msg) { can.user.toast(can, "h1") }) - can.require(["hi.css"]) - - can.onappend.parse(can, can.onappend._parse(can, ` -head - 基础配置 type menu - 高级配置 type menu - h1 - h2 - h3 - h4 - 导航配置 type menu -left - tabs - 地址 - 山东省 - 邹城市 - 济南市 - 青岛市 - 江苏省 - 徐州市 index cli.runtime - 南京市 index web.code.git.repos action auto - 北京市 - 海淀区 - 朝阳区 - 西城区 - 东城区 - 广东省 - 深圳市 - 宝安区 - 南山区 - 福田区 - 龙华区 - 茂名市 - 组件 - 列表 index cli.runtime - 卡片 index cli.qrcode - 数据 -main -`), target) + can.onmotion.clear(can) + can.onappend.table(can, msg) + can.onappend.board(can, msg) + can.base.isFunc(cb) && cb(msg) }}, [""]) diff --git a/src/hi/hi.sh b/src/hi/hi.sh index 1c670844..6b695fe4 100644 --- a/src/hi/hi.sh +++ b/src/hi/hi.sh @@ -1,4 +1,5 @@ #! /bin/sh + echo "*$#*" echo "*$@*" echo "*$**" diff --git a/src/main.shy b/src/main.shy index fdaa5918..457c7b4a 100644 --- a/src/main.shy +++ b/src/main.shy @@ -7,9 +7,9 @@ refer ` chapter "实践" label ` -code wiki chat team -linux nginx context redis -bash git golang vim +code wiki chat team mall +linux nginx context redis mysql +bash git golang vim tmux ` fg blue bg yellow chapter "理论" diff --git a/src/release/go.mod b/src/release/go.mod index 92fdbc2e..a21a8bf3 100644 --- a/src/release/go.mod +++ b/src/release/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - shylinux.com/x/ice v0.9.6 - shylinux.com/x/icebergs v1.2.3 + shylinux.com/x/ice v0.9.7 + shylinux.com/x/icebergs v1.2.4 shylinux.com/x/toolkits v0.5.9 ) diff --git a/src/release/go.sum b/src/release/go.sum index 64594995..a5b96c16 100644 --- a/src/release/go.sum +++ b/src/release/go.sum @@ -6,8 +6,12 @@ shylinux.com/x/golang-story v0.4.2 h1:ieObrf9z2qyaBRuX6ea7J5771P3VZju4Sw572KdVVr shylinux.com/x/golang-story v0.4.2/go.mod h1:HIJzpPSQpG4A8kaoAO3k2zmVggsdpMTIWreCycaVaDE= shylinux.com/x/ice v0.9.6 h1:IIZI5j/FtElaTW/vIacUYVl9RqNnuPyIZ9W6UE87NNM= shylinux.com/x/ice v0.9.6/go.mod h1:pf/idmC+/Oixkr1uM/9NFGL8saTBJi9lCUVK5yqj5dI= +shylinux.com/x/ice v0.9.7 h1:n3QbvxpyYNFmqZY3Coe+ghC04LmhW9rZZ4fWB8jRhJw= +shylinux.com/x/ice v0.9.7/go.mod h1:uMfve/641WyTGwg5E5cYFHDiTaxu02J4mc8Kvg9PgY4= shylinux.com/x/icebergs v1.2.3 h1:pVNv7PHNAQSFYm12gA315bmB+AG/n6e/ruZQ6wZAiFM= shylinux.com/x/icebergs v1.2.3/go.mod h1:zCAydrOC+MFmbn5SzhgdL0dhzUALiTjeT0psU2QyQ8Y= +shylinux.com/x/icebergs v1.2.4 h1:VBmw05eV2DVxhvGbX2MuIZf4FdWYAV+tvrNO6/T89jw= +shylinux.com/x/icebergs v1.2.4/go.mod h1:zCAydrOC+MFmbn5SzhgdL0dhzUALiTjeT0psU2QyQ8Y= shylinux.com/x/linux-story v0.4.0 h1:6QtSZgCYh6Bjco848rTVGT1TMEYuVbOO5+dzO4HHzus= shylinux.com/x/linux-story v0.4.0/go.mod h1:9fyH7mKC4ORuihKljAejNRsk4BvTEe7HfT/+2f8kk3E= shylinux.com/x/mysql-story v0.4.3 h1:d6o4qpqKjpWgmFqEv6GQNUJ+eu3/nICncKYDpVcdBhg= diff --git a/src/website/h2.zml b/src/website/h2.zml new file mode 100644 index 00000000..fce6c311 --- /dev/null +++ b/src/website/h2.zml @@ -0,0 +1,9 @@ +left + username + 系统 + 命令 index cli.system + 共享 index cli.qrcode + 代码 + 趋势 index web.code.git.trend args icebergs action auto + 状态 index web.code.git.status args icebergs +main \ No newline at end of file diff --git a/src/website/index.iml b/src/website/index.iml index 9633b982..531bdd76 100644 --- a/src/website/index.iml +++ b/src/website/index.iml @@ -29,6 +29,7 @@ project "研发群" web.code.vimer "编辑器" web.code.git.status "代码库" name repos web.team.plan "任务表" + web.team.todo "待办项" web.wiki.word "上下文" web "网页 web" usr/icebergs/misc/chrome/chrome.shy "浏览器" name HTML5