n20-common-lib 2.7.0-beta.22 → 2.7.0-beta.24

package/package.json

@@ -1,25 +1,26 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.0-beta.22",
+  "version": "2.7.0-beta.24",
   "private": false,
-  "main": "src/index.js",
   "scripts": {
-    "dev": "vue-cli-service serve --doc",
-    "build:docs": "vue-cli-service build --doc",
     "serve": "vue-cli-service serve",
-    "serve:theme": "vue-cli-service serve --testTheme",
-    "test": "vue-cli-service serve --test",
     "build": "node versionInfo.js && npm run build:css && vue-cli-service build --testTheme",
+    "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
-    "info": "node versionInfo.js",
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
-    "build:gzip": "vue-cli-service build --gzip",
-    "build:report": "vue-cli-service build --analy",
     "build:css": "node build_css",
-    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
     "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
-    "getI18n": "node ./node_modules/nstc-get-i18n"
+    "build:docs": "vue-cli-service build --doc",
+    "build:gzip": "vue-cli-service build --gzip",
+    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
+    "build:report": "vue-cli-service build --analy",
+    "dev": "vue-cli-service serve --doc",
+    "getI18n": "node ./node_modules/nstc-get-i18n",
+    "info": "node versionInfo.js",
+    "serve:theme": "vue-cli-service serve --testTheme",
+    "test": "vue-cli-service serve --test"
   },
+  "main": "src/index.js",
   "files": [
     "src/_qiankun",
     "src/assets",
@@ -59,17 +60,22 @@
     "qrcode": "*",
     "resize-detector": "*",
     "strip-json-comments": "*",
+    "vuedraggable": "*",
     "v-viewer": "1.6.4",
-    "vuedraggable": "*"
+    "xe-utils": "^3.5.11"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/plugin-transform-flow-comments": "^7.14.5",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-plugin-unit-jest": "^5.0.8",
     "@vue/cli-service": "~4.5.0",
     "@vue/compiler-dom": "^3.2.47",
+    "@vue/test-utils": "^1.1.3",
+    "@vue/vue2-jest": "^27.0.0-alpha.2",
     "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.0.6",
     "babel-plugin-component": "^1.1.1",
     "clipboard": "^2.0.11",
     "compression-webpack-plugin": "^3.1.0",
@@ -83,6 +89,7 @@
     "file-saver": "^2.0.5",
     "fuse.js": "^6.6.2",
     "html-webpack-tags-plugin": "^2.0.17",
+    "jest": "^27.0.5",
     "jszip": "^3.10.0",
     "lodash": "^4.17.21",
     "md2vue-loader": "file:./md2vue-loader",
@@ -103,12 +110,12 @@
     "vue": "^2.6.11",
     "vue-cli-plugin-axios": "~0.0.4",
     "vue-grid-layout": "^2.3.12",
+    "vue-jest": "^3.0.7",
     "vue-router": "^3.5.2",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.6.2",
     "vxe-table": "^3.6.17",
     "webpack-bundle-analyzer": "^3.9.0",
-    "xe-utils": "^3.5.11",
     "xlsx": "0.14.1",
     "xlsx-style": "^0.8.13"
   },
@@ -117,4 +124,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/_qiankun/index.js

@@ -113,6 +113,11 @@ export async function bootstrap() {
 }
 export async function mount(props) {
   // console.log('[vue] props from main framework', props)
+  props?.onGlobalStateChange((state) => {
+    // state: 变更后的状态; prev 变更前的状态
+    // console.log('onGlobalStateChange111', state, prev)
+    vuePar?.store?.commit('MP/setGlobalState', state)
+  }, true)
   /* 从其他子运用再切回这个运用,是否保持之前的状态 */
   KEEP_ALIVE && !props.router ? _mountKeep(props) : _mount(props)
 }

package/src/_qiankun/postMessage.js

@@ -1,4 +1,4 @@
-import { addTab, closeTab, setTabName, refreshTab } from '../utils/handleTab.js'
+import { addTab, closeTab, refreshTab, setTabName } from '../utils/handleTab.js'
 
 const PM = {
   namespaced: true,
@@ -17,6 +17,9 @@ const PM = {
     },
     refreshTab(state, opt) {
       refreshTab(opt)
+    },
+    setGlobalState(state, data) {
+      Object.assign(state, data)
     }
   }
 }

package/src/assets/css/advanced-filter.scss

@@ -1,156 +1,3 @@
-// &-item {
-//   position: relative;
-//   display: inline-block;
-//   vertical-align: middle;
-//   max-width: 426px;
-//   margin-right: 8px;
-//   padding-left: 8px;
-//   border-radius: 4px;
-//   border: 1px solid #dcdfe5;
-//   background: #fff;
-//   cursor: pointer;
-
-//   &__name {
-//     display: inline-block;
-//     vertical-align: middle;
-//     white-space: nowrap;
-//     overflow: hidden;
-//     max-width: 168px;
-//     margin-right: 6px;
-//     color: #182b50;
-//   }
-
-//   &__value {
-//     display: inline-block;
-//     vertical-align: middle;
-//     white-space: nowrap;
-//     overflow: hidden;
-//     text-overflow: ellipsis;
-//     max-width: 312px;
-
-//     //margin-right: 14px;
-//     .el-input .el-input__inner {
-//       border: none;
-//       padding-left: 0;
-//       background-color: transparent;
-//     }
-
-//     .el-input__inner:focus {
-//       box-shadow: none;
-//     }
-
-//   }
-
-//   .filter_remove {
-//     display: none;
-//     position: absolute;
-//     height: 13px;
-//     width: 13px;
-//     background: #f1f1f1;
-//     right: -5px;
-//     top: -7px;
-//     font-size: 14px;
-//     z-index: 1;
-//     border-radius: 50%;
-//     cursor: pointer;
-//   }
-
-//   &:hover {
-//     .filter_remove {
-//       display: block;
-//     }
-//   }
-
-
-
-//   .el-form-item__label {
-//     padding: 0;
-//     display: inline-block;
-//     vertical-align: middle;
-//     white-space: nowrap;
-//     overflow: hidden;
-//     text-overflow: ellipsis;
-//     margin-right: 4px;
-//   }
-
-
-//   .el-range-editor.el-input__inner {
-//     min-width: 168px;
-//     max-width: 224px;
-
-//     .el-range-input {
-//       background-color: transparent;
-//     }
-//   }
-
-//   .n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
-//     min-width: 168px;
-//     max-width: 380px;
-//   }
-
-//   .n20-date-editor .el-input__prefix {
-//     display: none;
-//   }
-
-//   .el-input,
-//   .el-input__inner {
-//     border: none;
-//     width: 100%;
-//     background-color: transparent;
-//   }
-
-
-
-//   .el-input__inner:active,
-//   .el-input__inner:focus {
-//     box-shadow: none;
-//     border: none;
-//     border-color: #fff;
-//   }
-
-//   .el-checkbox-group {
-//     height: 32px;
-//     line-height: 32px;
-//     vertical-align: middle;
-//     padding: 0 10px;
-//   }
-
-//   .el-radio-group {
-//     padding: 0 10px;
-//   }
-
-//   .n20-num-w {
-//     padding-left: 5px;
-
-//     .el-input,
-//     .el-input__inner {
-//       padding-left: 0;
-//     }
-
-//     .el-input--suffix .el-input__inner {
-//       padding-right: 26px;
-//     }
-//   }
-
-//   .n20-numberRange {
-//     padding-right: 8px;
-//   }
-
-//   &-close {
-//     display: none;
-//     position: absolute;
-//     top: -6px;
-//     right: -20px;
-//   }
-
-//   &:hover {
-//     .n20-advanced-filter-item-close {
-//       display: inline-block;
-//     }
-//   }
-// }
-
-
 .n20-advanced-filter {
   box-sizing: border-box;
   position: relative;
@@ -254,6 +101,10 @@
       padding: 0 10px;
     }
 
+    .el-date-editor .el-range-separator {
+      padding: 0;
+    }
+
     .n20-num-w {
       // padding-left: 5px;
 

package/src/assets/css/cl-layout-header.scss

@@ -303,7 +303,7 @@ $--header-color: #3d4a57;
   align-items: center;
 
   &_drawer_box {
-    width: 992px;
+    width: 1024px;
   }
 
   &_drawer_layout {
@@ -318,6 +318,7 @@ $--header-color: #3d4a57;
     &_title {
 
       display: inline-block;
+      font-weight: 700;
       padding: 4px;
 
       &:hover {
@@ -334,7 +335,6 @@ $--header-color: #3d4a57;
 
   &-first-item {
     flex: 0 0 33.33%;
-    margin-bottom: 8px;
 
     &_title {
 

package/src/assets/css/font-icon.scss

@@ -1,4 +1,4 @@
-
+@import url('../iconFont/iconfont.css');
 
 .n20-icon- {
   font-family: 'core-lib-iconfont' !important;
@@ -34,7 +34,7 @@
   margin-left: 5px;
 }
 
-@import url('../iconFont/iconfont.css');
+
 @import url('../iconFont2/iconfont.css');
 
 .iconfont {

package/src/assets/iconFont/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon core-lib-iconfont">&#xe630;</span>
+                <div class="name">越南语言切换_画板 1</div>
+                <div class="code-name">&amp;#xe630;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon core-lib-iconfont">&#xe62f;</span>
                 <div class="name">语言切换</div>
@@ -624,9 +630,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'core-lib-iconfont';
-  src: url('iconfont.woff2?t=1710992109527') format('woff2'),
-       url('iconfont.woff?t=1710992109527') format('woff'),
-       url('iconfont.ttf?t=1710992109527') format('truetype');
+  src: url('iconfont.woff2?t=1711971557024') format('woff2'),
+       url('iconfont.woff?t=1711971557024') format('woff'),
+       url('iconfont.ttf?t=1711971557024') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -652,6 +658,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon core-lib-iconfont n20-icon-a-yuenanyuyanqiehuan_huaban1"></span>
+            <div class="name">
+              越南语言切换_画板 1
+            </div>
+            <div class="code-name">.n20-icon-a-yuenanyuyanqiehuan_huaban1
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon core-lib-iconfont n20-icon-yuyanqiehuan"></span>
             <div class="name">
@@ -1507,6 +1522,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#n20-icon-a-yuenanyuyanqiehuan_huaban1"></use>
+                </svg>
+                <div class="name">越南语言切换_画板 1</div>
+                <div class="code-name">#n20-icon-a-yuenanyuyanqiehuan_huaban1</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#n20-icon-yuyanqiehuan"></use>

package/src/assets/iconFont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "core-lib-iconfont"; /* Project id 2782772 */
-  src: url('iconfont.woff2?t=1710992109527') format('woff2'),
-       url('iconfont.woff?t=1710992109527') format('woff'),
-       url('iconfont.ttf?t=1710992109527') format('truetype');
+  src: url('iconfont.woff2?t=1711971557024') format('woff2'),
+       url('iconfont.woff?t=1711971557024') format('woff'),
+       url('iconfont.ttf?t=1711971557024') format('truetype');
 }
 
 .core-lib-iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.n20-icon-a-yuenanyuyanqiehuan_huaban1:before {
+  content: "\e630";
+}
+
 .n20-icon-yuyanqiehuan:before {
   content: "\e62f";
 }