renusify 1.4.2 → 1.4.3

package/components/chart/worldMap.vue

@@ -1,23 +1,23 @@
 <template>
   <div ref="world" :class="`${$r.prefix}world-map`">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 1000">
-      <g>
+    <r-float>
+      <svg viewBox="0 0 2000 1000" xmlns="http://www.w3.org/2000/svg">
         <path
-          ref="country"
-          class="country"
-          :data-id="i"
-          v-for="(path, i) in paths"
-          :key="i"
-          :d="path.d"
-          :fill="lazyColors[i] || defaultColor"
-          @click.prevent="$emit('select', i)"
+            v-for="(path, i) in paths"
+            :key="i"
+            ref="country"
+            :d="path.d"
+            :data-id="i"
+            :fill="lazyColors[i] || defaultColor"
+            class="country"
+            @click.prevent="$emit('select', i)"
         ></path>
-      </g>
-    </svg>
+      </svg>
+    </r-float>
     <div
-      class="map-tooltip"
-      v-if="!disableTooltip && tooltip"
-      :style="{ left: tooltipPosition.x, top: tooltipPosition.y }"
+        v-if="!disableTooltip && tooltip"
+        :style="{ left: tooltipPosition.x, top: tooltipPosition.y }"
+        class="map-tooltip"
     >
       <slot :tooltip="tooltip">
         <div class="pa-3 sheet">
@@ -32,16 +32,16 @@
 export default {
   name: "r-world-map",
   props: {
-    maxColor: { type: String, default: "#8a0000" },
-    minColor: { type: String, default: "#f7a0a0" },
-    defaultColor: { type: String, default: "#aaaaaa" },
+    maxColor: {type: String, default: "#760101"},
+    minColor: {type: String, default: "#f8c6c6"},
+    defaultColor: {type: String, default: "#aaaaaa"},
     Crimea: String,
     Western_Sahara_is_country: Boolean,
     disableTooltip: Boolean,
     colors: Object,
-    hitColors: Object,
+    heatValues: Object,
   },
-  emits:['select','hover'],
+  emits: ['select', 'hover'],
   data() {
     return {
       mapPaths: {
@@ -701,8 +701,255 @@ export default {
         },
       },
       tooltip: null,
-      tooltipPosition: { x: 0, y: 0 },
-      worldPosition: { x: 0, y: 0 },
+      tooltipPosition: {x: 0, y: 0},
+      worldPosition: {x: 0, y: 0},
+      countries: {
+        AF: 'Afghanistan',
+        AX: 'Åland Islands',
+        AL: 'Albania',
+        DZ: 'Algeria',
+        AS: 'American Samoa',
+        AD: 'Andorra',
+        AO: 'Angola',
+        AI: 'Anguilla',
+        AQ: 'Antarctica',
+        AG: 'Antigua and Barbuda',
+        AR: 'Argentina',
+        AM: 'Armenia',
+        AW: 'Aruba',
+        AU: 'Australia',
+        AT: 'Austria',
+        AZ: 'Azerbaijan',
+        BS: 'Bahamas',
+        BH: 'Bahrain',
+        BD: 'Bangladesh',
+        BB: 'Barbados',
+        BY: 'Belarus',
+        BE: 'Belgium',
+        BZ: 'Belize',
+        BJ: 'Benin',
+        BM: 'Bermuda',
+        BT: 'Bhutan',
+        BO: 'Bolivia',
+        BA: 'Bosnia and Herzegovina',
+        BW: 'Botswana',
+        BR: 'Brazil',
+        IO: 'British Indian Ocean Territory',
+        VG: 'British Virgin Islands',
+        BN: 'Brunei Darussalam',
+        BG: 'Bulgaria',
+        BF: 'Burkina Faso',
+        BI: 'Burundi',
+        KH: 'Cambodia',
+        CM: 'Cameroon',
+        CA: 'Canada',
+        CV: 'Cape Verde',
+        BQ: 'Caribbean Netherlands',
+        KY: 'Cayman Islands',
+        CF: 'Central African Republic',
+        TD: 'Chad',
+        CL: 'Chile',
+        CN: 'China',
+        CX: 'Christmas Island',
+        CC: 'Cocos Islands',
+        CO: 'Colombia',
+        KM: 'Comoros',
+        CG: 'Congo',
+        CK: 'Cook Islands',
+        CR: 'Costa Rica',
+        HR: 'Croatia',
+        CU: 'Cuba',
+        CW: 'Curaçao',
+        CY: 'Cyprus',
+        CZ: 'Czech Republic',
+        CD: 'Democratic Republic of the Congo',
+        DK: 'Denmark',
+        DJ: 'Djibouti',
+        DM: 'Dominica',
+        DO: 'Dominican Republic',
+        EC: 'Ecuador',
+        EG: 'Egypt',
+        SV: 'El Salvador',
+        GQ: 'Equatorial Guinea',
+        ER: 'Eritrea',
+        EE: 'Estonia',
+        ET: 'Ethiopia',
+        FK: 'Falkland Islands',
+        FO: 'Faroe Islands',
+        FM: 'Federated States of Micronesia',
+        FJ: 'Fiji',
+        FI: 'Finland',
+        FR: 'France',
+        GF: 'French Guiana',
+        PF: 'French Polynesia',
+        TF: 'French Southern Territories',
+        GA: 'Gabon',
+        GM: 'Gambia',
+        GE: 'Georgia',
+        DE: 'Germany',
+        GH: 'Ghana',
+        GI: 'Gibraltar',
+        GR: 'Greece',
+        GL: 'Greenland',
+        GD: 'Grenada',
+        GP: 'Guadeloupe',
+        GU: 'Guam',
+        GT: 'Guatemala',
+        GN: 'Guinea',
+        GW: 'Guinea-Bissau',
+        GY: 'Guyana',
+        HT: 'Haiti',
+        HN: 'Honduras',
+        HK: 'Hong Kong',
+        HU: 'Hungary',
+        IS: 'Iceland',
+        IN: 'India',
+        ID: 'Indonesia',
+        IR: 'Iran',
+        IQ: 'Iraq',
+        IE: 'Ireland',
+        IM: 'Isle of Man',
+        IL: 'Israel',
+        IT: 'Italy',
+        CI: 'Ivory Coast',
+        JM: 'Jamaica',
+        JP: 'Japan',
+        JE: 'Jersey',
+        JO: 'Jordan',
+        KZ: 'Kazakhstan',
+        KE: 'Kenya',
+        KI: 'Kiribati',
+        XK: 'Kosovo',
+        KW: 'Kuwait',
+        KG: 'Kyrgyzstan',
+        LA: 'Laos',
+        LV: 'Latvia',
+        LB: 'Lebanon',
+        LS: 'Lesotho',
+        LR: 'Liberia',
+        LY: 'Libya',
+        LI: 'Liechtenstein',
+        LT: 'Lithuania',
+        LU: 'Luxembourg',
+        MO: 'Macau',
+        MK: 'Macedonia',
+        MG: 'Madagascar',
+        MW: 'Malawi',
+        MY: 'Malaysia',
+        MV: 'Maldives',
+        ML: 'Mali',
+        MT: 'Malta',
+        MH: 'Marshall Islands',
+        MQ: 'Martinique',
+        MR: 'Mauritania',
+        MU: 'Mauritius',
+        YT: 'Mayotte',
+        MX: 'Mexico',
+        MD: 'Moldova',
+        MC: 'Monaco',
+        MN: 'Mongolia',
+        ME: 'Montenegro',
+        MS: 'Montserrat',
+        MA: 'Morocco',
+        MZ: 'Mozambique',
+        MM: 'Myanmar',
+        NA: 'Namibia',
+        NR: 'Nauru',
+        NP: 'Nepal',
+        NL: 'Netherlands',
+        NC: 'New Caledonia',
+        NZ: 'New Zealand',
+        NI: 'Nicaragua',
+        NE: 'Niger',
+        NG: 'Nigeria',
+        NU: 'Niue',
+        NF: 'Norfolk Island',
+        KP: 'North Korea',
+        MP: 'Northern Mariana Islands',
+        NO: 'Norway',
+        OM: 'Oman',
+        PK: 'Pakistan',
+        PW: 'Palau',
+        PS: 'Palestine',
+        PA: 'Panama',
+        PG: 'Papua New Guinea',
+        PY: 'Paraguay',
+        PE: 'Peru',
+        PH: 'Philippines',
+        PN: 'Pitcairn Islands',
+        PL: 'Poland',
+        PT: 'Portugal',
+        PR: 'Puerto Rico',
+        QA: 'Qatar',
+        RE: 'Reunion',
+        RO: 'Romania',
+        RU: 'Russia',
+        RW: 'Rwanda',
+        SH: 'Saint Helena',
+        KN: 'Saint Kitts and Nevis',
+        LC: 'Saint Lucia',
+        PM: 'Saint Pierre and Miquelon',
+        VC: 'Saint Vincent and the Grenadines',
+        WS: 'Samoa',
+        SM: 'San Marino',
+        ST: 'São Tomé and Príncipe',
+        SA: 'Saudi Arabia',
+        SN: 'Senegal',
+        RS: 'Serbia',
+        SC: 'Seychelles',
+        SL: 'Sierra Leone',
+        SG: 'Singapore',
+        SX: 'Sint Maarten',
+        SK: 'Slovakia',
+        SI: 'Slovenia',
+        SB: 'Solomon Islands',
+        SO: 'Somalia',
+        ZA: 'South Africa',
+        GS: 'South Georgia and the South Sandwich Islands',
+        KR: 'South Korea',
+        SS: 'South Sudan',
+        ES: 'Spain',
+        LK: 'Sri Lanka',
+        SD: 'Sudan',
+        SR: 'Suriname',
+        SJ: 'Svalbard and Jan Mayen',
+        SZ: 'Eswatini',
+        SE: 'Sweden',
+        CH: 'Switzerland',
+        SY: 'Syria',
+        TW: 'Taiwan',
+        TJ: 'Tajikistan',
+        TZ: 'Tanzania',
+        TH: 'Thailand',
+        TL: 'Timor-Leste',
+        TG: 'Togo',
+        TK: 'Tokelau',
+        TO: 'Tonga',
+        TT: 'Trinidad and Tobago',
+        TN: 'Tunisia',
+        TR: 'Turkey',
+        TM: 'Turkmenistan',
+        TC: 'Turks and Caicos Islands',
+        TV: 'Tuvalu',
+        UG: 'Uganda',
+        UA: 'Ukraine',
+        AE: 'United Arab Emirates',
+        GB: 'United Kingdom',
+        US: 'United States',
+        UM: 'United States Minor Outlying Islands',
+        VI: 'United States Virgin Islands',
+        UY: 'Uruguay',
+        UZ: 'Uzbekistan',
+        VU: 'Vanuatu',
+        VA: 'Vatican City',
+        VE: 'Venezuela',
+        VN: 'Vietnam',
+        WF: 'Wallis and Futuna',
+        EH: 'Western Sahara',
+        YE: 'Yemen',
+        ZM: 'Zambia',
+        ZW: 'Zimbabwe'
+      }
     };
   },
   mounted() {
@@ -712,19 +959,19 @@ export default {
   computed: {
     lazyColors() {
       let r = {};
-      if (this.hitColors) {
+      if (this.heatValues) {
         let min = 0;
         let max = 0;
-        for (let c in this.hitColors) {
-          const value = this.hitColors[c];
+        for (let c in this.heatValues) {
+          const value = this.heatValues[c];
           if (value > max) {
             max = value;
           } else if (value < min) {
             min = value;
           }
         }
-        for (let c in this.hitColors) {
-          let a = this.hitColors[c] / (max - min);
+        for (let c in this.heatValues) {
+          let a = this.heatValues[c] / (max - min);
           r[c] = this.getColor(a);
         }
       } else if (this.colors) {
@@ -752,8 +999,8 @@ export default {
   },
   methods: {
     getColor(ratio) {
-      let color1 = { r: 0, g: 0, b: 0 };
-      let color2 = { r: 0, g: 0, b: 0 };
+      let color1 = {r: 0, g: 0, b: 0};
+      let color2 = {r: 0, g: 0, b: 0};
       if (/#/.test(this.maxColor)) {
         const c = this.maxColor.slice(-6);
         color1.r = parseInt(c.substring(0, 2), 16);
@@ -798,6 +1045,7 @@ export default {
       };
     },
     enter(country, e) {
+      this.worldPosition = this.$refs.world.getBoundingClientRect();
       let x = e.clientX - this.worldPosition.x;
       let y = e.clientY - this.worldPosition.y;
       if (x < 20) {
@@ -810,12 +1058,12 @@ export default {
         x: x + "px",
         y: y + 10 + "px",
       };
-      this.tooltip = { country: country };
-      this.$emit('hover',country)
+      this.tooltip = {id: country, country: this.countries[country]};
+      this.$emit('hover', country)
     },
     leave() {
       this.tooltip = null;
-      this.$emit('hover',null)
+      this.$emit('hover', null)
     },
     bindEvent() {
       if (this.$refs.country) {
@@ -839,10 +1087,21 @@ export default {
 .#{$prefix}world-map {
   position: relative;
   background-color: #e7f2fe;
+
+  .country {
+    stroke: #e7f2fe;
+    stroke-width: 1px;
+    stroke-linejoin: round;
+    transition: 0.3s all ease;
+    cursor: pointer;
+    outline: 0
+  }
+
   .country:hover {
-    stroke: #333;
-    stroke-width: 1.5;
+    fill: var(--color-one);
+    opacity: 0.3;
   }
+
   .map-tooltip {
     position: absolute;
     z-index: 1;

package/components/codeEditor/highlightCss.vue

@@ -13,11 +13,14 @@
 </template>
 
 <script>
+import mixin from './mixin'
+
 export default {
   name: "highlight-css",
   props: {
     modelValue: String,
   },
+  mixins: [mixin],
   data() {
     return {
       d: this.modelValue,
@@ -38,128 +41,23 @@ export default {
       if (!this.d) {
         return "";
       }
-      const data = this.d.split("");
-      let res = "";
-      let in_quta = false;
-      data.forEach((c) => {
-        if (["=", "&"].includes(c)) {
-          res += '<span class="color-blue code-editor-span">' + c + "</span>";
-        } else if ([",", ";", ":"].includes(c)) {
-          res += '<span class="color-orange code-editor-span">' + c + "</span>";
-        } else if (parseInt(c) > -1) {
-          res += '<span class="color-number code-editor-span">' + c + "</span>";
-        } else if ((c === '"' || c === "'" || c === "`") && !in_quta) {
-          in_quta = c;
-          res += '<span class="color-green code-editor-span">' + c;
-        } else if (c === in_quta) {
-          in_quta = false;
-          res += c + "</span>";
-        } else {
-          res += c;
-        }
-      });
-
+      let res = this.d
+      res = this.re_quote(res);
+      res = this.re_func(res);
       res = this.re_class(res);
       res = this.re_id(res);
       res = this.re_comment(res);
-
+      res = this.re_special(res, /([{};,:])/g, 'color-func2');
       return res;
     },
   },
   methods: {
-    setTab(event) {
-      if (event.key === "'" || event.key === '"') {
-        const end = event.target.selectionEnd;
-        event.preventDefault()
-        document.execCommand('insertText', false, event.key.repeat(2));
-        event.target.selectionEnd = end + 1;
-        return false;
-      }
-      if (event.key === "{") {
-        const end = event.target.selectionEnd;
-        event.preventDefault()
-        document.execCommand('insertText', false, '{}');
-        event.target.selectionEnd = end + 1;
-        return false;
-      }
-      if (event.key === "(") {
-        const end = event.target.selectionEnd;
-        event.preventDefault()
-        document.execCommand('insertText', false, '()');
-        event.target.selectionEnd = end + 1;
-        return false;
-      }
-      if (event.key === "[") {
-        const end = event.target.selectionEnd;
-        event.preventDefault()
-        document.execCommand('insertText', false, '[]');
-        event.target.selectionEnd = end + 1;
-        return false;
-      }
-      if (event.keyCode === 9) {
-        event.preventDefault()
-        document.execCommand('insertText', false, ' '.repeat(4));
-        return false;
-      }
-      if (event.keyCode === 13) {
-        event.preventDefault()
-        let n = event.target.value.substr(0, event.target.selectionStart).split('\n')
-        n = n[n.length - 1].split('')
-        let w = ''
-        for (let i = 0; i < n.length; i++) {
-          if (n[i] === ' ') {
-            w += ' '
-          } else {
-            break
-          }
-        }
-
-        document.execCommand('insertText', false, '\n' + w);
-        return false;
-      }
-      return true
-    },
     re_class(res) {
-      let regex = /\.-?[_a-zA-Z]+[_a-zA-Z0-9-]*\s*\{/g;
-      let matched = res.matchAll(regex);
-      for (const match of matched) {
-        res = this.$helper.replacer(
-            res,
-            match[0],
-            '<span class="color-func2 code-editor-span">' +
-            match[0].slice(0, match[0].indexOf("{")) +
-            "</span>{"
-        );
-      }
-      return res;
+      return res = res.replace(/(\.+[_a-zA-Z0-9-:#{}$].*)\{/g, '<span class="color-func2 code-editor-span">$1</span>{')
     },
     re_id(res) {
-      let regex = /#-?[_a-zA-Z]+[_a-zA-Z0-9-]*\s*\{/g;
-      let matched = res.matchAll(regex);
-      for (const match of matched) {
-        res = this.$helper.replacer(
-            res,
-            match[0],
-            '<span class="color-func2 code-editor-span">' +
-            match[0].slice(0, match[0].indexOf("{")) +
-            "</span>{"
-        );
-      }
-      return res;
-    },
-    re_comment(res) {
-      //eslint-disable-next-line
-      let regex = /(\/\*[\w\'\s\r\n\*]*\*\/)|(\/\/[\w\s\']*)/g;
-      let matched = res.matchAll(regex);
-      for (const match of matched) {
-        res = this.$helper.replacer(
-            res,
-            match[0],
-            '<span class="color-comment code-editor-span">' + match[0] + "</span>"
-        );
-      }
-      return res;
-    },
+      return res = res.replace(/(#+[_a-zA-Z0-9-:#{}$].*)\{/g, '<span class="color-func2 code-editor-span">$1</span>{')
+    }
   },
 };
 </script>