diff --git a/const.js b/const.js index 5a8faa36..f6548869 100644 --- a/const.js +++ b/const.js @@ -41,6 +41,7 @@ var ice = { MSG_USERNICK: "user.nick", MSG_USERNAME: "user.name", MSG_USERROLE: "user.role", MSG_LANGUAGE: "user.lang", MSG_MODE: "sess.mode", MSG_THEME: "sess.theme", MSG_TITLE: "sess.title", MSG_RIVER: "sess.river", MSG_STORM: "sess.storm", MSG_DAEMON: "sess.daemon", LOG_DISABLE: "log.disable", LOG_TRACEID: "log.id", + MSG_DEBUG: "debug", ErrWarn: "warn: ", ErrNotLogin: "not login: ", ErrNotRight: "not right: ", ErrNotValid: "not valid: ", ErrNotFound: "not found: ", NFS: "nfs", USR: "usr", CAN_PLUGIN: "can._plugin", @@ -133,6 +134,7 @@ var tcp = { CLIENT: "client", SERVER: "server", PROTO: "proto", HOST: "host", PORT: "port", SERVICE: "service", HOSTNAME: "hostname", + WIFI: "wifi", SSID: "ssid", } var nfs = { DIR: "dir", CAT: "cat", DEFS: "defs", PACK: "pack", TRASH: "trash", DIR_ROOT: "dir_root", diff --git a/frame.js b/frame.js index d98584ca..c63264e4 100644 --- a/frame.js +++ b/frame.js @@ -377,7 +377,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }) }, title: can.user.trans(can, can.Option(key) == undefined? key: "click to detail", null, html.INPUT), _init: function(target) { key == ctx.ACTION && can.onappend.mores(can, target, data, can.user.isMobile && !can.user.isLandscape()? 2: can.isCmdMode()? 5: 3) - can.Option(key) != undefined && can.page.style(can, target, "cursor", "pointer") + can.page.style(can, target, "cursor", key == mdb.KEY? "default": can.Option(key) != undefined? "pointer": "text") }} }); table && can.onappend.style(can, chat.CONTENT, table), table && msg.IsDetail() && can.onappend.style(can, mdb.DETAIL, table) msg.append && msg.append[msg.append.length-1] == ctx.ACTION && can.onappend.style(can, ctx.ACTION, table) diff --git a/index.css b/index.css index f050d066..2d0105ff 100644 --- a/index.css +++ b/index.css @@ -321,6 +321,7 @@ body.mobile div.project:not(.toggle) { border-right:var(--box-border); width:120 div.profile:not(.toggle) { border-left:var(--box-border); width:50%; } div.display:not(.toggle) { border-top:var(--box-border); } div.output div.code input[type=button][name=login] { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } +table.content td { cursor:pointer; } /* table card */ div.output.card>div.item.stop { color:var(--disable-fg-color); } div.output.card>div.item { background:var(--plugin-bg-color); padding:10px; border:var(--box-border); border-radius:var(--plugin-radius); margin:10px; width:320px; float:left; box-shadow:var(--box-shadow); } diff --git a/publish/client/mp/Makefile b/publish/client/mp/Makefile new file mode 100644 index 00000000..61d3dfe7 --- /dev/null +++ b/publish/client/mp/Makefile @@ -0,0 +1,2 @@ +all: + ${CTX_ROOT}/bin/ice.bin web.admin web.chat.wx.ide make diff --git a/publish/client/mp/app.js b/publish/client/mp/app.js index 4199ee9a..cbf3b418 100644 --- a/publish/client/mp/app.js +++ b/publish/client/mp/app.js @@ -5,8 +5,15 @@ const page = require("utils/lib/page.js") const user = require("utils/lib/user.js") App({ - data: {}, conf: {serve: "https://2021.shylinux.com", appid: "wxf4e5104d83476ed6", - module: "shylinux.com/x/volcanos", version: "v0.2.1"}, - base: base, core: core, misc: misc, page: page, user: user, - onLaunch: function() { console.log("app load", this.conf) }, + data: {}, conf: { + serve: "https://2021.shylinux.com", appid: "wxf4e5104d83476ed6", + module: "shylinux.com/x/volcanos", version: "v0.2.1", + }, base: base, core: core, misc: misc, page: page, user: user, + onLaunch: function() { + const res = wx.getSystemInfoSync() + this.conf.platform = res.platform + this.conf.brand = res.brand + this.conf.model = res.model + console.log("app load", this.conf) + }, }) diff --git a/publish/client/mp/app.wxml b/publish/client/mp/app.wxml index ab6ed609..2c9584ad 100644 --- a/publish/client/mp/app.wxml +++ b/publish/client/mp/app.wxml @@ -12,7 +12,6 @@ -