xianniu-ui 0.8.38 → 0.8.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.8.38",
+  "version": "0.8.40",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/table/column.vue

@@ -46,7 +46,7 @@
               :key="idxBtn"
               :confirm-button-text="itemBtn.options.confirmButtonText"
               class="ml-10"
-              @confirm="handleClick(itemBtn.method, row, $index)"
+              @confirm="handleClick(itemBtn.method, row, $index, $event)"
             >
               <el-button
                 :type="itemBtn.type || 'text'"
@@ -66,7 +66,9 @@
                 :size="itemBtn.size || 'mini'"
                 :icon="itemBtn.icon"
                 :plain="itemBtn.plain"
-                @click.native.stop="handleClick(itemBtn.method, row, $index)"
+                @click.native.stop="
+                  handleClick(itemBtn.method, row, $index, $event)
+                "
                 >{{ label(itemBtn, row) }}</el-button
               >
             </template>
@@ -102,11 +104,15 @@ export default {
     },
   },
   computed: {
-    showOverflowTooltip(){
-      return (attrs)=>{
-        const showTip = (attrs['showOverflowTooltip'] != undefined && attrs['showOverflowTooltip'] !== true) || (attrs['show-overflow-tooltip'] != undefined && attrs['show-overflow-tooltip'] !== true) 
-        return attrs.more ? false : showTip ? !showTip : true
-      }
+    showOverflowTooltip() {
+      return (attrs) => {
+        const showTip =
+          (attrs["showOverflowTooltip"] != undefined &&
+            attrs["showOverflowTooltip"] !== true) ||
+          (attrs["show-overflow-tooltip"] != undefined &&
+            attrs["show-overflow-tooltip"] !== true);
+        return attrs.more ? false : showTip ? !showTip : true;
+      };
     },
     label() {
       return (itemBtn, row) => {
@@ -127,12 +133,13 @@ export default {
 
   watch: {},
   methods: {
-    handleClick(method, row, index) {
+    handleClick(method, row, index, ev) {
       if (this.$parent) {
         this.$parent.$emit("handle-buttons", {
           method,
           row,
           index,
+          ev,
         });
       }
     },

package/src/utils/utils.js

@@ -198,7 +198,32 @@ export const toCamelCase = (string)=> {
   return camelCaseString;
 }
 
+export function assignValues(form, apiResponse) {
+  function isEmpty(value) {
+    return (
+      (Array.isArray(value) && value.length === 0) ||
+      (typeof value === 'object' && Object.keys(value).length === 0)
+    )
+  }
+
+  const updatedForm = Array.isArray(form) ? [...form] : { ...form }
+
+  for (const key in form) {
+    if (Object.hasOwnProperty.call(form, key)) {
+      const apiValue = apiResponse[key]
+
+      // 检查 apiValue 是否是一个对象，如果是，则递归
+      if (typeof apiValue === 'object' && apiValue !== null && !Array.isArray(apiValue)) {
+        updatedForm[key] = assignValues(form[key], apiValue)
+      } else if (apiValue !== null && apiValue !== undefined && apiValue !== '' && !isEmpty(apiValue)) {
+        // 如果 apiValue 不是空值及不是空的对象或数组，更新 updatedForm
+        updatedForm[key] = apiValue
+      }
+    }
+  }
 
+  return updatedForm
+}
 export default {
   isEmpty,
   isImg,
@@ -209,5 +234,6 @@ export default {
   isBlank,
   toCamelCase,
   checkFile,
-  isAV
+  isAV,
+  assignValues
 }