@jetlinks-web/components 2.6.24 → 2.6.27

package/es/AMap/Map.js

@@ -10,6 +10,7 @@
   "ref": "setup-const",
   "computed": "setup-const",
   "inject": "setup-const",
+  "defineOptions": "setup-const",
   "initAMapApiLoader": "setup-maybe-ref",
   "ElAmap": "setup-maybe-ref",
   "getAMapUiPromise": "setup-maybe-ref",
@@ -31,7 +32,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderSlot as _renderSlot, unref as _unref, mergeProps as _mergeProps, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, createElementBlock as _createElementBlock } from "vue";
-import { ref, computed, inject } from 'vue';
+import { ref, computed, inject, } from 'vue';
 import { initAMapApiLoader, ElAmap } from '@vuemap/vue-amap';
 import { getAMapUiPromise } from '@jetlinks-web/utils';
 import { MapProps } from './util';

package/es/AutoComplete/AutoComplete.js

@@ -19,6 +19,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "AutoComplete": "setup-maybe-ref",
   "autoCompleteProps": "setup-maybe-ref",
   "ref": "setup-const",
+  "defineOptions": "setup-const",
   "watch": "setup-const",
   "props": "setup-reactive-const",
   "emit": "setup-const",

package/es/BadgeStatus/Badge.js

@@ -3,6 +3,7 @@
   "status": "props",
   "statusNames": "props",
   "computed": "setup-const",
+  "defineOptions": "setup-const",
   "getHexColor": "setup-maybe-ref",
   "Badge": "setup-maybe-ref",
   "props": "setup-reactive-const",
@@ -10,7 +11,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock } from "vue";
-import { computed } from 'vue';
+import { computed, } from 'vue';
 import { getHexColor } from './color';
 import { Badge } from 'ant-design-vue/es/';
 const __sfc_main__ = _defineComponent({

package/es/CardSelect/CardSelect.js

@@ -10,9 +10,12 @@
   "computed": "setup-const",
   "ref": "setup-const",
   "watch": "setup-const",
+  "defineOptions": "setup-const",
+  "Form": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "selectKeys": "setup-ref",
+  "formItemContext": "setup-maybe-ref",
   "CardSelectStyle": "setup-ref",
   "isMultiple": "setup-ref",
   "handleSelect": "setup-const"
@@ -23,7 +26,8 @@ const _hoisted_2 = { class: "j-card-select-item-content" };
 const _hoisted_3 = { class: "j-card-select-title" };
 const _hoisted_4 = { class: "j-card-select-describe" };
 import { has } from 'lodash-es';
-import { computed, ref, watch } from 'vue';
+import { computed, ref, watch, } from 'vue';
+import { Form } from 'ant-design-vue/es/';
 const __sfc_main__ = Object.assign({
     name: 'JCardSelect'
 }, {
@@ -62,6 +66,7 @@ const __sfc_main__ = Object.assign({
         const props = __props;
         const emit = __emit;
         const selectKeys = ref([]);
+        const formItemContext = Form.useInjectFormItemContext();
         const CardSelectStyle = computed(() => {
             const _column = props.column > 0 && props.layout === 'horizontal' ? props.column : 1;
             return {
@@ -96,6 +101,7 @@ const __sfc_main__ = Object.assign({
                 emit('change', key, node);
                 emit('update:value', key);
             }
+            formItemContext.onFieldChange();
         };
         watch(() => props.value, () => {
             selectKeys.value = isMultiple.value ? (props.value || []) : [props.value];

package/es/CardSelect/style/index.less

@@ -1,26 +1,26 @@
-@import '../../style/variable.less';
-
-.j-card-select {
-  display: grid;
-  gap: 12px;
-
-  .j-card-select-item {
-    padding: 12px;
-    border: 1px solid #e6e6e6;
-    border-radius: @border-radius-base;
-    cursor: pointer;
-
-    &.active {
-      border-color: @primary-color;
-    }
-
-    &.disabled {
-      cursor: not-allowed;
-      opacity: 0.75;
-    }
-
-    .j-card-select-describe {
-      color: @text-color-subtitle;
-    }
-  }
-}
+@import '../../style/variable.less';
+
+.j-card-select {
+  display: grid;
+  gap: 12px;
+
+  .j-card-select-item {
+    padding: 12px;
+    border: 1px solid #e6e6e6;
+    border-radius: @border-radius-base;
+    cursor: pointer;
+
+    &.active {
+      border-color: @primary-color;
+    }
+
+    &.disabled {
+      cursor: not-allowed;
+      opacity: 0.75;
+    }
+
+    .j-card-select-describe {
+      color: @text-color-subtitle;
+    }
+  }
+}

package/es/CheckButton/CheckButton.js

@@ -8,6 +8,7 @@
   "computed": "setup-const",
   "ref": "setup-const",
   "watch": "setup-const",
+  "defineOptions": "setup-const",
   "isArray": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
@@ -19,7 +20,7 @@
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle } from "vue";
 const _hoisted_1 = ["onClick"];
-import { computed, ref, watch } from 'vue';
+import { computed, ref, watch, } from 'vue';
 import { isArray } from '@jetlinks-web/utils';
 const __sfc_main__ = _defineComponent({
     ...{

package/es/DragModal/DragModal.js

@@ -23,6 +23,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "footer": "props",
   "ref": "setup-const",
   "useSlots": "setup-const",
+  "defineOptions": "setup-const",
   "computed": "setup-const",
   "onMounted": "setup-const",
   "watch": "setup-const",

package/es/Echarts/Echarts.js

@@ -4,6 +4,7 @@
   "nextTick": "setup-const",
   "ref": "setup-const",
   "watch": "setup-const",
+  "defineOptions": "setup-const",
   "useECharts": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "echartsDom": "setup-ref",
@@ -11,7 +12,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { nextTick, ref, watch } from 'vue';
+import { nextTick, ref, watch, } from 'vue';
 import { useECharts } from '@jetlinks-web/hooks';
 const __sfc_main__ = _defineComponent({
     ...{

package/es/EditTable/EditTable.js

@@ -41,6 +41,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "useSlots": "setup-const",
   "ref": "setup-const",
   "reactive": "setup-const",
+  "defineOptions": "setup-const",
   "computed": "setup-const",
   "watch": "setup-const",
   "bodyProps": "setup-maybe-ref",
@@ -108,6 +109,7 @@ const _hoisted_3 = {
     key: 0,
     class: "jetlinks-table-horizontal-scroll"
 };
+const _hoisted_4 = /*#__PURE__*/ _createElementVNode("div", { style: { "width": "15px", "height": "100%", "overflow-x": "hidden" } }, null, -1 /* HOISTED */);
 import { FULL_SCREEN, RIGHT_MENU, TABLE_DATA_SOURCE, TABLE_ERROR, TABLE_GROUP_ACTIVE, TABLE_GROUP_ERROR, TABLE_GROUP_OPTIONS, TABLE_H_SCROLL, TABLE_OPEN_GROUP, TABLE_TOOL, TABLE_WRAPPER } from './consts';
 import { handleColumnsWidth } from './utils';
 import { useGroup, useResizeObserver, useValidate } from './hooks';
@@ -513,18 +515,18 @@ const __sfc_main__ = Object.assign({
                                 class: "jetlinks-table-horizontal-scroll-bar",
                                 ref_key: "scrollBarRef",
                                 ref: scrollBarRef,
-                                style: {
+                                style: _normalizeStyle({
                                     width: 'calc(100% - 15px)',
                                     height: '100%',
                                     overflowX: 'scroll'
-                                },
+                                }),
                                 onScroll: onHorizontalScroll
                             }, [
                                 _createElementVNode("div", {
                                     style: _normalizeStyle({ minWidth: horizontalScrollWidth.value + 'px', maxWidth: horizontalScrollWidth.value + 'px', height: '100%' })
                                 }, null, 4 /* STYLE */)
-                            ], 544 /* NEED_HYDRATION, NEED_PATCH */),
-                            _cache[1] || (_cache[1] = _createElementVNode("div", { style: { "width": "15px", "height": "100%", "overflow-x": "hidden" } }, null, -1 /* CACHED */))
+                            ], 36 /* STYLE, NEED_HYDRATION */),
+                            _hoisted_4
                         ]))
                         : _createCommentVNode("v-if", true),
                     (_ctx.dataSource.length && _ctx.openGroup)

package/es/EditTable/FormItem.js

@@ -21,6 +21,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "computed": "setup-const",
   "reactive": "setup-const",
   "watch": "setup-const",
+  "defineOptions": "setup-const",
   "provide": "setup-const",
   "get": "setup-maybe-ref",
   "isArray": "setup-maybe-ref",
@@ -88,18 +89,12 @@ const __sfc_main__ = Object.assign({
         });
         const filedId = computed(() => {
             const names = isArray(props.name) ? props.name : [props.name];
-            return names.join('_');
+            const [index, ...extra] = names;
+            return `${index}-${extra.join('.')}`;
         });
         const filedName = computed(() => {
             const names = isArray(props.name) ? props.name : [props.name];
-            const _rules = context.rules.value;
-            let tempKey = undefined;
-            for (const key of names) {
-                if (key in _rules) {
-                    tempKey = key;
-                }
-            }
-            return tempKey;
+            return [...names].pop();
         });
         const filedValue = computed(() => {
             return get(context.dataSource.value, props.name);

package/es/EditTable/Header.js

@@ -22,6 +22,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "SearchModal": "setup-maybe-ref",
   "Sort": "setup-maybe-ref",
   "reactive": "setup-const",
+  "defineOptions": "setup-const",
   "useHScroll": "setup-maybe-ref",
   "useTableTool": "setup-maybe-ref",
   "HeaderItemRender": "setup-const",
@@ -46,7 +47,7 @@ const _hoisted_6 = {
     class: "table-header-cell-trigger"
 };
 import { SearchModal, Sort } from './components/Search';
-import { reactive } from 'vue';
+import { reactive, } from 'vue';
 import { useHScroll, useTableTool } from "./hooks";
 import HeaderItemRender from './HeaderRender.js';
 const __sfc_main__ = Object.assign({
@@ -125,10 +126,7 @@ const __sfc_main__ = Object.assign({
                                         }, null, 8 /* PROPS */, ["onClick"]))
                                         : _createCommentVNode("v-if", true),
                                     (item.sort)
-                                        ? (_openBlock(), _createBlock(_unref(Sort), _mergeProps({
-                                            key: 1,
-                                            ref_for: true
-                                        }, item.sort, {
+                                        ? (_openBlock(), _createBlock(_unref(Sort), _mergeProps({ key: 1 }, item.sort, {
                                             key: item.dataIndex,
                                             active: _unref(tableTool).sortData.dataIndex === item.dataIndex,
                                             selectedRowKeys: _unref(tableTool).sortData.dataIndex === item.dataIndex ? _unref(tableTool).sortData.orderKeys : [],

package/es/EditTable/components/ContextMenu/Menu.js

@@ -23,6 +23,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onMounted": "setup-const",
   "ref": "setup-const",
   "nextTick": "setup-const",
+  "defineOptions": "setup-const",
   "AIcon": "setup-maybe-ref",
   "Menu": "setup-maybe-ref",
   "useLocaleReceiver": "setup-maybe-ref",
@@ -37,7 +38,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "close": "setup-const"
 } */
 import { unref as _unref, createVNode as _createVNode, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, withCtx as _withCtx, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { onMounted, ref, nextTick } from "vue";
+import { onMounted, ref, nextTick, } from "vue";
 import { AIcon } from '../../../components';
 import { Menu } from 'ant-design-vue/es/';
 import { useLocaleReceiver } from "../../../LocaleReciver";

package/es/EditTable/components/Search/search.js

@@ -24,6 +24,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "useGroupOptions": "setup-maybe-ref",
   "ref": "setup-const",
   "computed": "setup-const",
+  "defineOptions": "setup-const",
   "Ellipsis": "setup-const",
   "DragModal": "setup-const",
   "useLocaleReceiver": "setup-maybe-ref",
@@ -67,7 +68,7 @@ const _hoisted_6 = { key: 1 };
 const _hoisted_7 = { class: "jetlinks-table-search-result-total" };
 import Table from '../../EditTable.js';
 import { useTableDataSource, useTableOpenGroup, useTableTool, useGroupOptions } from "../../context";
-import { ref, computed } from "vue";
+import { ref, computed, } from "vue";
 import Ellipsis from '../../../Ellipsis/Ellipsis.js';
 import DragModal from '../../../DragModal/DragModal.js';
 import { useLocaleReceiver } from "../../../LocaleReciver/index";

package/es/EditTable/components/Search/sort.js

@@ -22,6 +22,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "active": "props",
   "useTableTool": "setup-maybe-ref",
   "useTableWrapper": "setup-maybe-ref",
+  "defineOptions": "setup-const",
   "ref": "setup-const",
   "reactive": "setup-const",
   "useLocaleReceiver": "setup-maybe-ref",
@@ -40,7 +41,8 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onAsc": "setup-const",
   "onDesc": "setup-const"
 } */
-import { unref as _unref, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, createTextVNode as _createTextVNode, withCtx as _withCtx, createVNode as _createVNode, normalizeClass as _normalizeClass } from "vue";
+import { unref as _unref, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, createTextVNode as _createTextVNode, withCtx as _withCtx, createVNode as _createVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
+const _withScopeId = n => (_pushScopeId("data-v-1755080512757"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "jetlinks-table-sort-content" };
 const _hoisted_2 = { class: "jetlinks-table-sort-title" };
 const _hoisted_3 = { class: "table-sort-body" };

package/es/EditTable/group.js

@@ -24,6 +24,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "useTableGroupError": "setup-maybe-ref",
   "useTableWrapper": "setup-maybe-ref",
   "ref": "setup-const",
+  "defineOptions": "setup-const",
   "useLocaleReceiver": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
@@ -49,16 +50,18 @@ import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlo
 const _hoisted_1 = { class: "jetlinks-table-group-warp" };
 const _hoisted_2 = { class: "jetlinks-table-group-error-warp" };
 const _hoisted_3 = { style: { "color": "#1d2129" } };
-const _hoisted_4 = {
+const _hoisted_4 = /*#__PURE__*/ _createElementVNode("div", { class: "jetlinks-table-group-error-target" }, null, -1 /* HOISTED */);
+const _hoisted_5 = {
     key: 1,
     class: "jetlinks-table-group-error-warp"
 };
-const _hoisted_5 = { style: { "color": "#1d2129" } };
+const _hoisted_6 = { style: { "color": "#1d2129" } };
+const _hoisted_7 = /*#__PURE__*/ _createElementVNode("div", { class: "jetlinks-table-group-error-target" }, null, -1 /* HOISTED */);
 import { Modal } from "ant-design-vue/es/";
 import { randomNumber } from "@jetlinks-web/utils";
 import { isFullScreen } from "./utils";
 import { useTableGroupError, useTableWrapper } from './context';
-import { ref } from 'vue';
+import { ref, } from 'vue';
 import { useLocaleReceiver } from "../LocaleReciver";
 const __sfc_main__ = Object.assign({
     name: 'JEditTableGroup'
@@ -267,17 +270,16 @@ const __sfc_main__ = Object.assign({
                                                                 _createElementVNode("span", _hoisted_3, _toDisplayString(_unref(contextLocale).Group.validate), 1 /* TEXT */)
                                                             ]),
                                                             default: _withCtx(() => [
-                                                                _cache[2] || (_cache[2] = _createElementVNode("div", { class: "jetlinks-table-group-error-target" }, null, -1 /* CACHED */))
+                                                                _hoisted_4
                                                             ]),
-                                                            _: 1 /* STABLE */,
-                                                            __: [2]
+                                                            _: 1 /* STABLE */
                                                         }))
                                                         : _createCommentVNode("v-if", true)
                                                 ])
                                             ]),
                                             _: 2 /* DYNAMIC */
                                         }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["getPopupContainer", "disabled"]))
-                                        : (_openBlock(), _createElementBlock("div", _hoisted_4, [
+                                        : (_openBlock(), _createElementBlock("div", _hoisted_5, [
                                             _createTextVNode(_toDisplayString(item.label) + " (" + _toDisplayString(item.effective) + ") ", 1 /* TEXT */),
                                             (_unref(errorMap)[item.value])
                                                 ? (_openBlock(), _createBlock(_component_a_tooltip, {
@@ -287,13 +289,12 @@ const __sfc_main__ = Object.assign({
                                                     getContainer: popContainer
                                                 }, {
                                                     title: _withCtx(() => [
-                                                        _createElementVNode("span", _hoisted_5, _toDisplayString(_unref(contextLocale).Group.validate), 1 /* TEXT */)
+                                                        _createElementVNode("span", _hoisted_6, _toDisplayString(_unref(contextLocale).Group.validate), 1 /* TEXT */)
                                                     ]),
                                                     default: _withCtx(() => [
-                                                        _cache[3] || (_cache[3] = _createElementVNode("div", { class: "jetlinks-table-group-error-target" }, null, -1 /* CACHED */))
+                                                        _hoisted_7
                                                     ]),
-                                                    _: 1 /* STABLE */,
-                                                    __: [3]
+                                                    _: 1 /* STABLE */
                                                 }))
                                                 : _createCommentVNode("v-if", true)
                                         ]))

package/es/EditTable/hooks/useValidate.js

@@ -18,7 +18,7 @@ export var useValidate = function useValidate(dataSource, columns, rowKey) {
         firstFields: true,
         index: index
       }, function (err) {
-        if (err !== null && err !== void 0 && err.length) {
+        if (err === null || err === void 0 ? void 0 : err.length) {
           reject(err.map(function (item) {
             return _objectSpread(_objectSpread({}, item), {}, {
               __serial: data.__serial,

package/es/EditTable/style/form.less

@@ -1,33 +1,33 @@
-.jetlinks-table-form-error-target {
-  position: absolute;
-  right: 2px;
-  top: -9px;
-  border: 16px solid transparent;
-  border-top-color: @error-color;
-  border-right-width: 0;
-  border-bottom-width: 0;
-}
-
-.jetlinks-edit-table-form-has-error {
-
-  .select-no-value {
-    .ant-select-selector {
-      border-color: @error-color !important;
-      &:focus {
-        box-shadow: 0 0 0 2px var(--ant-error-color-outline) !important;
-      }
-    }
-  }
-
-  > input {
-    border-color: @error-color !important;
-
-    &:focus {
-      box-shadow: 0 0 0 2px var(--ant-error-color-outline) !important;
-    }
-  }
-
-  .jetlinks-table-form-required-aicon {
-    color: @error-color;
-  }
-}
+.jetlinks-table-form-error-target {
+  position: absolute;
+  right: 2px;
+  top: -9px;
+  border: 16px solid transparent;
+  border-top-color: @error-color;
+  border-right-width: 0;
+  border-bottom-width: 0;
+}
+
+.jetlinks-edit-table-form-has-error {
+
+  .select-no-value {
+    .ant-select-selector {
+      border-color: @error-color !important;
+      &:focus {
+        box-shadow: 0 0 0 2px var(--ant-error-color-outline) !important;
+      }
+    }
+  }
+
+  > input {
+    border-color: @error-color !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px var(--ant-error-color-outline) !important;
+    }
+  }
+
+  .jetlinks-table-form-required-aicon {
+    color: @error-color;
+  }
+}

package/es/EditTable/style/group.less

@@ -1,32 +1,32 @@
-.jetlinks-table-group-warp {
-  .ant-tabs-nav {
-    margin-bottom: 0;
-    .ant-tabs-tab {
-      overflow: hidden;
-      position: relative;
-    }
-    .ant-tabs-tab-active {
-      background-color: #BAE0FF !important;
-      border-color: #91CAFF !important;
-
-    }
-
-    .ant-tabs-nav-add {
-      border: none;
-    }
-  }
-}
-
-.jetlinks-table-group-error-warp {
-  color: #1a1a1a !important;
-
-  .table-group-error-target {
-    position: absolute;
-    right: 0;
-    top: 0;
-    border: 16px solid transparent;
-    border-top-color: @error-color;
-    border-right-width: 0;
-    border-bottom-width: 0;
-  }
-}
+.jetlinks-table-group-warp {
+  .ant-tabs-nav {
+    margin-bottom: 0;
+    .ant-tabs-tab {
+      overflow: hidden;
+      position: relative;
+    }
+    .ant-tabs-tab-active {
+      background-color: #BAE0FF !important;
+      border-color: #91CAFF !important;
+
+    }
+
+    .ant-tabs-nav-add {
+      border: none;
+    }
+  }
+}
+
+.jetlinks-table-group-error-warp {
+  color: #1a1a1a !important;
+
+  .table-group-error-target {
+    position: absolute;
+    right: 0;
+    top: 0;
+    border: 16px solid transparent;
+    border-top-color: @error-color;
+    border-right-width: 0;
+    border-bottom-width: 0;
+  }
+}