From 020b912599f73760bf5d81c42e2fbc0249e7f4db Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiaox0053@163.com>
Date: Fri, 3 Mar 2023 16:03:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/component?=
 =?UTF-8?q?s/jero/JAreaLinkage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JAreaLinkage.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jero-web/src/components/jero/JAreaLinkage.vue b/jero-web/src/components/jero/JAreaLinkage.vue
index 639daaa6..5e9d7879 100644
--- a/jero-web/src/components/jero/JAreaLinkage.vue
+++ b/jero-web/src/components/jero/JAreaLinkage.vue
@@ -105,8 +105,7 @@ export default {
         this.innerValue = []
       } else {
         this.initAreaData()
-        const arr = this.areaData.getRealCode(value)
-        this.innerValue = arr
+        this.innerValue = this.areaData.getRealCode(value)
       }
       this.reload()
     },

From 650a61685aa5b3f9f7e112682883a9f55d4890d8 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiaox0053@163.com>
Date: Fri, 3 Mar 2023 16:35:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/component?=
 =?UTF-8?q?s/jero/JCategorySelect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/.eslintrc.js                         |  3 ++-
 .../src/components/jero/JCategorySelect.vue   | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/jero-web/.eslintrc.js b/jero-web/.eslintrc.js
index 83e00e47..722ef7c8 100644
--- a/jero-web/.eslintrc.js
+++ b/jero-web/.eslintrc.js
@@ -15,6 +15,7 @@ module.exports = {
       'avoidEscape': true,
       'allowTemplateLiterals': true
     }],
-    'semi': [2, 'never']
+    'semi': [2, 'never'],
+    'prefer-promise-reject-errors': 'warn'
   }
 }
diff --git a/jero-web/src/components/jero/JCategorySelect.vue b/jero-web/src/components/jero/JCategorySelect.vue
index 6b1dce79..8c6aec8f 100644
--- a/jero-web/src/components/jero/JCategorySelect.vue
+++ b/jero-web/src/components/jero/JCategorySelect.vue
@@ -81,13 +81,10 @@ export default {
   },
   computed: {
     _attrs () {
-      let attrs
-      attrs = { ...this.$attrs }
-      return attrs
+      return { ...this.$attrs }
     },
     // 透传给下级组件的事件，需要排除本组件使用的change事件
     childListeners () {
-      const vm = this
       const result = Object.assign({},
         this.$listeners
       )
@@ -121,9 +118,9 @@ export default {
         if (res.success && res.result) {
           for (const i of res.result) {
             i.value = i.key
-            if (i.leaf == false) {
+            if (i.leaf === false) {
               i.isLeaf = false
-            } else if (i.leaf == true) {
+            } else if (i.leaf === true) {
               i.isLeaf = true
             }
           }
@@ -136,7 +133,7 @@ export default {
 
     /** 数据回显 */
     loadItemByCode () {
-      if (!this.value || this.value == '0') {
+      if (!this.value || this.value === '0') {
         this.treeValue = []
       } else {
         getAction(this.view, { ids: this.value }).then(res => {
@@ -185,9 +182,9 @@ export default {
           if (res.success) {
             for (const i of res.result) {
               i.value = i.key
-              if (i.leaf == false) {
+              if (i.leaf === false) {
                 i.isLeaf = false
-              } else if (i.leaf == true) {
+              } else if (i.leaf === true) {
                 i.isLeaf = true
               }
             }
@@ -201,8 +198,8 @@ export default {
     addChildren (pid, children, treeArray) {
       if (treeArray && treeArray.length > 0) {
         for (const item of treeArray) {
-          if (item.key == pid) {
-            if (!children || children.length == 0) {
+          if (item.key + '' === pid + '') {
+            if (!children || children.length === 0) {
               item.isLeaf = true
             } else {
               item.children = children

From d5cbb3e5b8324f334ada0bddc7d74ae38da6b51f Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiaox0053@163.com>
Date: Fri, 3 Mar 2023 16:38:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/component?=
 =?UTF-8?q?s/jero/JCodeEditor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JCodeEditor.vue | 222 +++++++++----------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/jero-web/src/components/jero/JCodeEditor.vue b/jero-web/src/components/jero/JCodeEditor.vue
index cc8111e2..fb09a8ec 100644
--- a/jero-web/src/components/jero/JCodeEditor.vue
+++ b/jero-web/src/components/jero/JCodeEditor.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-bind="fullScreenParentProps">
-    <a-icon v-if="fullScreen" class="full-screen-icon" :type="iconType" @click="()=>fullCoder=!fullCoder"/>
+    <a-icon v-if="fullScreen" class="full-screen-icon" :type="iconType" @click="()=>fullCoder=!fullCoder" />
 
     <div class="code-editor-cust full-screen-child">
       <textarea ref="textarea"></textarea>
@@ -284,11 +284,7 @@ export default {
       // 支持双向绑定
       this.coder.on('change', (coder) => {
         this.code = coder.getValue()
-        if (this.code) {
-          this.hasCode = true
-        } else {
-          this.hasCode = false
-        }
+        this.hasCode = !!this.code
         if (this.$emit) {
           this.$emit('input', this.code)
         }
@@ -297,11 +293,7 @@ export default {
         this.hasCode = true
       })
       this.coder.on('blur', () => {
-        if (this.code) {
-          this.hasCode = true
-        } else {
-          this.hasCode = false
-        }
+        this.hasCode = !!this.code
       })
 
       /* this.coder.on('cursorActivity',()=>{
@@ -364,119 +356,127 @@ export default {
 </script>
 
 <style lang="less">
-  .code-editor-cust{
-    flex-grow:1;
-    display:flex;
-    position:relative;
-    height:100%;
-    .CodeMirror{
-      flex-grow:1;
-      z-index:1;
-      .CodeMirror-code{
-        line-height:19px;
-      }
+.code-editor-cust {
+  flex-grow: 1;
+  display: flex;
+  position: relative;
+  height: 100%;
 
+  .CodeMirror {
+    flex-grow: 1;
+    z-index: 1;
+
+    .CodeMirror-code {
+      line-height: 19px;
     }
-    .code-mode-select{
-      position:absolute;
-      z-index:2;
-      right:10px;
-      top:10px;
-      max-width:130px;
-    }
-    .CodeMirror{
-      height: auto;
-      min-height:100%;
-    }
-    .null-tip{
-      position: absolute;
-      top: 4px;
-      left: 36px;
-      z-index: 10;
-      color: #ffffffc9;
-      line-height: initial;
-    }
-    .null-tip-hidden{
-      display: none;
-    }
-    /**选中样式偶然出现高度不够的情况*/
-    .CodeMirror-selected{
-      min-height: 19px !important;
+
+  }
+
+  .code-mode-select {
+    position: absolute;
+    z-index: 2;
+    right: 10px;
+    top: 10px;
+    max-width: 130px;
+  }
+
+  .CodeMirror {
+    height: auto;
+    min-height: 100%;
+  }
+
+  .null-tip {
+    position: absolute;
+    top: 4px;
+    left: 36px;
+    z-index: 10;
+    color: #ffffffc9;
+    line-height: initial;
+  }
+
+  .null-tip-hidden {
+    display: none;
+  }
+
+  /**选中样式偶然出现高度不够的情况*/
+
+  .CodeMirror-selected {
+    min-height: 19px !important;
+  }
+}
+
+/* 全屏样式 */
+.full-screen-parent {
+  position: relative;
+
+  .full-screen-icon {
+    opacity: 0;
+    color: black;
+    width: 20px;
+    height: 20px;
+    line-height: 24px;
+    background-color: white;
+    position: absolute;
+    top: 2px;
+    right: 2px;
+    z-index: 9;
+    cursor: pointer;
+    transition: opacity 0.3s;
+  }
+
+  &:hover {
+    .full-screen-icon {
+      opacity: 1;
+
+      &:hover {
+        background-color: rgba(255, 255, 255, 0.88);
+      }
     }
   }
 
-  /* 全屏样式 */
-  .full-screen-parent {
-    position: relative;
+  &.full-screen {
+    position: fixed;
+    top: 10px;
+    left: 10px;
+    width: calc(100% - 20px);
+    height: calc(100% - 20px);
+    padding: 10px;
+    background-color: #f5f5f5;
 
     .full-screen-icon {
-      opacity: 0;
-      color: black;
-      width: 20px;
-      height: 20px;
-      line-height: 24px;
-      background-color: white;
-      position: absolute;
-      top: 2px;
-      right: 2px;
-      z-index: 9;
-      cursor: pointer;
-      transition: opacity 0.3s;
-    }
-
-    &:hover {
-      .full-screen-icon {
-        opacity: 1;
-
-        &:hover {
-          background-color: rgba(255, 255, 255, 0.88);
-        }
-      }
-    }
-
-    &.full-screen {
-      position: fixed;
-      top: 10px;
-      left: 10px;
-      width: calc(100% - 20px);
-      height: calc(100% - 20px);
-      padding: 10px;
-      background-color: #f5f5f5;
-
-      .full-screen-icon {
-        top: 12px;
-        right: 12px;
-      }
-
-      .full-screen-child {
-        height: 100%;
-        max-height: 100%;
-        min-height: 100%;
-      }
+      top: 12px;
+      right: 12px;
     }
 
     .full-screen-child {
       height: 100%;
+      max-height: 100%;
+      min-height: 100%;
     }
-
-    &.auto-height {
-      .full-screen-child {
-        min-height: 120px;
-        max-height: 320px;
-        height: unset;
-        overflow: hidden;
-      }
-
-      &.full-screen .full-screen-child {
-        height: 100%;
-        max-height: 100%;
-        min-height: 100%;
-      }
-    }
-
   }
 
-.CodeMirror-cursor{
-  height:18.4px !important;
+  .full-screen-child {
+    height: 100%;
+  }
+
+  &.auto-height {
+    .full-screen-child {
+      min-height: 120px;
+      max-height: 320px;
+      height: unset;
+      overflow: hidden;
+    }
+
+    &.full-screen .full-screen-child {
+      height: 100%;
+      max-height: 100%;
+      min-height: 100%;
+    }
+  }
+
+}
+
+.CodeMirror-cursor {
+  height: 18.4px !important;
 }
 </style>