web-component-gallery 2.3.3 → 2.3.5

package/lib/model/Model.js

@@ -48,14 +48,22 @@ export default {
       }
     },
     formAttrs() {
-      const attr =
-        this.layout === 'vertical' ?
-        this.$attrs :
-        {
-          ...this.getDefaultFormAttrs(),
-          ...this.$attrs
+      const baseAttrs = {
+        // 是否禁用表单，默认否
+        disabled: false,
+        ...this.$attrs
+      }
+      
+      // 如果不是垂直布局，则添加标签列和包装列的配置
+      if (this.layout !== 'vertical') {
+        return {
+          labelCol: { span: 4 },
+          wrapperCol: { span: 20 },
+          ...baseAttrs
         }
-      return attr
+      }
+      
+      return baseAttrs
     },
     dynamicFormRules() {
       const formRules = {}
@@ -82,13 +90,6 @@ export default {
     this.$emit('update:refForm', this.$refs.FormModel)
   },
   methods: {
-    getDefaultFormAttrs() {
-      return {
-        labelCol: { span: 4 },
-        wrapperCol: { span: 20 }
-      }
-    },
-    
     renderSingleFormItem(h, props) {
       return setFormItem.call(this, h, this.form, props)
     }, 
@@ -108,7 +109,7 @@ export default {
           return setFormItem.call(this, h, modelItem, configItem, childAttrs)
         })
       })
-    },
+    }, 
     
     setModelRender(h, props) {
       const dynamicModel = this.form[props.model]

package/lib/model/utils/render.js

@@ -9,10 +9,12 @@ const FormModelItem = FormModel.Item
  * @param {number} layoutSize - 一行显示的表单项数量
  * @param {number} [gap=24] - 表单项间距
  * @returns {string} - 计算后的CSS样式
- */ 
+ */
 export function getFormWidth(child, layoutSize, gap = 24) {
   const width = (100 / layoutSize) * (child.size ?? 1)
-  if (this.layout === 'vertical') return `flex: 0 1 calc(${width}% - ${gap}px); margin-right: ${gap}px;`
+  if (this.layout === 'vertical') {
+    return `flex: 0 1 calc(${width}% - ${gap}px); margin-right: ${gap}px;`
+  }
   return `flex: 0 1 ${width}%;`
 }
 
@@ -32,24 +34,26 @@ export function setFormItemRule(node, nodeParent = {}) {
     (node.label || '')
 
   // 基础规则
-  const baseRules = [
-    {
+  const baseRules = []
+
+  if (required) {
+    baseRules.push({
       required,
       message,
       trigger: ['change', 'blur']
-    }
-  ]
+    })
+  }
 
   // 合并自定义规则
-  const customRules = (node.rules || []).filter(rule => {
-    if (rule.pattern) {
-      rule.pattern = new RegExp(rule.pattern)
+  const customRules = (node.rules || []).map(rule => {
+    if (rule.pattern && typeof rule.pattern === 'string') {
+      return { ...rule, pattern: new RegExp(rule.pattern) }
     }
     return rule
   })
 
   return [...baseRules, ...customRules]
-}
+} 
 
 /**
  * 动态渲染表单项
@@ -60,13 +64,14 @@ export function setFormItemRule(node, nodeParent = {}) {
  * @returns {VNode} - 渲染结果
  */
 export function setFormItem(h, vModel, child, childAttrs) {
-  const {layout, layoutSize, $scopedSlots} = this
+  const { layout, layoutSize, formAttrs, $scopedSlots } = this
 
   // 设置表单项属性
-  const formItemAttrs = childAttrs ?? {
+  const formItemAttrs = {
     key: child.model,
     prop: child.model,
-    colon: !(layout === 'inline')
+    colon: !(layout === 'inline'),
+    ...childAttrs
   }
 
   // 生成插槽名称
@@ -78,22 +83,30 @@ export function setFormItem(h, vModel, child, childAttrs) {
 
   // 渲染表单项内容
   const renderContent = () => {
-    if ($scopedSlots[child.model]) return $scopedSlots[child.model](child)
+    if ($scopedSlots[child.model]) {
+      return $scopedSlots[child.model](child)
+    }
+    
+    const contentAttrs = {
+      disabled: childAttrs?.disabled ?? formAttrs.disabled ?? false,
+      ...child.attrs
+    }
+    
     return (
       <RenderComp
         v-model={vModel[child.model]}
         component={child.is}
-        {...{ on: child.event, attrs: child.attrs }}
+        {...{ on: child.event, attrs: contentAttrs }}
       />
     )
   }
 
   return (
     <FormModelItem
-      class={[
-        { 'FormLineVertical': child.size === layoutSize && layout === 'vertical' },
-        { 'FormLine': child.size === layoutSize }
-      ]}
+      class={{
+        'FormLineVertical': child.size === layoutSize && layout === 'vertical',
+        'FormLine': child.size === layoutSize
+      }}
       {...{ attrs: formItemAttrs }}
     >
       <template slot="label">
@@ -105,4 +118,4 @@ export function setFormItem(h, vModel, child, childAttrs) {
       {$scopedSlots[`${slotsName}Handle`] && $scopedSlots[`${slotsName}Handle`](formItemAttrs)}
     </FormModelItem>
   )
-}
+}

package/lib/transfer-table/style/index.less

@@ -3,6 +3,7 @@
 
 .TransferTable {
     flex: 1;
+    min-height: 0;
     .flex-layout(column, @padding-xs 0);
 
     &__Search {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-component-gallery",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "基础vue、antdvue、less实现的私有组件库",
   "main": "dist/index.umd.js",
   "files": [
@@ -23,14 +23,15 @@
   },
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@babel/core": "^7.28.0",
+    "@babel/core": "^7.28.6",
     "@babel/eslint-parser": "^7.12.16",
-    "@babel/preset-env": "^7.28.0",
+    "@babel/preset-env": "^7.28.6",
     "@vue/babel-preset-jsx": "^1.4.0",
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "ant-design-vue": "1.7.8",
+    "babel-eslint": "^10.1.0",
     "babel-loader": "^9.1.3",
     "clean-webpack-plugin": "^4.0.0",
     "eslint": "^7.32.0",

package/utils/Utils.js

@@ -134,22 +134,33 @@ export function handleEnvURL(url, processType = 'url') {
   return isDev ? strategy.dev() : strategy.prod()
 }
 
+
 /**
- * 根据属性路径更新数组对象中的数据，支持条件匹配
- * @param {Array} arr - 目标数组
- * @param {string} key - 点分隔的属性路径（如"model: input.a.b"）
- * @param {*} data - 要设置的数据
- * @returns {Array} 更新后的数组
+ * 根据属性路径更新对象或数组中的数据，支持条件匹配和批量设置
+ * @param {Object|Array} target - 目标对象或数组
+ * @param {string|Object} key - 属性路径字符串 或 批量设置配置对象
+ * @param {*} data - 要设置的数据（当key为字符串时使用）
+ * @returns {Object|Array} 更新后的对象或数组
  */
-export function setOptionsData(arr, key, data) {
-  if (!key || !Array.isArray(arr)) return arr
+export function setOptionsData(target, key, data) {
+  if (!target || (typeof target !== 'object' && !Array.isArray(target))) return target
+
+  // 批量设置模式：key 是对象，data 为 undefined
+  if (typeof key === 'object' && data === undefined) {
+    return Object.entries(key).reduce((acc, [path, value]) => {
+      return setOptionsData(acc, path, value)
+    }, target)
+  }
+
+  // 单个设置模式
+  if (!key || typeof key !== 'string') return target
 
   // 解析条件匹配格式
   const hasCondition = key.includes(':')
   let conditionModel = null
   let conditionValue = null
   let actualPath = key
-  
+
   if (hasCondition) {
     const [prefix, path] = key.split(':').map(s => s.trim())
     conditionModel = prefix
@@ -159,38 +170,57 @@ export function setOptionsData(arr, key, data) {
 
   // 分割属性路径
   const pathParts = actualPath.split('.')
-  
-  // 更新数组中的每个对象
-  return arr.map(item => {
-    // 检查条件匹配
-    if (hasCondition && conditionModel) {
-      if (item[conditionModel] !== conditionValue) {
-        return item
-      }
-    }
 
-    // 获取当前对象
-    let current = item
+  // 设置属性值的辅助函数
+  const setProp = (obj) => {
+    let current = obj
     
     // 遍历路径（除最后一部分）
     for (let i = 0; i < pathParts.length - 1; i++) {
-      if (!current[pathParts[i]]) current[pathParts[i]] = {}
+      if (!current[pathParts[i]]) {
+        current[pathParts[i]] = {}
+      }
       current = current[pathParts[i]]
     }
-    
+
     // 设置最终属性值
     const lastPart = pathParts[pathParts.length - 1]
-    // 是对象则进行属性合并
-    const isObj = data instanceof Object && !Array.isArray(data)
-
-    pathParts.length > 1 ?
-      current[lastPart] = isObj ? { ...current[lastPart], ...data } : data :
-      current[pathParts[0]] = isObj ? { ...current[pathParts[0]], ...data } : data
     
-    return item
-  })
+    // 合并对象或直接赋值
+    if (typeof data === 'object' && data !== null && !Array.isArray(data)) {
+      current[lastPart] = { ...current[lastPart], ...data }
+    } else {
+      current[lastPart] = data
+    }
+  }
+
+  // 处理数组
+  if (Array.isArray(target)) {
+    return target.map(item => {
+      // 检查条件匹配
+      if (hasCondition && item[conditionModel] !== conditionValue) {
+        return item
+      }
+
+      const newItem = { ...item }
+      setProp(newItem)
+      return newItem
+    })
+  }
+
+  // 处理对象
+  const updatedTarget = { ...target }
+  
+  // 检查条件匹配
+  if (hasCondition && updatedTarget[conditionModel] !== conditionValue) {
+    return updatedTarget
+  }
+
+  setProp(updatedTarget)
+  return updatedTarget
 }
 
+
 /**
  * 异步获取搜索数据并更新配置
  * @param {Object} searchSetting - 需要更新的搜索配置对象