diff --git a/frame.js b/frame.js index b823f0dd..c3da0ad2 100644 --- a/frame.js +++ b/frame.js @@ -369,8 +369,9 @@ Volcanos(chat.ONMOTION, {_init: function(can, target) { }, }, - hidden: function(can, target, show) { target = target||can._target, can.page.styleDisplay(can, target, show? "": html.NONE) - return show? target._show && target._show(): target._hide && target._hide(), show + hidden: function(can, target, show) { target = target||can._target + if (target.length > 0) { return can.core.List(target, function(target) { can.onmotion.hidden(can, target, show) }) } + return can.page.styleDisplay(can, target, show? "": html.NONE), show? target._show && target._show(): target._hide && target._hide(), show }, toggle: function(can, target, show, hide) { target = target||can._target if (show === true) { return can.onmotion.hidden(can, target, true) } if (show === false) { return can.onmotion.hidden(can, target, false) } diff --git a/lib/lunar.js b/lib/lunar.js new file mode 100644 index 00000000..82bac7e9 --- /dev/null +++ b/lib/lunar.js @@ -0,0 +1,645 @@ + +/** +* @1900-2100区间内的公历、农历互转 +* @charset UTF-8 +* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0] +* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0] +*/ +var calendar = { + + /** + * 农历1900-2100的润大小信息表 + * @Array Of Property + * @return Hex + */ + lunarInfo:[0x04bd8,0x04ae0,0x0a570,0x054d5,0x0d260,0x0d950,0x16554,0x056a0,0x09ad0,0x055d2,//1900-1909 + 0x04ae0,0x0a5b6,0x0a4d0,0x0d250,0x1d255,0x0b540,0x0d6a0,0x0ada2,0x095b0,0x14977,//1910-1919 + 0x04970,0x0a4b0,0x0b4b5,0x06a50,0x06d40,0x1ab54,0x02b60,0x09570,0x052f2,0x04970,//1920-1929 + 0x06566,0x0d4a0,0x0ea50,0x16a95,0x05ad0,0x02b60,0x186e3,0x092e0,0x1c8d7,0x0c950,//1930-1939 + 0x0d4a0,0x1d8a6,0x0b550,0x056a0,0x1a5b4,0x025d0,0x092d0,0x0d2b2,0x0a950,0x0b557,//1940-1949 + 0x06ca0,0x0b550,0x15355,0x04da0,0x0a5b0,0x14573,0x052b0,0x0a9a8,0x0e950,0x06aa0,//1950-1959 + 0x0aea6,0x0ab50,0x04b60,0x0aae4,0x0a570,0x05260,0x0f263,0x0d950,0x05b57,0x056a0,//1960-1969 + 0x096d0,0x04dd5,0x04ad0,0x0a4d0,0x0d4d4,0x0d250,0x0d558,0x0b540,0x0b6a0,0x195a6,//1970-1979 + 0x095b0,0x049b0,0x0a974,0x0a4b0,0x0b27a,0x06a50,0x06d40,0x0af46,0x0ab60,0x09570,//1980-1989 + 0x04af5,0x04970,0x064b0,0x074a3,0x0ea50,0x06b58,0x05ac0,0x0ab60,0x096d5,0x092e0,//1990-1999 + 0x0c960,0x0d954,0x0d4a0,0x0da50,0x07552,0x056a0,0x0abb7,0x025d0,0x092d0,0x0cab5,//2000-2009 + 0x0a950,0x0b4a0,0x0baa4,0x0ad50,0x055d9,0x04ba0,0x0a5b0,0x15176,0x052b0,0x0a930,//2010-2019 + 0x07954,0x06aa0,0x0ad50,0x05b52,0x04b60,0x0a6e6,0x0a4e0,0x0d260,0x0ea65,0x0d530,//2020-2029 + 0x05aa0,0x076a3,0x096d0,0x04afb,0x04ad0,0x0a4d0,0x1d0b6,0x0d250,0x0d520,0x0dd45,//2030-2039 + 0x0b5a0,0x056d0,0x055b2,0x049b0,0x0a577,0x0a4b0,0x0aa50,0x1b255,0x06d20,0x0ada0,//2040-2049 + /**Add By JJonline@JJonline.Cn**/ + 0x14b63,0x09370,0x049f8,0x04970,0x064b0,0x168a6,0x0ea50, 0x06b20,0x1a6c4,0x0aae0,//2050-2059 + 0x092e0,0x0d2e3,0x0c960,0x0d557,0x0d4a0,0x0da50,0x05d55,0x056a0,0x0a6d0,0x055d4,//2060-2069 + 0x052d0,0x0a9b8,0x0a950,0x0b4a0,0x0b6a6,0x0ad50,0x055a0,0x0aba4,0x0a5b0,0x052b0,//2070-2079 + 0x0b273,0x06930,0x07337,0x06aa0,0x0ad50,0x14b55,0x04b60,0x0a570,0x054e4,0x0d160,//2080-2089 + 0x0e968,0x0d520,0x0daa0,0x16aa6,0x056d0,0x04ae0,0x0a9d4,0x0a2d0,0x0d150,0x0f252,//2090-2099 + 0x0d520],//2100 + + /** + * 公历每个月份的天数普通表 + * @Array Of Property + * @return Number + */ + solarMonth:[31,28,31,30,31,30,31,31,30,31,30,31], + + /** + * 天干地支之天干速查表 + * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"] + * @return Cn string + */ + Gan:["\u7532","\u4e59","\u4e19","\u4e01","\u620a","\u5df1","\u5e9a","\u8f9b","\u58ec","\u7678"], + + /** + * 天干地支之地支速查表 + * @Array Of Property + * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"] + * @return Cn string + */ + Zhi:["\u5b50","\u4e11","\u5bc5","\u536f","\u8fb0","\u5df3","\u5348","\u672a","\u7533","\u9149","\u620c","\u4ea5"], + + /** + * 天干地支之地支速查表<=>生肖 + * @Array Of Property + * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"] + * @return Cn string + */ + Animals:["\u9f20","\u725b","\u864e","\u5154","\u9f99","\u86c7","\u9a6c","\u7f8a","\u7334","\u9e21","\u72d7","\u732a"], + + /** + * 阳历节日 + */ + festival: { + '1-1': {title: '元旦节'}, + '2-14': {title: '情人节'}, + '5-1': {title: '劳动节'}, + '5-4': {title: '青年节'}, + '6-1': {title: '儿童节'}, + '9-10': {title: '教师节'}, + '10-1': {title: '国庆节'}, + '12-25': {title: '圣诞节'}, + + '3-8': {title: '妇女节'}, + '3-12': {title: '植树节'}, + '4-1': {title: '愚人节'}, + '5-12': {title: '护士节'}, + '7-1': {title: '建党节'}, + '8-1': {title: '建军节'}, + '12-24': {title: '平安夜'}, + }, + + /** + * 农历节日 + */ + lfestival: { + '12-30': {title: '除夕'}, + '1-1': {title: '春节'}, + '1-15': {title: '元宵节'}, + '5-5': {title: '端午节'}, + '8-15': {title: '中秋节'}, + '9-9': {title: '重阳节'}, + }, + + /** + * 返回默认定义的阳历节日 + */ + getFestival(){ + return this.festival + }, + + /** + * 返回默认定义的内容里节日 + */ + getLunarFestival(){ + return this.lfestival + }, + + /** + * + * @param {Object} 按照festival的格式输入数据，设置阳历节日 + */ + setFestival(param={}){ + this.festival = param + }, + + /** + * + * @param {Object} 按照lfestival的格式输入数据，设置农历节日 + */ + setLunarFestival(param={}){ + this.lfestival = param + }, + + /** + * 24节气速查表 + * @Array Of Property + * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"] + * @return Cn string + */ + solarTerm:["\u5c0f\u5bd2","\u5927\u5bd2","\u7acb\u6625","\u96e8\u6c34","\u60ca\u86f0","\u6625\u5206","\u6e05\u660e","\u8c37\u96e8","\u7acb\u590f","\u5c0f\u6ee1","\u8292\u79cd","\u590f\u81f3","\u5c0f\u6691","\u5927\u6691","\u7acb\u79cb","\u5904\u6691","\u767d\u9732","\u79cb\u5206","\u5bd2\u9732","\u971c\u964d","\u7acb\u51ac","\u5c0f\u96ea","\u5927\u96ea","\u51ac\u81f3"], + + /** + * 1900-2100各年的24节气日期速查表 + * @Array Of Property + * @return 0x string For splice + */ + sTermInfo:['9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f', + '97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f', + 'b027097bd097c36b0b6fc9274c91aa','9778397bd19801ec9210c965cc920e','97b6b97bd19801ec95f8c965cc920f', + '97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2','9778397bd197c36c9210c9274c91aa', + '97b6b97bd19801ec95f8c965cc920e','97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2', + '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec95f8c965cc920e','97bcf97c3598082c95f8e1cfcc920f', + '97bd097bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722', + '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f', + '97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf97c359801ec95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd097bd07f595b0b6fc920fb0722', + '9778397bd097c36b0b6fc9210c8dc2','9778397bd19801ec9210c9274c920e','97b6b97bd19801ec95f8c965cc920f', + '97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e', + '97b6b97bd19801ec95f8c965cc920f','97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2', + '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e','97bd07f1487f595b0b0bc920fb0722', + '7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722', + '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf7f1487f531b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf7f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722', + '9778397bd097c36b0b6fc9210c91aa','97b6b97bd197c36c9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e', + '97b6b7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2', + '9778397bd097c36b0b70c9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722', + '9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b7f0e47f531b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722', + '9778397bd097c36b0b6fc9210c91aa','97b6b7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','977837f0e37f149b0723b0787b0721', + '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c35b0b6fc9210c8dc2', + '977837f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc9210c8dc2','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','977837f0e37f14998082b0787b06bd', + '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722', + '977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd', + '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722', + '977837f0e37f14998082b0723b06bd','7f07e7f0e37f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b0721', + '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f595b0b0bb0b6fb0722','7f0e37f0e37f14898082b0723b02d5', + '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f531b0b0bb0b6fb0722', + '7f0e37f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e37f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd', + '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35', + '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722', + '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f149b0723b0787b0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0723b06bd', + '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722','7f0e37f0e366aa89801eb072297c35', + '7ec967f0e37f14998082b0723b06bd','7f07e7f0e37f14998083b0787b0721','7f0e27f0e47f531b0723b0b6fb0722', + '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14898082b0723b02d5','7f07e7f0e37f14998082b0787b0721', + '7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66aa89801e9808297c35','665f67f0e37f14898082b0723b02d5', + '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66a449801e9808297c35', + '665f67f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e36665b66a449801e9808297c35','665f67f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd', + '7f07e7f0e47f531b0723b0b6fb0721','7f0e26665b66a449801e9808297c35','665f67f0e37f1489801eb072297c35', + '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722'], + + /** + * 数字转中文速查表 + * @Array Of Property + * @trans ['日','一','二','三','四','五','六','七','八','九','十'] + * @return Cn string + */ + nStr1:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341"], + + /** + * 日期转农历称呼速查表 + * @Array Of Property + * @trans ['初','十','廿','卅'] + * @return Cn string + */ + nStr2:["\u521d","\u5341","\u5eff","\u5345"], + + /** + * 月份转农历称呼速查表 + * @Array Of Property + * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊'] + * @return Cn string + */ + nStr3:["\u6b63","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u51ac","\u814a"], + + /** + * 返回农历y年一整年的总天数 + * @param lunar Year + * @return Number + * @eg:var count = calendar.lYearDays(1987) ;//count=387 + */ + lYearDays:function(y) { + var i, sum = 348; + for(i=0x8000; i>0x8; i>>=1) { sum += (this.lunarInfo[y-1900] & i)? 1: 0; } + return(sum+this.leapDays(y)); + }, + + /** + * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0 + * @param lunar Year + * @return Number (0-12) + * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6 + */ + leapMonth:function(y) { //闰字编码 \u95f0 + return(this.lunarInfo[y-1900] & 0xf); + }, + + /** + * 返回农历y年闰月的天数 若该年没有闰月则返回0 + * @param lunar Year + * @return Number (0、29、30) + * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29 + */ + leapDays:function(y) { + if(this.leapMonth(y)) { + return((this.lunarInfo[y-1900] & 0x10000)? 30: 29); + } + return(0); + }, + + /** + * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法 + * @param lunar Year + * @return Number (-1、29、30) + * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29 + */ + monthDays:function(y,m) { + if(m>12 || m<1) {return -1}//月份参数从1至12，参数错误返回-1 + return( (this.lunarInfo[y-1900] & (0x10000>>m))? 30: 29 ); + }, + + /** + * 返回公历(!)y年m月的天数 + * @param solar Year + * @return Number (-1、28、29、30、31) + * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30 + */ + solarDays:function(y,m) { + if(m>12 || m<1) {return -1} //若参数错误 返回-1 + var ms = m-1; + if(ms==1) { //2月份的闰平规律测算后确认返回28或29 + return(((y%4 == 0) && (y%100 != 0) || (y%400 == 0))? 29: 28); + }else { + return(this.solarMonth[ms]); + } + }, + + /** + * 农历年份转换为干支纪年 + * @param lYear 农历年的年份数 + * @return Cn string + */ + toGanZhiYear:function(lYear) { + var ganKey = (lYear - 3) % 10; + var zhiKey = (lYear - 3) % 12; + if(ganKey == 0) ganKey = 10;//如果余数为0则为最后一个天干 + if(zhiKey == 0) zhiKey = 12;//如果余数为0则为最后一个地支 + return this.Gan[ganKey-1] + this.Zhi[zhiKey-1]; + + }, + + /** + * 公历月、日判断所属星座 + * @param cMonth [description] + * @param cDay [description] + * @return Cn string + */ + toAstro:function(cMonth,cDay) { + var s = "\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf"; + var arr = [20,19,21,21,21,22,23,23,23,23,22,22]; + return s.substr(cMonth*2 - (cDay < arr[cMonth-1] ? 2 : 0),2) + "\u5ea7";//座 + }, + + /** + * 传入offset偏移量返回干支 + * @param offset 相对甲子的偏移量 + * @return Cn string + */ + toGanZhi:function(offset) { + return this.Gan[offset%10] + this.Zhi[offset%12]; + }, + + /** + * 传入公历(!)y年获得该年第n个节气的公历日期 + * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起 + * @return day Number + * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春 + */ + getTerm:function(y,n) { + if(y<1900 || y>2100) {return -1;} + if(n<1 || n>24) {return -1;} + var _table = this.sTermInfo[y-1900]; + var _info = [ + parseInt('0x'+_table.substr(0,5)).toString() , + parseInt('0x'+_table.substr(5,5)).toString(), + parseInt('0x'+_table.substr(10,5)).toString(), + parseInt('0x'+_table.substr(15,5)).toString(), + parseInt('0x'+_table.substr(20,5)).toString(), + parseInt('0x'+_table.substr(25,5)).toString() + ]; + var _calday = [ + _info[0].substr(0,1), + _info[0].substr(1,2), + _info[0].substr(3,1), + _info[0].substr(4,2), + + _info[1].substr(0,1), + _info[1].substr(1,2), + _info[1].substr(3,1), + _info[1].substr(4,2), + + _info[2].substr(0,1), + _info[2].substr(1,2), + _info[2].substr(3,1), + _info[2].substr(4,2), + + _info[3].substr(0,1), + _info[3].substr(1,2), + _info[3].substr(3,1), + _info[3].substr(4,2), + + _info[4].substr(0,1), + _info[4].substr(1,2), + _info[4].substr(3,1), + _info[4].substr(4,2), + + _info[5].substr(0,1), + _info[5].substr(1,2), + _info[5].substr(3,1), + _info[5].substr(4,2), + ]; + return parseInt(_calday[n-1]); + }, + + /** + * 传入农历数字月份返回汉语通俗表示法 + * @param lunar month + * @return Cn string + * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月' + */ + toChinaMonth:function(m) { // 月 => \u6708 + if(m>12 || m<1) {return -1} //若参数错误 返回-1 + var s = this.nStr3[m-1]; + s+= "\u6708";//加上月字 + return s; + }, + + /** + * 传入农历日期数字返回汉字表示法 + * @param lunar day + * @return Cn string + * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一' + */ + toChinaDay:function(d){ //日 => \u65e5 + var s; + switch (d) { + case 10: + s = '\u521d\u5341'; break; + case 20: + s = '\u4e8c\u5341'; break; + break; + case 30: + s = '\u4e09\u5341'; break; + break; + default : + s = this.nStr2[Math.floor(d/10)]; + s += this.nStr1[d%10]; + } + return(s); + }, + + /** + * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春” + * @param y year + * @return Cn string + * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔' + */ + getAnimal: function(y) { + return this.Animals[(y - 4) % 12] + }, + + /** + * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON + * @param y solar year + * @param m solar month + * @param d solar day + * @return JSON object + * @eg:console.log(calendar.solar2lunar(1987,11,01)); + */ + solar2lunar:function (y,m,d) { //参数区间1900.1.31~2100.12.31 + y = parseInt(y) + m = parseInt(m) + d = parseInt(d) + //年份限定、上限 + if(y<1900 || y>2100) { + return -1;// undefined转换为数字变为NaN + } + //公历传参最下限 + if(y==1900&&m==1&&d<31) { + return -1; + } + //未传参 获得当天 + if(!y) { + var objDate = new Date(); + }else { + var objDate = new Date(y,parseInt(m)-1,d) + } + var i, leap=0, temp=0; + //修正ymd参数 + var y = objDate.getFullYear(), + m = objDate.getMonth()+1, + d = objDate.getDate(); + var offset = (Date.UTC(objDate.getFullYear(),objDate.getMonth(),objDate.getDate()) - Date.UTC(1900,0,31))/86400000; + for(i=1900; i<2101 && offset>0; i++) { + temp = this.lYearDays(i); + offset -= temp; + } + if(offset<0) { + offset+=temp; i--; + } + + //是否今天 + var isTodayObj = new Date(), + isToday = false; + if(isTodayObj.getFullYear()==y && isTodayObj.getMonth()+1==m && isTodayObj.getDate()==d) { + isToday = true; + } + //星期几 + var nWeek = objDate.getDay(), + cWeek = this.nStr1[nWeek]; + //数字表示周几顺应天朝周一开始的惯例 + if(nWeek==0) { + nWeek = 7; + } + //农历年 + var year = i; + var leap = this.leapMonth(i); //闰哪个月 + var isLeap = false; + + //效验闰月 + for(i=1; i<13 && offset>0; i++) { + //闰月 + if(leap>0 && i==(leap+1) && isLeap==false){ + --i; + isLeap = true; temp = this.leapDays(year); //计算农历闰月天数 + } + else{ + temp = this.monthDays(year, i);//计算农历普通月天数 + } + //解除闰月 + if(isLeap==true && i==(leap+1)) { isLeap = false; } + offset -= temp; + } + // 闰月导致数组下标重叠取反 + if(offset==0 && leap>0 && i==leap+1) + { + if(isLeap){ + isLeap = false; + }else{ + isLeap = true; --i; + } + } + if(offset<0) + { + offset += temp; --i; + } + //农历月 + var month = i; + //农历日 + var day = offset + 1; + //天干地支处理 + var sm = m-1; + var gzY = this.toGanZhiYear(year); + + // 当月的两个节气 + // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year` + var firstNode = this.getTerm(y,(m*2-1));//返回当月「节」为几日开始 + var secondNode = this.getTerm(y,(m*2));//返回当月「节」为几日开始 + + // 依据12节气修正干支月 + var gzM = this.toGanZhi((y-1900)*12+m+11); + if(d>=firstNode) { + gzM = this.toGanZhi((y-1900)*12+m+12); + } + + //传入的日期的节气与否 + var isTerm = false; + var Term = null; + if(firstNode==d) { + isTerm = true; + Term = this.solarTerm[m*2-2]; + } + if(secondNode==d) { + isTerm = true; + Term = this.solarTerm[m*2-1]; + } + //日柱 当月一日与 1900/1/1 相差天数 + var dayCyclical = Date.UTC(y,sm,1,0,0,0,0)/86400000+25567+10; + var gzD = this.toGanZhi(dayCyclical+d-1); + //该日期所属的星座 + var astro = this.toAstro(m,d); + + var solarDate = y+'-'+m+'-'+d + var lunarDate = year+'-'+month+'-'+day + + var festival = this.festival + var lfestival = this.lfestival + + var festivalDate = m+'-'+d + var lunarFestivalDate = month+'-'+day + + return { + date: solarDate, + lunarDate: lunarDate, + festival: festival[festivalDate] ? festival[festivalDate].title : null, + lunarFestival: lfestival[lunarFestivalDate] ? lfestival[lunarFestivalDate].title : null, + 'lYear':year, + 'lMonth':month, + 'lDay':day, + 'Animal':this.getAnimal(year), + 'IMonthCn':(isLeap?"\u95f0":'')+this.toChinaMonth(month), + 'IDayCn':this.toChinaDay(day), + 'cYear':y, + 'cMonth':m, + 'cDay':d, + 'gzYear':gzY, + 'gzMonth':gzM, + 'gzDay':gzD, + 'isToday':isToday, + 'isLeap':isLeap, + 'nWeek':nWeek, + 'ncWeek':"\u661f\u671f"+cWeek, + 'isTerm':isTerm, + 'Term':Term, + 'astro':astro + }; + }, + + /** + * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON + * @param y lunar year + * @param m lunar month + * @param d lunar day + * @param isLeapMonth lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可] + * @return JSON object + * @eg:console.log(calendar.lunar2solar(1987,9,10)); + */ + lunar2solar:function(y,m,d,isLeapMonth) { //参数区间1900.1.31~2100.12.1 + y = parseInt(y) + m = parseInt(m) + d = parseInt(d) + var isLeapMonth = !!isLeapMonth; + var leapOffset = 0; + var leapMonth = this.leapMonth(y); + var leapDay = this.leapDays(y); + if(isLeapMonth&&(leapMonth!=m)) {return -1;}//传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同 + if(y==2100&&m==12&&d>1 || y==1900&&m==1&&d<31) {return -1;}//超出了最大极限值 + var day = this.monthDays(y,m); + var _day = day; + //bugFix 2016-9-25 + //if month is leap, _day use leapDays method + if(isLeapMonth) { + _day = this.leapDays(y,m); + } + if(y < 1900 || y > 2100 || d > _day) {return -1;}//参数合法性效验 + + //计算农历的时间差 + var offset = 0; + for(var i=1900;i0) { + offset+=this.leapDays(y);isAdd = true; + } + } + offset+=this.monthDays(y,i); + } + //转换闰月农历 需补充该年闰月的前一个月的时差 + if(isLeapMonth) {offset+=day;} + //1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点) + var stmap = Date.UTC(1900,1,30,0,0,0); + var calObj = new Date((offset+d-31)*86400000+stmap); + var cY = calObj.getUTCFullYear(); + var cM = calObj.getUTCMonth()+1; + var cD = calObj.getUTCDate(); + + return this.solar2lunar(cY,cM,cD); + } +}; + diff --git a/lib/page.js b/lib/page.js index 7d6fe8d0..1f3d3ad2 100644 --- a/lib/page.js +++ b/lib/page.js @@ -253,4 +253,5 @@ Volcanos("page", {ClassList: { height: function() { return window.innerHeight }, width: function() { return window.innerWidth }, ismodkey: function(event) { return [lang.META, lang.ALT, lang.CONTROL, lang.SHIFT].indexOf(event.key) > -1 }, + isDisplay: function(target) { return target.style.display != html.NONE && target.innerHTML != "" }, }) diff --git a/page/index.css b/page/index.css index 54294361..b444748e 100644 --- a/page/index.css +++ b/page/index.css @@ -86,6 +86,7 @@ fieldset.input.date div.action div.space { width:0; clear:both; } fieldset.input.date div.output td.prev { color:gray; } fieldset.input.date div.output td.next { color:gray; } fieldset.input.date div.output td { padding:2px 10px; } +fieldset.input.date div.output td span.lunar { font-size:8px; display:block; clear:both; } fieldset.input.date table { text-align:center; width:280px; } fieldset.input.date select { width:63px; } fieldset.input.date select[name=month] { width:70px; } diff --git a/plugin/input/date.js b/plugin/input/date.js index 65d2aea5..8766e3e5 100644 --- a/plugin/input/date.js +++ b/plugin/input/date.js @@ -1,5 +1,7 @@ Volcanos(chat.ONFIGURE, {date: { onclick: function(event, can, meta, target, cbs) { cbs(function(can, cb) { + function lunar(year, month, day) { return [] } + const TODAY = "today", YEAR = "year", MONTH = "month", HOUR = "hour", MINUTE = "minute", SECOND = "second" var today = new Date(), now = can.base.Date((target.value||"").trim()); function _cb(_now) { cb(can, can.user.time(can, now = _now), target.value) } can.onappend._action(can, [cli.CLOSE, [HOUR].concat(can.core.List(24)), [MINUTE].concat(can.core.List(0, 60, 5)), [SECOND].concat(can.core.List(0, 60, 5)), @@ -29,13 +31,14 @@ Volcanos(chat.ONFIGURE, {date: { can.Action(SECOND, parseInt(now.getSeconds()/5)*5) can.page.Appends(can, can._table, [{th: ["日", "一", "二", "三", "四", "五", "六"]}]) - var tr; function add(day, type) { if (day.getDay() == 0) { tr = can.page.Append(can, can._table, [{type: html.TR}]).last } - var _day = new Date(day) - can.page.Append(can, tr, [{text: [day.getDate(), html.TD, can.base.isIn(can.base.Time(day, "%y-%m-%d"), can.base.Time(now, "%y-%m-%d"), can.base.Time(today, "%y-%m-%d"))? html.SELECT: type], - onclick: function(event) { - _day.setHours(now.getHours()), _day.setMinutes(now.getMinutes()), _day.getSeconds(now.getSeconds()) - _cb(_day), can.close() }, - }]) + var tr; function add(day, type) { if (day.getDay() == 0) { tr = can.page.Append(can, can._table, [{type: html.TR}]).last } var _day = new Date(day) + var _lunar = lunar(day.getFullYear(), day.getMonth()+1, day.getDate()) + can.page.Append(can, tr, [{view: [can.base.isIn(can.base.Time(day, "%y-%m-%d"), can.base.Time(now, "%y-%m-%d"), can.base.Time(today, "%y-%m-%d"))? html.SELECT: type, html.TD], + onclick: function(event) { _day.setHours(now.getHours()), _day.setMinutes(now.getMinutes()), _day.getSeconds(now.getSeconds()), _cb(_day), can.close() }, + list: [ + {text: day.getDate()+""}, + {text: [_lunar.lunarFestival||_lunar.festival||_lunar.Term||(_lunar.IDayCn == "初一"? _lunar.IMonthCn: _lunar.IDayCn)], "className": "lunar"}, + ]}]) } var one = new Date(now); one.setDate(1) @@ -47,7 +50,16 @@ Volcanos(chat.ONFIGURE, {date: { for (var day = new Date(one); day < end; day.setDate(day.getDate()+1)) { add(day, mdb.MAIN) } for (var day = new Date(end); end.getDay() != 0 && day < tail; day.setDate(day.getDate()+1)) { add(day, mdb.NEXT) } return now - } show(now), can._show = function(d) { _cb(show(new Date(now.getTime()+d*24*3600*1000))) } + } + can.require(["/lib/lunar.js"], function() { + lunar = function(year, month, day) { + var what = calendar.solar2lunar(year,month,day) + can.misc.Log("what", what) + return what + return Lunar.toLunar(year, month, day) + } + show(now), can._show = function(d) { _cb(show(new Date(now.getTime()+d*24*3600*1000))) } + }) })}, onkeydown: function(event, can, meta, cb, target, sub, last) { if (sub.hidden()) { return } switch (event.key) { case "n": can.page.SelectInput(can, sub._action, mdb.NEXT, function(target) { target.click() }); break diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 61e5a820..ac7270a2 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -228,6 +228,7 @@ Volcanos(chat.ONKEYMAP, {help: "键盘交互", (!rest && can.onaction.insertLine(can, left+item[1], can.current.next()), left += ice.TB) } }).length == 0 && rest && ["}", "]", ")"].indexOf(rest[0]) > -1 && (left = left.slice(0, -1)) if (can.base.endWith(text, "`") && can.base.count(text, "`")%2==1) { !rest && can.onaction.insertLine(can, left+"`", can.current.next()) } + if (rest.trim()[0] == "}" && text.trim()[text.length-1] != "{") { left = left.slice(0, -1) } var line = can.onaction.insertLine(can, left+rest.trimLeft(), can.current.next()) can.current.text(text.trimRight()||text), can.onaction.selectLine(can, line) can.onkeymap.cursorMove(target, 0, left.length) diff --git a/plugin/local/wiki/draw.css b/plugin/local/wiki/draw.css index c6f1626f..6a6dd140 100644 --- a/plugin/local/wiki/draw.css +++ b/plugin/local/wiki/draw.css @@ -1,2 +1,3 @@ +fieldset.draw td.content { position:relative; } fieldset.draw div.output { background-color:#1b5b738c; font-size:20px; } fieldset.draw div.output div.content svg { background-color:#1b5b738c; } diff --git a/plugin/local/wiki/draw.js b/plugin/local/wiki/draw.js index c35f417d..14ea23b1 100644 --- a/plugin/local/wiki/draw.js +++ b/plugin/local/wiki/draw.js @@ -1,26 +1,27 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear(can) can.onimport._show(can, msg), can.onmotion.delay(can, function() { can.core.Item(kit.Dict(svg.GRID, 10, svg.FONT_SIZE, 24, svg.FONT_FAMILY, svg.MONOSPACE, svg.STROKE_WIDTH, 2, svg.STROKE, cli.YELLOW, svg.FILL, cli.PURPLE, - "go", ice.RUN, svg.SHAPE, svg.RECT, - ), function(key, value) { can.svg.Value(key, can.Action(key, can.svg.Value(key)||value)) }) - var pid = can.Option(svg.PID)||can.misc.SearchHash(can)[0]||can.svg.Value(svg.PID); if (!pid) { return } - can.page.Select(can, can.svg, ice.PT+pid, function(target) { can.onimport._profile(can, target), can.ondetail.run({target: target}, can) }) + svg.GO, ice.RUN, svg.SHAPE, svg.RECT), function(key, value) { can.Action(key, can.svg.Value(key, can.svg.Value(key)||value)) }) + can.ondetail._select(can, can.misc.SearchHash(can)[0]||can.Option(svg.PID)||can.svg.Value(svg.PID), function(target) { can.onimport._profile(can, target) }) }), can.isCmdMode()? (can.keylist = [], can.onkeymap._build(can)): can.onmotion.hidden(can, can._action) + can.require(["/require/src/lunar.js"], function() { + can.misc.Log(Lunar.toLunar(2022, 11, 7)) + }) }, - _show: function(can, msg) { can.svg = null, can.group = null, can.temp = null, can.current = null, can.points = [] - can.ui = can.onlayout.profile(can), can.page.Modify(can, can.ui.content, msg.Result()||can.onexport.content(can)), can.onmotion.hidden(can, can.ui.project) + _show: function(can, msg) { can.svg = null, can.group = null, can.temp = null, can.current = null, can.points = [], can._display_heights = {} + can.ui = can.onlayout.profile(can), can.page.Modify(can, can.ui.content, msg.Result()||can.onexport.content(can)), can.onmotion.hidden(can, [can.ui.project, can.ui.profile]) can.page.Select(can, can.ui.content, html.SVG, function(target) { can.svg = can.group = can.onimport._block(can, target), can.onimport._group(can, target).click() can.page.Select(can, target, mdb.FOREACH, function(target) { can.onimport._block(can, target), can.page.tagis(target, svg.G) && target.Value(html.CLASS) && can.onimport._group(can, target) }) can.core.ItemCB(can.onaction, function(key, cb) { target[key] = function(event) { cb(event, can) } }) - }), can.page.style(can, can.ui.display, html.MIN_HEIGHT, 80, html.MAX_HEIGHT, can.ConfHeight()-can.svg.Val(html.HEIGHT)-52) + }) }, _block: function(can, target) { - target.Value = function(key, value) { if (can.base.isUndefined(key)) { return } if (can.base.isObject(key)) { can.core.Item(key, target.Value); return } - var figure = can.onfigure._get(can, target); key = can.core.Value(figure, ["data", "trans", key])||key - var _cb = can.core.Value(figure, ["data", key]); if (can.base.isFunc(_cb)) { return _cb(can, value, key, target) } + target.Value = function(key, value) { if (can.base.isUndefined(key)) { return } if (can.base.isObject(key)) { return can.core.Item(key, target.Value), key } + var figure = can.onfigure._get(can, target); key = can.core.Value(figure, [svg.DATA, svg.TRANS, key])||key + var _cb = can.core.Value(figure, [svg.DATA, key]); if (can.base.isFunc(_cb)) { return _cb(can, value, key, target) } if (key == ice.SHIP) { return value != undefined && target.setAttribute(key, JSON.stringify(value)), can.base.Obj(target.getAttribute(key), []) } if (key == html.INNER) { return value != undefined && (target.innerHTML = value), target.innerHTML } - return value != undefined && target.setAttribute(key, value), target.getAttribute(key) || can.core.Value(target[key], "baseVal.value") || can.core.Value(target[key], "baseVal") || "" + return value != undefined && target.setAttribute(key, value), target.getAttribute(key) || can.core.Value(target[key], "baseVal.value") || can.core.Value(target[key], "baseVal") || undefined } target.Val = function(key, value) { return parseInt(target.Value(key, value == undefined? value: parseInt(value)||0))||0 } target.Group = function() { for (var node = target; node; node = node.parentNode) { if (can.page.tagis(node, svg.G, html.SVG)) { return node } } return can.svg } @@ -28,27 +29,27 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( for (var node = target; node && !can.page.tagis(node, html.SVG); node = node.parentNode) { can.page.tagis(node, svg.G) && node.Value(html.CLASS) && list.push(node.Value(html.CLASS)) } return list.reverse().join(ice.PT) } - target.oncontextmenu = function(event) { can.page.style(can, can.user.carte(event, can, can.ondetail, null, function(event, button, meta) { meta[button]({target: target}, can, button) })._target, {left: event.clientX, top: event.clientY}) } return target }, _group: function(can, target) { var name = target.Groups() - return name && can.onimport.item(can, {name: name}, function(event) { can.group = target - can.core.List([svg.STROKE_WIDTH, svg.STROKE, svg.FILL, svg.FONT_SIZE], function(key) { - can.Action(key, target.Value(key)||can.Action(key)) - }), can.onaction.show(event, can), can.Status(svg.GROUP, name) + return name && can.onimport.item(can, {name: name}, function(event) { can.group = target, can.Status(svg.GROUP, name), can.onaction.show(event, can) + can.core.List([svg.FONT_SIZE, svg.STROKE_WIDTH, svg.STROKE, svg.FILL], function(key) { can.Action(key, target.Value(key)||can.Action(key)) }) }, function(event) { can.user.carteRight(event, can, can.onaction, can.onaction.menu_list) }, can.ui.project) }, - _profile: function(can, target, list) { can.misc.SearchHash(can, can.Option(svg.PID, can.svg.Value(svg.PID, can.onexport._pid(can, target)))) - if (can.onmotion.cache(can, function() { return target.Value(svg.PID) }, can.ui.profile, can.ui.display)) { return } + _profile: function(can, target) { can.misc.SearchHash(can, can.Option(svg.PID, can.svg.Value(svg.PID, can.onexport._pid(can, target)))) + if (can.onmotion.cache(can, function() { return target.Value(svg.PID) }, can.ui.profile, can.ui.display)) { return can.onimport.layout(can) } var figure = can.onfigure._get(can, target), ui = can.page.Append(can, can.ui.profile, [html.OUTPUT, html.ACTION]) can.page.Append(can, ui.output, [{view: [html.CONTENT, html.TABLE], list: [ {th: [mdb.KEY, mdb.VALUE]}, {td: [mdb.TYPE, target.tagName]}, {td: [svg.PID, target.Value(svg.PID)]}, - ].concat(can.core.List((list||[]).concat(figure.data.copy, [svg.X, svg.Y, mdb.INDEX, ctx.ARGS]), function(key) { - return key = can.core.Value(figure.data, can.core.Keys("trans", key))||key, {td: [key, target.Value(key)], ondblclick: function(event) { - can.onmotion.modify(can, event.target, function(event, value, old) { target.Value(key, value), can.ondetail._move(can, target) }) + ].concat(can.core.List([].concat(figure.data.copy, [svg.X, svg.Y, mdb.INDEX, ctx.ARGS]), function(key) { + return key = can.core.Value(figure.data, can.core.Keys(svg.TRANS, key))||key, {td: [key, target.Value(key)], ondblclick: function(event) { + can.onmotion.modify(can, event.target, function(event, value) { target.Value(key, value), can.ondetail._move(can, target) }) }} })) }]) // , can.onappend._action(can, can.ondetail.list, ui.action, {_engine: function(event, can, button) { can.ondetail[button]({target: target}, can, button) }}) + target.Value(ctx.INDEX)? can.onappend.plugin(can, {index: target.Value(ctx.INDEX), args: target.Value(ctx.ARGS), height: can.ConfHeight()/2-2*html.ACTION_HEIGHT}, function(sub) { + can.onimport.layout(can), sub.onaction._output = function() { can._display_heights[target.Value(svg.PID)] = can.base.Max(sub._target.offsetHeight, can.ConfHeight()/2), can.onimport.layout(can) } + }, can.ui.display): can.onimport.layout(can) }, block: function(can, type, value, group) { group = group||can.group||can.svg var target = document.createElementNS("http://www.w3.org/2000/svg", type) @@ -62,13 +63,18 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( var target = can.onimport.block(can, figure.data.name||value.shape, data, group); can.core.ItemCB(value, function(key, cb) { target[key] = cb }) return value._init && value._init(target), target }, + layout: function(can) { var key = can.isCmdMode()? html.HEIGHT: html.MAX_HEIGHT + var height = can.page.isDisplay(can.ui.display)? can._display_heights[can.Option(svg.PID)]||html.ACTION_HEIGHT: 0; can.page.styleHeight(can, can.ui.display, height) + can.page.style(can, can.ui.content, key, can.ConfHeight()-height), can.page.styleHeight(can, can.ui.profile, can.ui.content.offsetHeight), can.page.styleHeight(can, can.ui.project, can.ui.content.offsetHeight+height) + can.page.styleWidth(can, can.ui.content, can.ConfWidth()-can.ui.project.offsetWidth-can.ui.profile.offsetWidth) + }, }, [""]) Volcanos(chat.ONACTION, {list: [[svg.GRID, 1, 2, 3, 4, 5, 10, 20], [svg.FONT_SIZE, 12, 16, 18, 24, 32], [svg.STROKE_WIDTH, 1, 2, 3, 4, 5], [svg.STROKE, cli.RED, cli.YELLOW, cli.GREEN, cli.CYAN, cli.BLUE, cli.PURPLE, cli.BLACK, cli.WHITE], - [svg.FILL, cli.RED, cli.YELLOW, cli.GREEN, cli.CYAN, cli.BLUE, cli.PURPLE, cli.BLACK, cli.WHITE, "#0000"], - ["go", ice.RUN, ice.AUTO, "manual"], [ice.MODE, "draw", web.RESIZE], - [svg.SHAPE, svg.TEXT, svg.CIRCLE, svg.ELLIPSE, svg.RECT, svg.LINE, svg.BLOCK], + [svg.FILL, cli.RED, cli.YELLOW, cli.GREEN, cli.CYAN, cli.BLUE, cli.PURPLE, cli.BLACK, cli.WHITE, cli.GLASS], + [svg.GO, ice.RUN, ice.AUTO, "manual"], [ice.MODE, web.DRAW, web.RESIZE], + [svg.SHAPE, svg.TEXT, svg.RECT, svg.LINE, svg.BLOCK, svg.CIRCLE, svg.ELLIPSE], ], _change: function(can, key, value) { can.Action(key, value), can.group.Value(key, value) }, "font-size": function(event, can, key, value) { can.onaction._change(can, key, value) }, "stroke-width": function(event, can, key, value) { can.onaction._change(can, key, value) }, @@ -87,7 +93,7 @@ Volcanos(chat.ONACTION, {list: [[svg.GRID, 1, 2, 3, 4, 5, 10, 20], remove: function(event, can) { can.group == can.svg || can.page.Remove(can, can.group) }, save: function(event, can, button) { can.runAction(can.request(event, {text: can.onexport.content(can, can.svg)}), button, [can.Option(nfs.PATH)]) }, - edit: function(event, can) { can.Action("go", can.Action("go") == ice.RUN? ice.AUTO: ice.RUN) }, + edit: function(event, can) { can.Action(svg.GO, can.Action(svg.GO) == ice.RUN? ice.AUTO: ice.RUN) }, _mode: { draw: function(event, can, points) { var shape = can.Action(svg.SHAPE), figure = can.onfigure[shape] @@ -101,24 +107,24 @@ Volcanos(chat.ONACTION, {list: [[svg.GRID, 1, 2, 3, 4, 5, 10, 20], if (event.type == html.CLICK) { if (points.length > 1) { return can.points = [], delete(can.current) } return can.current = {target: target, begin: can.core.List([target], function(target) { if (can.page.tagis(target, svg.G)) { return } return {target: target, height: target.Val(html.HEIGHT), width: target.Val(html.WIDTH), x: target.Val(svg.X), y: target.Val(svg.Y), - ship: can.core.List(target.Value(ice.SHIP), function(ship) { return ship.pid && (ship.target = can.page.Select(can, can.svg, ice.PT+ship.pid)[0]) && ship }) + ship: can.core.List(target.Value(ice.SHIP), function(ship) { return ship.pid && (ship.target = can.ondetail._select(can, ship.pid)) && ship }) } }), pos: can.onexport.cursor(event, can, target)} } can.current && can.core.List(can.current.begin, function(item) { var figure = can.onfigure._get(can, item.target) - can.onexport.resize(event, item.target, item, points[0], points[1], can.current.pos), can.ondetail._move(can, item.target, item.ship) - can.page.Select(can, can.svg, ice.PT+item.target.Value(mdb.TEXT), function(text) { text.Value(can.onexport._text(can, item.target, figure, {})) }) + can.onexport.resize(item.target, can.current.pos, points[0], points[1], item), can.ondetail._move(can, item.target, item.ship) + can.ondetail._select(can, item.target.Value(mdb.TEXT), function(text) { text.Value(can.onexport._text(can, item.target, figure, {})) }) }) }, }, _auto: function(can, target) { if (can.points.length > 0 || can.page.tagis(target, html.TEXT)) { return } var pos = can.onexport.cursor(event, can, target); if (target == can.svg) { switch (pos) { - case 5: can.Action(ice.MODE, "draw"), can.Action(svg.SHAPE, html.BLOCK), can.page.style(can, target, {cursor: "crosshair"}); break - default: can.Action(ice.MODE, "resize") + case 5: can.Action(ice.MODE, web.DRAW), can.Action(svg.SHAPE, html.BLOCK), can.page.style(can, target, {cursor: "crosshair"}); break + default: can.Action(ice.MODE, web.RESIZE) } } else { switch (pos) { case 5: - case 9: can.Action(ice.MODE, "resize"); break - default: can.Action(ice.MODE, "draw"), can.Action(svg.SHAPE, svg.LINE) + case 9: can.Action(ice.MODE, web.RESIZE); break + default: can.Action(ice.MODE, web.DRAW), can.Action(svg.SHAPE, svg.LINE) } } }, _figure: function(event, can, points) { can.temp && can.page.Remove(can, can.temp) && delete(can.temp) @@ -126,73 +132,58 @@ Volcanos(chat.ONACTION, {list: [[svg.GRID, 1, 2, 3, 4, 5, 10, 20], }, onmouseover: function(event, can) { can.onexport._show(can, event.target) }, onmousemove: function(event, can) { var point = can.onexport._point(event, can) - if (can.Action("go") == ice.RUN) { return } can.onexport.cursor(event, can, event.target) - if (can.Action("go") == ice.AUTO) { can.onaction._auto(can, event.target) } + if (can.Action(svg.GO) == ice.RUN) { return } can.onexport.cursor(event, can, event.target) + if (can.Action(svg.GO) == ice.AUTO) { can.onaction._auto(can, event.target) } can.onaction._figure(event, can, can.points.concat(point)) }, onclick: function(event, can) { var point = can.onexport._point(event, can) - if (can.Action("go") == ice.RUN) { return can.onimport._profile(can, event.target) } + if (can.Action(svg.GO) == ice.RUN) { return can.onimport._profile(can, event.target) } can.onaction._figure(event, can, can.points = can.points.concat(point)) }, ondblclick: function(event, can) { can.ondetail.label(event, can) }, + oncontextmenu: function(event) { can.page.style(can, can.user.carte(event, can, can.ondetail, null, function(ev, button, meta) { meta[button](event, can, button) })._target, {left: event.clientX, top: event.clientY}) }, }) -Volcanos(chat.ONDETAIL, {list: [cli.START, ice.RUN, ice.COPY, html.LABEL, mdb.MODIFY, "toimage", mdb.REMOVE], +Volcanos(chat.ONDETAIL, {list: [cli.START, ice.COPY, html.LABEL, "toimage", mdb.REMOVE], + _select(can, name, cb) { return name? can.page.Select(can, can.svg, ice.PT+name, cb)[0]: null }, start: function(event, can) { var target = event.target var list = [target], dict = {} - for (var i = 0; i < list.length; i++) { var ship = list[i].Value("ship") + for (var i = 0; i < list.length; i++) { var ship = list[i].Value(svg.SHIP) for (var j = 0; j < ship.length; j++) { var pid = ship[j].pid - can.page.Select(can, can.svg, ice.PT+pid, function(item) { - var pid = item.Value("ship")[1].pid - can.page.Select(can, can.svg, ice.PT+pid, function(item) { - !dict[pid] && list.push(item), dict[pid] = true - }) + can.ondetail._select(can, pid, function(target) { var pid = target.Value(svg.SHIP)[1].pid + can.ondetail._select(can, pid, function(target) { !dict[pid] && list.push(target), dict[pid] = true }) }) } } - can.core.Next(list, function(item, next) { can.onmotion.delay(can, function() { - can.onmotion.show(can, {interval: 300, length: 10}, null, item) - can.user.toast(can, item.Value(ctx.INDEX)) - can.ondetail.run({target: item}, can), next() + can.core.Next(list, function(target, next) { can.onmotion.delay(can, function() { + can.onmotion.show(can, {interval: 300, length: 10}, null, target) + can.user.toast(can, target.Value(ctx.INDEX)) + can.ondetail.run({target: target}, can), next() }) }) }, - run: function(event, can) { var target = event.target; can.onexport._pid(can, target) - if (can.onmotion.cache(can, function() { return target.Value(svg.PID) }, can.ui.display)) { return } - var index = target.Value(mdb.INDEX); index && can.onappend.plugin(can, {index: index, args: target.Value(ctx.ARGS)}, function(sub) { - sub.ConfHeight(can.ConfHeight()-can.svg.Val(html.HEIGHT)-4*html.ACTION_HEIGHT), sub.ConfWidth(can.ConfWidth()) - can.onmotion.toggle(can, can.ui.display, true) - }, can.ui.display) - }, - toimage: function(event, can) { can.user.toimage(event, can, can.Option(nfs.PATH).split(ice.PS).pop().split(ice.PT)[0], can.svg) }, - copy: function(event, can) { var figure = can.onfigure._get(can, target), trans = figure.data.trans, data = {} + copy: function(event, can) { var figure = can.onfigure._get(can, target), trans = can.core.Value(figure, svg.DATA, svg.TRANS)||{}, data = {} data[trans.x||svg.X] = target.Val(trans.x||svg.X)+10, data[trans.y||svg.Y] = target.Val(trans.y||svg.Y)+10 can.core.List(figure.data.copy, function(key) { data[key] = target.Value(key) }) return can.onimport.block(can, target.tagName, data, can.group) }, label: function(event, can) { var target = event.target - var text = target.Value(mdb.TEXT); text && can.page.Select(can, can.svg, ice.PT+text, function(target) { text = target.Value(html.INNER) }) + var text = target.Value(mdb.TEXT); can.ondetail._select(can, text, function(target) { text = target.Value(html.INNER) }) can.user.input(event, can, [{name: html.LABEL, value: text}], function(list) { if (target.tagName == html.TEXT) { return target.innerHTML = list[0] } - if (text && can.page.Select(can, can.svg, ice.PT+text, function(target) { target.Value(html.INNER, list[0]) }).length > 0) { return } + if (can.ondetail._select(can, text, function(target) { target.Value(html.INNER, list[0]) })) { return } target.Value(mdb.TEXT, can.onexport._pid(can, can.onimport.block(can, html.TEXT, can.onexport._text(can, target, can.onfigure._get(can, target), {inner: list[0]}), target.Group()) )) }) }, - modify: function(event, can) { can.onimport._profile(can, event.target) }, + toimage: function(event, can) { can.user.toimage(event, can, can.Option(nfs.PATH).split(ice.PS).pop().split(ice.PT)[0], can.svg) }, remove: function(event, can) { if (target == can.svg) { return } var target = event.target - can.core.List(target.Value(ice.SHIP), function(item) { can.page.Select(can, can.svg, ice.PT+item.pid, function(target) { can.page.Remove(can, target) }) }) - target.Value(mdb.TEXT) && can.page.Select(can, can.svg, ice.PT+target.Value(mdb.TEXT), function(target) { can.page.Remove(can, target) }), can.page.Remove(can, target) + can.core.List(target.Value(ice.SHIP), function(item) { can.ondetail._select(can, item.pid, function(target) { can.page.Remove(can, target) }) }) + can.ondetail._select(can, target.Value(mdb.TEXT), function(target) { can.page.Remove(can, target) }), can.page.Remove(can, target) }, _move: function(can, target, list) { - can.core.List(list||target.Value(ice.SHIP), function(ship) { - ship.target = can.page.Select(can, can.svg, ice.PT+ship.pid)[0] - var p = can.onexport.anchor(target, ship.anchor, {}) - if (ship.which == 1) { - ship.target.Val(svg.X1, p.x), ship.target.Val(svg.Y1, p.y) - } else if (ship.which == 2) { - ship.target.Val(svg.X2, p.x), ship.target.Val(svg.Y2, p.y) - } + can.core.List(list||target.Value(ice.SHIP), function(ship) { var p = can.onexport.anchor(target, ship.anchor, {}); ship.target = can.ondetail._select(can, ship.pid) + if (ship.which == 1) { ship.target.Val(svg.X1, p.x), ship.target.Val(svg.Y1, p.y) } else if (ship.which == 2) { ship.target.Val(svg.X2, p.x), ship.target.Val(svg.Y2, p.y) } }) }, }) -Volcanos(chat.ONEXPORT, {list: [svg.GROUP, "figure", ctx.INDEX, "pos"], +Volcanos(chat.ONEXPORT, {list: [svg.GROUP, svg.FIGURE, ctx.INDEX, "pos"], _point: function(event, can) { var p = can.svg.getBoundingClientRect(), point = {x: event.clientX-p.x, y: event.clientY-p.y} point.x = point.x - point.x % parseInt(can.Action(svg.GRID)), point.y = point.y - point.y % parseInt(can.Action(svg.GRID)) return can.Status("pos", point.x+ice.FS+point.y), point @@ -201,27 +192,27 @@ Volcanos(chat.ONEXPORT, {list: [svg.GROUP, "figure", ctx.INDEX, "pos"], var pid = "p"+can.svg.Val(mdb.COUNT, can.svg.Val(mdb.COUNT)+1) return target.Value(html.CLASS, (target.Value(html.CLASS)+ice.SP+target.Value(svg.PID, pid)).trim()), pid }, - _text: function(can, target, figure, data) { var trans = can.core.Value(figure.data, "trans")||{} + _text: function(can, target, figure, data) { var trans = can.core.Value(figure.data, svg.TRANS)||{} if (figure.text) { return figure.text(can, target, data) } return data.x = target.Val(trans[svg.X]||svg.X), data.y = target.Val(trans[svg.Y]||svg.Y), data }, - _size: function(can, target, figure) { var trans = can.core.Value(figure.data, "trans")||{} + _size: function(can, target, figure) { var trans = can.core.Value(figure.data, svg.TRANS)||{} return "<("+target.Val(trans[html.HEIGHT]||html.HEIGHT)+ice.FS+target.Val(trans[html.WIDTH]||html.WIDTH)+")" }, - _position: function(can, target, figure) { var trans = can.core.Value(figure.data, "trans")||{} + _position: function(can, target, figure) { var trans = can.core.Value(figure.data, svg.TRANS)||{} return "@("+target.Val(trans[svg.X]||svg.X)+ice.FS+target.Val(trans[svg.Y]||svg.Y)+")" }, _show: function(can, target) { var figure = can.onfigure._get(can, target) function show() { return can.onexport._size(can, target, figure)+ice.SP+can.onexport._position(can, target, figure) } - can.Status("figure", target.tagName+ice.DF+target.Value(svg.PID)+ice.SP+(figure? (figure.show||show)(can, target, figure): "")) + can.Status(svg.FIGURE, target.tagName+ice.DF+target.Value(svg.PID)+ice.SP+(figure? (figure.show||show)(can, target, figure): "")) can.Status(svg.GROUP, target.Groups()||can.group.Groups()||html.SVG) can.Status(ctx.INDEX, target.Value(ctx.INDEX)||"") }, - content: function(can, svg) { + content: function(can, target) { return ['"]).join("") + target? can.core.List([html.HEIGHT, html.WIDTH, svg.GRID, mdb.COUNT, svg.PID, svg.FONT_SIZE, svg.STROKE_WIDTH, svg.STROKE, svg.FILL], function(item) { + return target.Value(item)? ice.SP + item + '="' + target.Value(item) + '"': "" + }): [" height="+((can.ConfHeight()||450)-50)+" width="+(can.ConfWidth()||600)]).concat(['>', target? target.innerHTML: "", ""]).join("") }, cursor: function(event, can, target) { var p = target.getBoundingClientRect(), q = {x: event.clientX, y: event.clientY}, pos = 5, margin = 20 @@ -253,47 +244,47 @@ Volcanos(chat.ONEXPORT, {list: [svg.GROUP, "figure", ctx.INDEX, "pos"], case 9: point.x = target.Val(svg.X) + target.Val(html.WIDTH); break } return point }, - resize: function(event, target, begin, p0, p1, pos) { + resize: function(target, pos, p0, p1, begin) { if (pos == 5) { target.Value(svg.X, begin.x + p1.x - p0.x), target.Value(svg.Y, begin.y + p1.y - p0.y); return } switch (pos) { case 1: case 2: - case 3: item.Value(svg.Y, begin.y + p1.y - p0.y), item.Value(html.HEIGHT, begin.height - p1.y + p0.y); break + case 3: target.Value(svg.Y, begin.y + p1.y - p0.y), target.Value(html.HEIGHT, begin.height - p1.y + p0.y); break case 7: case 8: - case 9: item.Value(html.HEIGHT, begin.height + p1.y - p0.y); break + case 9: target.Value(html.HEIGHT, begin.height + p1.y - p0.y); break } switch (pos) { case 1: case 4: - case 7: item.Value(sve.X, begin.x + p1.x - p0.x), item.Value(html.WIDTH, begin.width - p1.x + p0.x); break + case 7: target.Value(sve.X, begin.x + p1.x - p0.x), target.Value(html.WIDTH, begin.width - p1.x + p0.x); break case 3: case 6: - case 9: item.Value(html.WIDTH, begin.width + p1.x - p0.x); break + case 9: target.Value(html.WIDTH, begin.width + p1.x - p0.x); break } }, }) Volcanos(chat.ONFIGURE, { _get: function(can, target, name) { return can.onfigure[name]||can.onfigure[target.getAttribute(mdb.NAME)]||can.onfigure[target.tagName] }, - svg: { // + svg: { // "600" grid="10" count="0" font-size="24" stroke-width="2" stroke="yellow" fill="purple"/> show: function(can, target, figure) { return can.onexport._size(can, target, figure) } }, - text: { // hi + text: { // "60" y="10">hi data: {points: 1, copy: [html.INNER]}, draw: function(event, can, points, style) { var p0 = points[0] return {x: p0.x, y: p0.y, inner: style.inner||can.user.prompt(mdb.TEXT)} }, show: function(can, target, figure) { return can.onexport._position(can, target, figure) } }, - rect: { // + rect: { // "30" width="30" rx="10" ry="10" x="60" y="10"/> data: {points: 2, rx: 4, ry: 4, copy: [html.HEIGHT, html.WIDTH, svg.RX, svg.RY]}, draw: function(event, can, points, style) { var p0 = points[0], p1 = points[1] return {height: Math.abs(p0.y-p1.y), width: Math.abs(p0.x-p1.x), x: Math.min(p0.x, p1.x), y: Math.min(p0.y, p1.y), rx: style.rx == undefined? this.data.rx: style.rx, ry: style.ry == undefined? this.data.ry: style.ry} }, text: function(can, target, data) { return data.x = target.Val(svg.X)+target.Val(html.WIDTH)/2, data.y = target.Val(svg.Y)+target.Val(html.HEIGHT)/2, data }, }, - block: { // + block: { // "30" width="30" rx="10" ry="10" x="60" y="10"/> data: {points: 2, rx: 4, ry: 4, copy: [html.HEIGHT, html.WIDTH, svg.RX, svg.RY]}, draw: function(event, can, points, style) { this._temp && can.page.Remove(can, this._temp) && delete(this._temp), this._temp = can.onimport.block(can, svg.G, {}, can.group) @@ -302,7 +293,7 @@ Volcanos(chat.ONFIGURE, { }, text: function(can, target, data) { can.onfigure.rect.text(can, data, target) }, }, - line: { // + line: { // "10" y1="50" x2="110" y2="150"/> data: {points: 2, trans: {x: svg.X1, y: svg.Y1}, copy: [svg.X1, svg.Y1, svg.X2, svg.Y2]}, grid: function(event, can, points) { var target = event.target; if (target == can.svg) { return } var p = points[points.length-1], pos = can.onexport.cursor(event, can, target); can.onexport.anchor(target, pos, p) @@ -316,13 +307,13 @@ Volcanos(chat.ONFIGURE, { text: function(can, target, data) { return data.x = (target.Val(svg.X1)+target.Val(svg.X2))/2, data.y = (target.Val(svg.Y1)+target.Val(svg.Y2))/2, data }, show: function(can, target, figure) { return "<("+(target.Val(svg.Y2)-target.Val(svg.Y1))+ice.FS+(target.Val(svg.X2)-target.Val(svg.X1))+")"+can.onexport._position(can, target, figure) }, }, - circle: { // + circle: { // "25" cy="75" r="20"/> data: {points: 2, trans: {height: svg.R, width: svg.R, x: svg.CX, y: svg.CY}, copy: [svg.R]}, draw: function(event, can, points) { var p0 = points[0], p1 = points[1] return {cx: p0.x, cy: p0.y, r: parseInt(Math.sqrt(Math.pow(p0.x-p1.x, 2)+Math.pow(p0.y-p1.y, 2)))} }, }, - ellipse: { // + ellipse: { // "75" cy="75" rx="20" ry="5"/> data: {points: 2, trans: {height: svg.RY, width: svg.RX, x: svg.CX, y: svg.CY}, copy: [svg.RY, svg.RX]}, draw: function(event, can, points) { var p0 = points[0], p1 = points[1] return {cx: p0.x, cy: p0.y, ry: Math.abs(p0.y - p1.y), rx: Math.abs(p0.x - p1.x)} @@ -332,12 +323,12 @@ Volcanos(chat.ONFIGURE, { Volcanos(chat.ONKEYMAP, {help: "键盘交互", _mode: { normal: { - gr: function(event, can) { can.Action("go", "run") }, - ga: function(event, can) { can.Action("go", "auto") }, - gm: function(event, can) { can.Action("go", "manual") }, + gr: function(event, can) { can.Action(svg.GO, ice.RUN) }, + ga: function(event, can) { can.Action(svg.GO, ice.AUTO) }, + gm: function(event, can) { can.Action(svg.GO, "manual") }, - ad: function(event, can) { can.Action("mode", "draw") }, - ar: function(event, can) { can.Action("mode", "resize") }, + ad: function(event, can) { can.Action(ice.MODE, web.DRAW) }, + ar: function(event, can) { can.Action(ice.MODE, web.RESIZE) }, st: function(event, can) { can.Action(svg.SHAPE, svg.TEXT) }, sr: function(event, can) { can.Action(svg.SHAPE, svg.RECT) }, diff --git a/proto.js b/proto.js index a3d64240..d1702cb5 100644 --- a/proto.js +++ b/proto.js @@ -59,7 +59,7 @@ var ctx = { EXTRA_INDEX: "extra.index", EXTRA_ARGS: "extra.args", } var cli = { - DAEMON: "daemon", START: "start", STOP: "stop", OPEN: "open", CLOSE: "close", BEGIN: "begin", END: "end", + DAEMON: "daemon", START: "start", STOP: "stop", OPEN: "open", CLOSE: "close", BEGIN: "begin", END: "end", GLASS: "#0000", COLOR: "color", WHITE: "white", BLACK: "black", RED: "red", GREEN: "green", BLUE: "blue", YELLOW: "yellow", CYAN: "cyan", PURPLE: "purple", MAGENTA: "magenta", MAKE: "make", MAIN: "main", DONE: "done", COST: "cost", FROM: "from", CLEAR: "clear", @@ -72,7 +72,7 @@ var aaa = { } var web = { SPACE: "space", DREAM: "dream", SHARE: "share", - WEBSITE: "website", RESIZE: "resize", REFRESH: "refresh", CLEAR: "clear", UPLOAD: "upload", DOWNLOAD: "download", + WEBSITE: "website", DRAW: "draw", RESIZE: "resize", REFRESH: "refresh", CLEAR: "clear", UPLOAD: "upload", DOWNLOAD: "download", SHARE_CACHE: "/share/cache/", GET: "GET", PUT: "PUT", POST: "POST", DELETE: "DELETE", @@ -162,6 +162,7 @@ var chat = { "/plugin/local/wiki/word.js", "/plugin/local/team/plan.js", "/plugin/local/mall/goods.js", + "/lib/lunar.js", ], PLUGIN_INPUT: "/plugin/input/", PLUGIN_STORY: "/plugin/story/", PLUGIN_LOCAL: "/plugin/local/", PLUGIN_STATE_JS: "/plugin/state.js", PLUGIN_INPUT_JS: "/plugin/input.js", PLUGIN_TABLE_JS: "/plugin/table.js", ONENGINE: "onengine", ONDAEMON: "ondaemon", ONAPPEND: "onappend", ONLAYOUT: "onlayout", ONMOTION: "onmotion", ONKEYMAP: "onkeymap", @@ -189,6 +190,8 @@ var mall = { var svg = { GROUP: "group", PID: "pid", GRID: "grid", + FIGURE: "figure", DATA: "data", SHIP: "ship", TRANS: "trans", + GO: "go", SHAPE: "shape", TEXT: "text", RECT: "rect", LINE: "line", CIRCLE: "circle", ELLIPSE: "ellipse", BLOCK: "block", STROKE_WIDTH: "stroke-width", STROKE: "stroke", FILL: "fill", FONT_SIZE: "font-size", FONT_FAMILY: "font-family", MONOSPACE: "monospace", TEXT_ANCHOR: "text-anchor", G: "g", X: "x", Y: "y", R: "r", RX: "rx", RY: "ry", CX: "cx", CY: "cy", X1: "x1", Y1: "y1", X2: "x2", Y2: "y2",