From cde4973848af0a706bbcc3a960c22aa7fee90ed2 Mon Sep 17 00:00:00 2001 From: shaoying Date: Sun, 26 Jul 2020 01:43:51 +0800 Subject: [PATCH] opt mp --- client/mp/.app.js.swo | Bin 16384 -> 0 bytes client/mp/app.js | 42 ++++++++++++++--------------- client/mp/pages/action/action.js | 41 ++++++++++++++++++++++++++-- client/mp/pages/action/action.wxml | 2 +- client/mp/pages/river/river.js | 2 +- client/mp/pages/storm/storm.js | 6 ++--- client/mp/project.config.json | 7 +++++ pane/Search.js | 5 +++- 8 files changed, 75 insertions(+), 30 deletions(-) delete mode 100644 client/mp/.app.js.swo diff --git a/client/mp/.app.js.swo b/client/mp/.app.js.swo deleted file mode 100644 index d51d9d2cb7680a503a660e33fd1081cdc07a2aef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeHOTZkM*6fHHHM2+tcL6A<1+H01X(J08oR}htm8p*DThGp&Tsh#QUOn0ZddLPWL zihda1`k@jZQIV(!8brYl@xu=V};j^Ohms8;NtRrT6olQ*hOTeQNdisg2yL2IFHJK=nF)@@s+)0d$;EQ0pQo?a&OGC`<*O(O#eiZ!F`yVw3@8Q^1BwB~ zfMVc(!+`LPW%r^r$Hpz%7T=F4+>eX@z9_zr70Tm3)lD&=7*Gr-1{4E|0mXn~Krx^g zPz)#r6a$KZ{~!ZqgRyn+YbR~^@%}&A|9^cdV_yLWfX9Gyf!9u9Y!Mg()&WOQ@dx00 z;8Wmk;Fpsb`v|xfSPz^896X7!cYr0}GTqTnOW<>05f}x|2Yz48*i*nZ-~`~e6Bzp$_ypJs+zFfwtObr7&)84E zeqamm%__$B0FMCkKnIuxIB*09ATI!0fmOhtI50T?>;@hL#(@fOGVl$!d>0^2J>oTc zY0F&nWkVQn-*%>5V>)y!VY`k&PqyI6h}LDp6j)}!HQjb*ZNc^WK+#~%7FJ6$X3ciU zD~{RWgA_*!@!^JFrZ2BYEO@1QW=&s{mb5Fi8^^ZZQt?bb;D*nG3J|u%NX}8=FJxLd zH(v?x^~betgB#r-v@9M3R22^61CqdP^Ge%o8afH-qZ*Y+ZS;3g*HQ+pDbyfOKrs9e zEjy5MOQWgroW31l$AdlxU#N_XYVg7_XYHmb__%9yL%&^@MWb5mQeCsAmLkhkGiw>b zqnhbAgHg!DPLNu7p;tY#$%CrCVa67f&5$ut=}4Jy%|K+DA#Bm+P(2gVV>?wE zYEkIOkw@cfw8u*)Xo6;{2^ObQ3G^NXaAJ#P&49Hg7h_xqd_9#$ZHDV8eyP40idHPR z{ldUAEc*|AUpK4kQzZMI$Dm$3PQOiKX-xIqh>1`cCdq3G>5Q?_(!F zqKDGnSGSM*)Hi!tGy24nmQhboPiAONhZ`yl81wz1ml_B#)7TBvLj+W|$%)FqR4|;0 ze8Xw@AP|J>W0)J=8NN{0^hhrPu3-wZp3|No9#v&@4(@Ssv_F`s+o2niV}sXah|;g6 za#D%2NH7hQ6>tXE8t$CacFo51b{p-I(_w};f0l31F{xRdM$$@ZYhhxL-I^%M_F7Ua zGhg;PaFe7Bw8ov2F-uRR(#)J*oLGkU9*y;Aw$kE@`hL=O8hjpsAn(#bQk)-3^tAs8 zJ(V>pUKq3tJ0BucI_>(j7W`nEGSXhIiAtgl8W>FfFxp6SnV-El8WwR>d)%CA zW8&+d&&nc-Dnv7TrUqD!)_c)Rxm`KPELBhE8NLR3W)ri*59cmIRH5e4`en% zOGGY}pn_!SNhf(ZU1wG>(m-2kB9CdoV$_7#V5ZaZEiUdVmRX>p1+n6} zlvxmuGOG+c)8f)xloWKaU{gU|>tczXML_E9?rpli5! zdH&zyDXJ3v+u+kCwpfGTR!sTaoMG82+1~~4vqkiKnc@|SkQgQF@;Khm4?n)^@QV)| z-u2|6hhK`jkt7CPw4b1C-u64Rxy$aJdZ*BI5{%A~M3tY`4N_0~ 0 && msg.result.join("") || ""}, - Table: function(cb) {var row = 0 + nRow: function() { return msg.append && msg.append[0] && msg[msg.append[0]].length || 0 }, + Result: function() { return msg.result && msg.result.length > 0 && msg.result.join("") || "" }, + Table: function(cb) { var row = 0 for (var i = 0; i < msg.append.length; i++) { row = msg[msg.append[i]].length > row? msg[msg.append[i]].length: row } - for (var i = 0; i < row; i++) { - var line = {} + for (var i = 0; i < row; i++) { var line = {} for (var k in msg.append) { line[msg.append[k]] = msg[msg.append[k]][i] } @@ -41,16 +37,16 @@ App({ typeof cb == "function" && cb(msg) }}) }, - download: function(cmd, data, cb) {var app = this; data.sessid = app.conf.sessid + download: function(cmd, data, cb) { var app = this; data.sessid = app.conf.sessid wx.downloadFile({url: app.conf.serve+"/"+cmd, data: data, success: cb}) }, - usercode: function(cb) {var app = this - wx.login({success: function(res) {app.request("mp/login/code", {code: res.code}, function(msg) { + usercode: function(cb) { var app = this + wx.login({success: function(res) { app.request("mp/login/code", {code: res.code}, function(msg) { wx.setStorage({key: "sessid", data: msg.Result()}) app.conf.sessid = msg.Result(), typeof cb == "function" && cb() })}}) }, - userinfo: function(cb) {var app = this + userinfo: function(cb) { var app = this if (app.conf.userInfo) { app.request("mp/login/info", app.conf.userInfo, function(msg) { typeof cb == "function" && cb(app.conf.userInfo) @@ -58,21 +54,23 @@ App({ return } app.usercode(function() { - wx.getSetting({success: function(res) {res.authSetting['scope.userInfo'] && wx.getUserInfo({success: function(res) { - app.request("mp/login/info", res.userInfo, function(msg) {app.conf.userInfo = res.userInfo + wx.getSetting({ success: function(res) { res.authSetting['scope.userInfo'] && wx.getUserInfo({success: function(res) { + app.request("mp/login/info", res.userInfo, function(msg) { app.conf.userInfo = res.userInfo typeof cb == "function" && cb(res.userInfo) }) }})}}) }) }, + location: function(arg) { wx.chooseLocation(arg) }, - modal: function(title, content, cb) {wx.showModal({title: title||"", content: content||"", success: cb})}, - toast: function(title, content) {wx.showToast({title: title, content: content||""})}, - jumps: function(url, args, cb) {var next = "/pages/"+kit.Args(url, args) + title: function(title) { wx.setNavigationBarTitle({title: title, success: function() {}})}, + modal: function(title, content, cb) { wx.showModal({title: title||"", content: content||"", success: cb})}, + toast: function(title, content) { wx.showToast({title: title, content: content||""})}, + jumps: function(url, args, cb) { var next = "/pages/"+kit.Args(url, args) console.log("jump", next), wx.navigateTo({url: next, success: cb}) }, - scans: function(cb) {var app = this - wx.scanCode({success(res) {console.log("scan", res) + scans: function(cb) { var app = this + wx.scanCode({success: function(res) { console.log("scan", res) try { var value = JSON.parse(res.result) switch (value.type) { diff --git a/client/mp/pages/action/action.js b/client/mp/pages/action/action.js index 60a0cfd1..7c32a497 100644 --- a/client/mp/pages/action/action.js +++ b/client/mp/pages/action/action.js @@ -11,6 +11,9 @@ Page({ "扫码": function(event, page, data, name) { // app.jumps("scans/scans") app.scans(function(res) { + res["sess.river"] = page.data.river + res["sess.storm"] = page.data.storm + app.request("mp/login/scan", res) page.onaction(event, res, res.name) }) }, @@ -51,9 +54,36 @@ Page({ "共享": function(event, page, data, name) { }, }, + plugin: { + paste: function(page, data) { + wx.getClipboardData({success: function(res) { + var cmds = [page.data.river, page.data.storm, data.order] + cmds = cmds.concat(["insert", "paste", "", res.data]) + app.request("action", {cmds: cmds}, function(msg) { + + }) + }}) + }, + qrcode: function(page) { + app.scans(function(res) { + res["sess.river"] = page.data.river + res["sess.storm"] = page.data.storm + app.request("mp/login/scan", res) + }) + }, + location: function(page, data) { + app.location({success: function(res) { + var cmds = [page.data.river, page.data.storm, data.order] + cmds = cmds.concat(["insert", "location", res.name, res.address, res.longitude*100000, res.latitude*100000]) + app.request("action", {cmds: cmds}, function(msg) { + + }) + }}) + }, + }, onaction: function(event, data, name) { - data = data || event.target.dataset, name = name || data.name console.log("action", "river", name) + data = data || event.target.dataset, name = name || data.name this.action[name](event, this, data) }, onfigure: { @@ -205,7 +235,13 @@ Page({ return figure.click(event, page, data, data.input.name, field) } - switch (data.input.cb) { + switch (data.input.name) { + case "添加": + var p = page.plugin[data.field.index] + if (typeof p == "function") { return p(page, data) } + } + + switch (data.input.value) { case "Last": // 恢复命令 page.data.his[data.order].pop() @@ -241,6 +277,7 @@ Page({ this.data.river = options.river this.data.storm = options.storm + app.title(options.title) var data = app.data[options.river+options.storm] if (data) {return this.setData({res: this.data.res = data})} this.onaction({}, {}, "刷新") diff --git a/client/mp/pages/action/action.wxml b/client/mp/pages/action/action.wxml index 0dfc7bc5..a60c0cf2 100644 --- a/client/mp/pages/action/action.wxml +++ b/client/mp/pages/action/action.wxml @@ -22,7 +22,7 @@ - + diff --git a/client/mp/pages/river/river.js b/client/mp/pages/river/river.js index d256bd96..8e7c408f 100644 --- a/client/mp/pages/river/river.js +++ b/client/mp/pages/river/river.js @@ -36,7 +36,7 @@ Page({ ondetail: function(event, data, index) { data = data || event.target.dataset, index = index||data.index||0 console.log("detail", "river", index) - app.jumps("storm/storm", {river: this.data.msg.key[index]}) + app.jumps("storm/storm", {river: this.data.msg.key[index], title: this.data.msg.name[index]}) }, onLoad: function (options) { diff --git a/client/mp/pages/storm/storm.js b/client/mp/pages/storm/storm.js index 7bdcd508..961974e2 100644 --- a/client/mp/pages/storm/storm.js +++ b/client/mp/pages/storm/storm.js @@ -34,18 +34,18 @@ Page({ ondetail: function(event, data, index) { data = data || event.target.dataset, index = index||data.index||0 console.log("detail", "storm", index) - app.jumps("action/action", {river: data.river||this.data.river, storm: this.data.msg.key[index]}) + app.jumps("action/action", {river: data.river||this.data.river, storm: this.data.msg.key[index], title: this.data.options.title+"."+this.data.msg.name[index]}) }, - onLoad: function (options) { + onLoad: function (options) { this.data.options = options console.log("page", "storm", options) app.conf.sessid = options.sessid || app.conf.sessid + app.title(options.title) this.data.river = options.river this.onaction({}, options, "刷新") }, onReady: function () {}, - onShow: function (args) {}, onHide: function () {}, onUnload: function () {}, onPullDownRefresh: function () { diff --git a/client/mp/project.config.json b/client/mp/project.config.json index 80198770..3e3c8a4e 100644 --- a/client/mp/project.config.json +++ b/client/mp/project.config.json @@ -75,6 +75,13 @@ "pathName": "pages/scans/scans", "query": "river=c796cd&storm=9092d5", "scene": null + }, + { + "id": -1, + "name": "pages/action/action", + "pathName": "pages/action/action", + "query": "river=d82c1d&storm=f7a8c9&title=mac.hi", + "scene": null } ] } diff --git a/pane/Search.js b/pane/Search.js index 34614431..f95a91e0 100644 --- a/pane/Search.js +++ b/pane/Search.js @@ -8,7 +8,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta, can.page.Modify(can, can._target, {style: {display: "block"}}) can.page.Select(can, can._action, "input[name=word]", function(item) { item.value = cmd[1] }) - can.run({}, cmd, function(msg) { + var msg = can.request({}) + can.run(msg._event, ["search", "River.onexport.key"]) + + can.run(msg._event, cmd, function(msg) { can.onappend.table(can, can.ui.content, "table", msg, function(value, key, index, line) { return {text: [value, "td"], onclick: function(event) { can.Status("index", index)