@form-create/component-elm-group 3.2.23 → 3.2.34

package/src/component.jsx

@@ -3,6 +3,7 @@ import {defineComponent, markRaw, nextTick, watch} from 'vue';
 import deepExtend, {deepCopy} from '@form-create/utils/lib/deepextend';
 import extend from '@form-create/utils/lib/extend';
 import './style.css';
+import {toPromise} from '@form-create/utils';
 
 const NAME = 'fcGroup';
 
@@ -43,6 +44,14 @@ export default defineComponent({
             type: Boolean,
             default: true
         },
+        title: {
+            type: [String, Function],
+            default: null
+        },
+        type: {
+            type: String,
+            default: 'default'
+        },
         onBeforeRemove: {
             type: Function,
             default: () => {
@@ -199,13 +208,20 @@ export default defineComponent({
             this.input(value);
         },
         del(index, key) {
-            if (this.disabled || false === this.onBeforeRemove(this.modelValue, index)) {
+            if (this.disabled) {
                 return;
             }
-            this.removeRule(key, true);
-            const value = [...this.modelValue];
-            value.splice(index, 1);
-            this.input(value);
+            const del = () => {
+                this.removeRule(key, true);
+                const value = [...this.modelValue];
+                value.splice(index, 1);
+                this.input(value);
+            }
+            toPromise(this.onBeforeRemove(this.modelValue, index)).then(res => {
+                if (false !== res) {
+                    del();
+                }
+            })
         },
         addIcon(key) {
             return <div class="_fc-group-btn _fc-group-plus-minus" onClick={this.add}></div>;
@@ -231,6 +247,30 @@ export default defineComponent({
             }));
             this.formData(0);
         },
+        sortIcon(index, total) {
+            const canMoveUp = index > 0;
+            const canMoveDown = index < total - 1;
+
+            if (!canMoveUp && !canMoveDown) {
+                return null;
+            }
+
+            if (canMoveUp && canMoveDown) {
+                // 显示合并的上下箭头按钮
+                return <div class="_fc-group-btn _fc-group-sort">
+                    <div class="_fc-group-sort-up" onClick={() => this.changeSort(index, -1)}></div>
+                    <div class="_fc-group-sort-down" onClick={() => this.changeSort(index, 1)}></div>
+                </div>;
+            }
+
+            if (canMoveUp) {
+                return this.sortUpIcon(index);
+            }
+
+            if (canMoveDown) {
+                return this.sortDownIcon(index);
+            }
+        },
         makeIcon(total, index, key) {
             if (this.$slots.button) {
                 return this.$slots.button({
@@ -249,21 +289,28 @@ export default defineComponent({
             if (total > this.min) {
                 btn.push(this.delIcon(index, key));
             }
-            if (this.sortBtn && index) {
-                btn.push(this.sortUpIcon(index));
-            }
-            if (this.sortBtn && index !== total - 1) {
-                btn.push(this.sortDownIcon(index));
+            if (this.sortBtn) {
+                const sortBtn = this.sortIcon(index, total);
+                if (sortBtn) {
+                    btn.push(sortBtn);
+                }
             }
             return btn;
         },
-        emitEvent(name, args, index, key) {
-            this.$emit(name, ...args, this.cacheRule[key].$f, index);
-        },
         expandRule(n) {
             for (let i = 0; i < n; i++) {
-                this.addRule(i);
+                this.modelValue.push(this.field ? null : {});
             }
+            this.input([...this.modelValue]);
+        },
+        getTitle(index, key) {
+            if (typeof this.title === 'function') {
+                return this.title(index, this.modelValue[index], key);
+            }
+            if (typeof this.title === 'string') {
+                return this.title.replace('{index}', index + 1);
+            }
+            return false;
         }
     },
     created() {
@@ -280,6 +327,7 @@ export default defineComponent({
         const button = this.button;
         const Type = this.form;
         const disabled = this.disabled;
+        const isCardType = this.type === 'card';
 
         const children = keys.length === 0 ?
             (this.$slots.default ? (this.$slots.default({
@@ -289,25 +337,55 @@ export default defineComponent({
                 onClick={this.add}/>) : keys.map((key, index) => {
                 const {rule, options} = this.cacheRule[key];
                 const btn = button && !disabled ? this.makeIcon(keys.length, index, key) : [];
-                return <div class="_fc-group-container" key={key}>
-                    <Type
-                        key={key}
-                        {...{
-                            disabled,
-                            'onUpdate:modelValue': (formData) => this.formData(key, formData),
-                            'onEmit-event': (name, ...args) => this.emitEvent(name, args, index, key),
-                            'onUpdate:api': ($f) => this.add$f(index, key, $f),
-                            inFor: true,
-                            modelValue: this.field ? {[this.field]: this._value(this.modelValue[index])} : this.modelValue[index],
-                            rule,
-                            option: options,
-                            extendOption: true
-                        }}
-                    />
-                    <div class="_fc-group-idx">{index + 1}</div>
-                    {(btn.length) ? <div class="_fc-group-handle fc-clock">{btn}</div> : null}
-                </div>
+                const title = this.getTitle(index, key);
+
+                if (isCardType) {
+                    return <div class="_fc-group-container" key={key}>
+                        <div class="_fc-group-header">
+                            {title === false ? <div class="_fc-group-idx">{index + 1}</div> : null}
+                            {title !== false ? <div class="_fc-group-title">{title}</div> : null}
+                            <div class="_fc-group-handle fc-clock">
+                                {(btn.length) ? btn : null}
+                            </div>
+                        </div>
+                        <div class="_fc-group-content">
+                            <Type
+                                key={key}
+                                {...{
+                                    ...this.$attrs,
+                                    disabled,
+                                    'onUpdate:modelValue': (formData) => this.formData(key, formData),
+                                    'onUpdate:api': ($f) => this.add$f(index, key, $f),
+                                    inFor: true,
+                                    modelValue: this.field ? {[this.field]: this._value(this.modelValue[index])} : this.modelValue[index],
+                                    rule,
+                                    option: options,
+                                    extendOption: true
+                                }}
+                            />
+                        </div>
+                    </div>
+                } else {
+                    return <div class="_fc-group-container" key={key}>
+                        <Type
+                            key={key}
+                            {...{
+                                ...this.$attrs,
+                                disabled,
+                                'onUpdate:modelValue': (formData) => this.formData(key, formData),
+                                'onUpdate:api': ($f) => this.add$f(index, key, $f),
+                                inFor: true,
+                                modelValue: this.field ? {[this.field]: this._value(this.modelValue[index])} : this.modelValue[index],
+                                rule,
+                                option: options,
+                                extendOption: true
+                            }}
+                        />
+                        <div class="_fc-group-idx">{index + 1}</div>
+                        {(btn.length) ? <div class="_fc-group-handle fc-clock">{btn}</div> : null}
+                    </div>
+                }
             });
-        return <div key={'con'} class={'_fc-group ' + (disabled ? '_fc-group-disabled' : '')}>{children}</div>
+        return <div key={'con'} class={'_fc-group ' + (disabled ? '_fc-group-disabled' : '') + (isCardType ? ' _fc-group-card' : '')}>{children}</div>
     }
 });

package/src/style.css

@@ -49,11 +49,9 @@
     display: flex;
     flex-direction: column;
     border: 1px dashed #d9d9d9;
-    padding: 20px;
-    margin: 5px;
     border-radius: 5px;
-    margin-bottom: 25px;
-    padding-bottom: 25px;
+    margin: 5px 5px 25px;
+    padding: 20px 20px 25px;
 }
 
 ._fc-group-arrow {
@@ -123,3 +121,326 @@
     width: 50%;
 }
 
+/* ===== Card 类型样式 ===== */
+/* 主容器 */
+._fc-group._fc-group-card {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    gap: 16px;
+}
+
+/* 禁用状态 */
+._fc-group._fc-group-card._fc-group-disabled ._fc-group-btn,
+._fc-group._fc-group-card._fc-group-disabled ._fc-group-add {
+    cursor: not-allowed;
+    opacity: 0.5;
+}
+
+/* 卡片容器 */
+._fc-group._fc-group-card ._fc-group-container {
+    position: relative;
+    background: #ffffff;
+    border: 1px solid #f0f0f0;
+    border-radius: 6px;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    padding: 0;
+    margin: 0;
+}
+
+/* 卡片头部 */
+._fc-group._fc-group-card ._fc-group-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px 20px 12px;
+    border-bottom: 1px solid #f0f0f0;
+    background: #fafafa;
+}
+
+/* 序号标签 */
+._fc-group._fc-group-card ._fc-group-idx {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    background: #f0f0f0;
+    color: #666666;
+    border-radius: 6px;
+    font-size: 12px;
+    font-weight: 500;
+    margin-right: 12px;
+    flex-shrink: 0;
+    position: static;
+    border: 1px solid #e0e0e0;
+}
+
+/* 标题区域 */
+._fc-group._fc-group-card ._fc-group-title {
+    flex: 1;
+    font-size: 14px;
+    font-weight: 500;
+    color: rgba(0, 0, 0, 0.85);
+    line-height: 1.5715;
+}
+
+/* 操作按钮组 - 头部右侧 */
+._fc-group._fc-group-card ._fc-group-handle {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    margin-left: 12px;
+    flex-shrink: 0;
+    position: static;
+    bottom: auto;
+    right: auto;
+    border-radius: 0;
+    border: none;
+    padding: 0;
+    background-color: transparent;
+    flex-direction: row;
+}
+
+/* 按钮基础样式 */
+._fc-group._fc-group-card ._fc-group-btn {
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    border-radius: 4px;
+    border: 1px solid #d9d9d9;
+    background: #ffffff;
+    color: rgba(0, 0, 0, 0.45);
+    position: relative;
+}
+
+._fc-group._fc-group-card ._fc-group-btn:hover {
+    color: #1890ff;
+    border-color: #1890ff;
+    background: #f0f8ff;
+}
+
+._fc-group._fc-group-card ._fc-group-btn:active {
+    color: #096dd9;
+    border-color: #096dd9;
+}
+
+/* 箭头按钮 */
+._fc-group._fc-group-card ._fc-group-arrow {
+    position: relative;
+}
+
+._fc-group._fc-group-card ._fc-group-arrow::before {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 5px;
+    height: 5px;
+    border-left: 1px solid currentColor;
+    border-top: 1px solid currentColor;
+    transform: translate(-50%, -50%) rotate(45deg);
+}
+
+._fc-group._fc-group-card ._fc-group-arrow._fc-group-down {
+    transform: rotate(180deg);
+}
+
+/* 合并的上下箭头按钮 */
+._fc-group._fc-group-card ._fc-group-sort {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 24px;
+}
+
+._fc-group._fc-group-card ._fc-group-sort::before,
+._fc-group._fc-group-card ._fc-group-sort::after {
+    content: "";
+    position: absolute;
+    left: 50%;
+    width: 4px;
+    height: 4px;
+    border-left: 1px solid currentColor;
+    border-top: 1px solid currentColor;
+    transform: translateX(-50%);
+}
+
+._fc-group._fc-group-card ._fc-group-sort::before {
+    top: 6px;
+    transform: translateX(-50%) rotate(45deg);
+}
+
+._fc-group._fc-group-card ._fc-group-sort::after {
+    bottom: 6px;
+    transform: translateX(-50%) rotate(225deg);
+}
+
+/* 合并按钮的上下点击区域 */
+._fc-group._fc-group-card ._fc-group-sort-up,
+._fc-group._fc-group-card ._fc-group-sort-down {
+    position: absolute;
+    left: 0;
+    right: 0;
+    height: 12px;
+    cursor: pointer;
+    z-index: 1;
+}
+
+._fc-group._fc-group-card ._fc-group-sort-up {
+    top: 0;
+}
+
+._fc-group._fc-group-card ._fc-group-sort-down {
+    bottom: 0;
+}
+
+._fc-group._fc-group-card ._fc-group-sort-up:hover,
+._fc-group._fc-group-card ._fc-group-sort-down:hover {
+    background: rgba(24, 144, 255, 0.1);
+}
+
+/* 加减按钮 */
+._fc-group._fc-group-card ._fc-group-plus-minus {
+    position: relative;
+    background: #409eff;
+    border-color: #409eff;
+    color: white;
+    width: 24px;
+    height: 24px;
+}
+
+._fc-group._fc-group-card ._fc-group-plus-minus:hover {
+    background: #66b1ff;
+    border-color: #66b1ff;
+    color: white;
+}
+
+._fc-group._fc-group-card ._fc-group-plus-minus::before,
+._fc-group._fc-group-card ._fc-group-plus-minus::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 8px;
+    height: 1px;
+    background-color: currentColor;
+    transform: translate(-50%, -50%);
+}
+
+._fc-group._fc-group-card ._fc-group-plus-minus::before {
+    transform: translate(-50%, -50%) rotate(90deg);
+}
+
+._fc-group._fc-group-card ._fc-group-plus-minus._fc-group-minus {
+    background: #f56c6c;
+    border-color: #f56c6c;
+}
+
+._fc-group._fc-group-card ._fc-group-plus-minus._fc-group-minus:hover {
+    background: #f78989;
+    border-color: #f78989;
+}
+
+._fc-group._fc-group-card ._fc-group-plus-minus._fc-group-minus::before {
+    display: none;
+}
+
+/* 表单内容区域 */
+._fc-group._fc-group-card ._fc-group-content {
+    padding: 20px;
+}
+
+/* 添加按钮 - 与加号按钮风格一致 */
+._fc-group._fc-group-card ._fc-group-add {
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    border-radius: 4px;
+    border: 1px solid #d9d9d9;
+    background: #ffffff;
+    color: rgba(0, 0, 0, 0.45);
+    position: relative;
+}
+
+._fc-group._fc-group-card ._fc-group-add:hover {
+    color: #409eff;
+    border-color: #409eff;
+    background: #f0f8ff;
+}
+
+._fc-group._fc-group-card ._fc-group-add._fc-group-plus-minus {
+    width: 24px;
+    height: 24px;
+    background: #409eff;
+    border-color: #409eff;
+    color: white;
+}
+
+._fc-group._fc-group-card ._fc-group-add._fc-group-plus-minus:hover {
+    background: #66b1ff;
+    border-color: #66b1ff;
+    color: white;
+}
+
+._fc-group._fc-group-card ._fc-group-add._fc-group-plus-minus::before,
+._fc-group._fc-group-card ._fc-group-add._fc-group-plus-minus::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 8px;
+    height: 1px;
+    background-color: currentColor;
+    transform: translate(-50%, -50%);
+}
+
+._fc-group._fc-group-card ._fc-group-add._fc-group-plus-minus::before {
+    transform: translate(-50%, -50%) rotate(90deg);
+}
+
+/* 空状态样式 */
+._fc-group._fc-group-card ._fc-group-empty {
+    text-align: center;
+    padding: 40px 20px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 14px;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+    ._fc-group._fc-group-card ._fc-group-container {
+        margin: 0 -8px;
+        border-radius: 0;
+        border-left: none;
+        border-right: none;
+    }
+
+    ._fc-group._fc-group-card ._fc-group-header {
+        padding: 12px 16px 8px;
+    }
+
+    ._fc-group._fc-group-card ._fc-group-content {
+        padding: 16px;
+    }
+
+    ._fc-group._fc-group-card ._fc-group-handle {
+        gap: 2px;
+    }
+
+    ._fc-group._fc-group-card ._fc-group-btn {
+        width: 22px;
+        height: 22px;
+    }
+}
+