xianniu-ui 0.9.3 → 0.9.5

package/package.json

@@ -1,65 +1,68 @@
-{
-  "name": "xianniu-ui",
-  "version": "0.9.3",
-  "private": false,
-  "main": "lib/xianniu-ui.umd.min.js",
-  "scripts": {
-    "dev": "cross-env NODE_ENV=development vue-cli-service serve",
-    "build": "cross-env NODE_ENV=production vue-cli-service build",
-    "build:lib": "npm run style && cross-env NODE_ENV=production vue-cli-service build --target lib --name xianniu-ui --dest lib src/index.js && cp-cli packages/style/lib lib/style && cp-cli packages/style/src/theme lib/style/theme",
-    "style": "gulp --gulpfile ./packages/style/gulpfile.js",
-    "play": "cross-env NODE_ENV=development PLAY_ENV=true vue-cli-service serve",
-    "deploy": "bash deploy.sh",
-    "lint": "vue-cli-service lint",
-    "release": "node ./build/release.js"
-  },
-  "license": "MIT",
-  "files": [
-    "lib",
-    "src",
-    "packages",
-    "plugins",
-    "public"
-  ],
-  "dependencies": {
-    "ali-oss": "^6.17.1",
-    "core-js": "^3.6.5",
-    "uuid": "^9.0.0",
-    "vue": "^2.7.14",
-    "vue-lottie": "^0.2.1",
-    "vue-router": "^3.2.0",
-    "vuex": "^3.6.2"
-  },
-  "devDependencies": {
-    "@babel/preset-env": "^7.16.7",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/component-compiler-utils": "^2.6.0",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-component": "^1.1.1",
-    "babel-plugin-module-resolver": "^2.7.1",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "copy-webpack-plugin": "^5.1.2",
-    "cp-cli": "^2.0.0",
-    "cross-env": "^7.0.3",
-    "element-ui": "^2.15.13",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "highlight.js": "^9.3.0",
-    "html-loader": "^3.0.1",
-    "inquirer": "^8.2.6",
-    "markdown-it": "^8.4.2",
-    "markdown-it-anchor": "^5.3.0",
-    "markdown-it-chain": "^1.3.0",
-    "markdown-it-container": "^2.0.0",
-    "markdown-loader": "^6.0.0",
-    "mini-css-extract-plugin": "^0.4.1",
-    "sass": "^1.32.6",
-    "sass-loader": "^8.0.2",
-    "shelljs": "^0.8.5",
-    "transliteration": "^1.1.11",
-    "vue-template-compiler": "^2.7.14"
-  }
-}
+{
+  "name": "xianniu-ui",
+  "version": "0.9.5",
+  "private": false,
+  "main": "lib/xianniu-ui.umd.min.js",
+  "scripts": {
+    "dev": "cross-env NODE_ENV=development vue-cli-service serve",
+    "build": "cross-env NODE_ENV=production vue-cli-service build",
+    "build:lib": "npm run style && cross-env NODE_ENV=production vue-cli-service build --target lib --name xianniu-ui --dest lib src/index.js && cp-cli packages/style/lib lib/style && cp-cli packages/style/src/theme lib/style/theme",
+    "style": "gulp --gulpfile ./packages/style/gulpfile.js",
+    "play": "cross-env NODE_ENV=development PLAY_ENV=true vue-cli-service serve",
+    "deploy": "bash deploy.sh",
+    "lint": "vue-cli-service lint",
+    "release": "node ./build/release.js"
+  },
+  "license": "MIT",
+  "files": [
+    "lib",
+    "src",
+    "packages",
+    "plugins",
+    "public"
+  ],
+  "dependencies": {
+    "ali-oss": "^6.17.1",
+    "core-js": "^3.6.5",
+    "uuid": "^9.0.0",
+    "vue": "^2.7.14",
+    "vue-lottie": "^0.2.1",
+    "vue-router": "^3.2.0",
+    "vuex": "^3.6.2"
+  },
+  "devDependencies": {
+    "@babel/preset-env": "^7.16.7",
+    "@vue/cli-plugin-babel": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-plugin-router": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
+    "@vue/component-compiler-utils": "^2.6.0",
+    "babel-eslint": "^10.1.0",
+    "babel-plugin-component": "^1.1.1",
+    "babel-plugin-module-resolver": "^2.7.1",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "copy-webpack-plugin": "^5.1.2",
+    "cp-cli": "^2.0.0",
+    "cross-env": "^7.0.3",
+    "element-ui": "^2.15.13",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "highlight.js": "^9.3.0",
+    "html-loader": "^3.0.1",
+    "inquirer": "^8.2.6",
+    "markdown-it": "^8.4.2",
+    "markdown-it-anchor": "^5.3.0",
+    "markdown-it-chain": "^1.3.0",
+    "markdown-it-container": "^2.0.0",
+    "markdown-loader": "^6.0.0",
+    "mini-css-extract-plugin": "^0.4.1",
+    "sass": "^1.32.6",
+    "sass-loader": "^8.0.2",
+    "shelljs": "^0.8.5",
+    "transliteration": "^1.1.11",
+    "vue-template-compiler": "^2.7.14"
+  },
+  "volta": {
+    "node": "16.13.0"
+  }
+}

package/packages/table/main.vue

@@ -98,6 +98,7 @@
         label="序号"
         v-if="index && data.length"
         type="index"
+        :index="handleIndex"
       ></el-table-column>
       <slot>
         <column
@@ -206,6 +207,15 @@ export default {
     isRadio() {
       return this.type === "radio" || this.radio;
     },
+    handleIndex() {
+      return (index) => {
+        if (this.page && this.page.pageNum) {
+          return (this.page.pageNum - 1) * this.page.pageSize + index + 1;
+        } else {
+          return index + 1;
+        }
+      };
+    },
   },
   created() {},
   updated() {

package/src/utils/utils.js

@@ -131,7 +131,7 @@ const getFileNameFromUrl = function(url){
 }
 
 /**
- * 根据某个key 对数组去重合并
+ * 根据某个key 对数组去重合并，忽略空值属性
  * @param {array} arr 需要合并的数组
  * @param {string} key 传入要合并的key ，如果是多个key，传入数组
  * @return {array} result
@@ -145,18 +145,31 @@ const arrMerge = (arr = [], key = '') => {
   }
   if (!arr.length) return []
 
-  // 生成复合键的工具函数
-  const getKey = (item) => keys.map(k => item[k]).join('|')
+  // 生成复合键的工具函数，跳过空值属性
+  const getKey = (item) => {
+    return keys
+      .filter(k => item[k] !== null && item[k] !== undefined && item[k] !== '') // 过滤掉空值属性
+      .map(k => item[k])
+      .join('|')
+  }
+  
   const result = []
   const map = {}
 
   for (const item of arr) {
     const compositeKey = getKey(item)
-
+    
+    // 如果所有指定属性都为空，则跳过该项
+    if (!compositeKey) continue
+    
     if (!map[compositeKey]) {
       const resultItem = { children: [item] }
+      
+      // 只添加非空属性到结果对象
       keys.forEach(k => {
-        resultItem[k] = item[k]
+        if (item[k] !== undefined && item[k] !== null && item[k] !== '') {
+          resultItem[k] = item[k]
+        }
       })
 
       result.push(resultItem)
@@ -168,6 +181,7 @@ const arrMerge = (arr = [], key = '') => {
 
   return result
 }
+
 // 判空
 const isBlank = (str) => {
   if (str === null || (!str && str !== 0)) {