@jetlinks-web/components 3.1.6 → 3.1.7

package/es/AutoComplete/AutoComplete.js

@@ -1,3 +1,9 @@
+function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) {
+    return lhs;
+}
+else {
+    return rhsFn();
+} }
 function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) {
     const op = ops[i];
     const fn = ops[i + 1];
@@ -20,17 +26,24 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "autoCompleteProps": "setup-maybe-ref",
   "ref": "setup-const",
   "watch": "setup-const",
+  "computed": "setup-const",
+  "omit": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
-  "_options": "setup-ref",
+  "displayText": "setup-ref",
+  "selectedValue": "setup-ref",
+  "keyword": "setup-ref",
+  "filteredOptions": "setup-ref",
   "onSearch": "setup-const",
-  "dropdownVisibleChange": "setup-const"
+  "onSelect": "setup-const",
+  "onChange": "setup-const"
 } */
 import { defineComponent as _defineComponent } from 'vue';
-import { renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, unref as _unref, mergeProps as _mergeProps, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
+import { unref as _unref, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, mergeProps as _mergeProps, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
 import { AutoComplete } from 'ant-design-vue';
 import { autoCompleteProps } from 'ant-design-vue/lib/auto-complete';
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
+import { omit } from "lodash-es";
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JAutoComplete'
@@ -42,38 +55,60 @@ const __sfc_main__ = _defineComponent({
             default: 'label',
         },
     },
-    emits: ["select"],
+    emits: ["select", "change", "update:value"],
     setup(__props, { emit: __emit }) {
         const props = __props;
         const emit = __emit;
-        const _options = ref([]);
+        const displayText = ref();
+        const selectedValue = ref();
+        const keyword = ref('');
+        const filteredOptions = computed(() => {
+            if (!keyword.value)
+                return props.options;
+            return props.options.filter(opt => String(_nullishCoalesce(opt[props.searchKey], () => ('')))
+                .includes(keyword.value));
+        });
         /**
          * 根据关键词提示
          * @param searchText 关键词
          */
         const onSearch = (searchText) => {
-            _options.value = _optionalChain([props, 'access', _2 => _2.options, 'optionalAccess', _3 => _3.filter, 'call', _4 => _4((item) => !!_optionalChain([item, 'access', _5 => _5[props.searchKey], 'optionalAccess', _6 => _6.includes, 'call', _7 => _7(searchText)]))]) || [];
-            if (!_options.value.length) {
-                _options.value.unshift({ label: searchText, value: searchText });
-            }
+            keyword.value = searchText;
+            // _options.value = props.options?.filter(
+            //   (item) => !!item[props.searchKey]?.includes(searchText),
+            // ) || [];
+            // if (!_options.value.length) {
+            //   _options.value.unshift({ label: searchText, value: searchText });
+            // }
         };
-        const dropdownVisibleChange = (open) => {
-            if (!open) {
-                // 关闭还原下拉options
-                setTimeout(() => {
-                    _options.value = props.options || [];
-                });
-            }
+        const onSelect = (val, option) => {
+            displayText.value = option.label;
+            emit('update:value', val);
+            emit('select', val, option);
+        };
+        const onChange = (val) => {
+            displayText.value = val;
+            keyword.value = val;
+            emit('update:value', '');
         };
-        watch(() => JSON.stringify(props.options), // 处理options变化
-        () => {
-            _options.value = props.options || [];
+        watch(() => props.value, (val) => {
+            if (!val) {
+                displayText.value = '';
+            }
+            else {
+                const found = _optionalChain([props, 'access', _2 => _2.options, 'optionalAccess', _3 => _3.find, 'call', _4 => _4((opt) => opt.value === val)]);
+                displayText.value = _nullishCoalesce(_optionalChain([found, 'optionalAccess', _5 => _5.label]), () => (''));
+            }
         }, { immediate: true });
         return (_ctx, _cache) => {
-            return (_openBlock(), _createBlock(_unref(AutoComplete), _mergeProps({ style: { "width": "100%" } }, props, {
-                options: _options.value,
+            return (_openBlock(), _createBlock(_unref(AutoComplete), _mergeProps({ ..._unref(omit)(props, ['onSelect']) }, {
+                style: { "width": "100%" },
+                value: displayText.value,
+                "onUpdate:value": _cache[0] || (_cache[0] = ($event) => ((displayText).value = $event)),
+                options: filteredOptions.value,
                 onSearch: onSearch,
-                onDropdownVisibleChange: dropdownVisibleChange
+                onChange: onChange,
+                onSelect: onSelect
             }), {
                 option: _withCtx(({ value, label }) => [
                     _renderSlot(_ctx.$slots, "option", { value: value }, () => [
@@ -84,7 +119,7 @@ const __sfc_main__ = _defineComponent({
                     _renderSlot(_ctx.$slots, "default")
                 ]),
                 _: 3 /* FORWARDED */
-            }, 16 /* FULL_PROPS */, ["options"]));
+            }, 16 /* FULL_PROPS */, ["value", "options"]));
         };
     }
 });

package/es/CardSelect/CardSelect.js

@@ -11,12 +11,14 @@
   "ref": "setup-const",
   "watch": "setup-const",
   "genCompoentStyle": "setup-maybe-ref",
+  "Form": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "selectKeys": "setup-ref",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
   "hashId": "setup-maybe-ref",
+  "formItemContext": "setup-maybe-ref",
   "CardSelectStyle": "setup-ref",
   "isMultiple": "setup-ref",
   "handleSelect": "setup-const"
@@ -26,6 +28,7 @@ const _hoisted_1 = ["onClick"];
 import { has } from 'lodash-es';
 import { computed, ref, watch } from 'vue';
 import genCompoentStyle from './style';
+import { Form } from 'ant-design-vue';
 const __sfc_main__ = Object.assign({
     name: 'JCardSelect'
 }, {
@@ -66,6 +69,7 @@ const __sfc_main__ = Object.assign({
         const selectKeys = ref([]);
         const prefixCls = computed(() => 'j-card-select');
         const [wrapSSR, hashId] = genCompoentStyle(prefixCls);
+        const formItemContext = Form.useInjectFormItemContext();
         const CardSelectStyle = computed(() => {
             const _column = props.column > 0 && props.layout === 'horizontal' ? props.column : 1;
             return {
@@ -100,6 +104,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/CheckButton/CheckButton.js

@@ -10,11 +10,13 @@
   "watch": "setup-const",
   "isArray": "setup-maybe-ref",
   "useCheckButtonStyle": "setup-maybe-ref",
+  "Form": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
   "hashId": "setup-maybe-ref",
+  "formItemContext": "setup-maybe-ref",
   "myValue": "setup-ref",
   "optionsMap": "setup-ref",
   "_options": "setup-ref",
@@ -26,6 +28,7 @@ const _hoisted_1 = ["onClick"];
 import { computed, ref, watch } from 'vue';
 import { isArray } from '@jetlinks-web/utils';
 import useCheckButtonStyle from './style';
+import { Form } from "ant-design-vue";
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JCheckButton'
@@ -63,6 +66,7 @@ const __sfc_main__ = _defineComponent({
         // 使用样式
         const prefixCls = computed(() => 'j-check-button');
         const [wrapSSR, hashId] = useCheckButtonStyle(prefixCls);
+        const formItemContext = Form.useInjectFormItemContext();
         const myValue = ref();
         const optionsMap = ref(new Map());
         const _options = computed(() => {
@@ -103,6 +107,7 @@ const __sfc_main__ = _defineComponent({
             emit('update:value', _value);
             emit('change', _value, props.multiple ? optionsItems : optionsItems[0]);
             emit('select', _value, props.multiple ? optionsItems : optionsItems[0]);
+            formItemContext.onFieldChange();
         };
         return (_ctx, _cache) => {
             return (_openBlock(), _createElementBlock("div", {

package/es/Search/Advanced/index.js

@@ -369,10 +369,7 @@ const __sfc_main__ = _defineComponent({
                                         expandChange: expandChange
                                     }, () => [
                                         _createElementVNode("div", _hoisted_6, [
-                                            _createVNode(_unref(Button), {
-                                                type: "stroke",
-                                                onClick: reset
-                                            }, {
+                                            _createVNode(_unref(Button), { onClick: reset }, {
                                                 default: _withCtx(() => [
                                                     _createTextVNode(_toDisplayString(_unref(contextLocale).advanced.reset), 1 /* TEXT */)
                                                 ]),

package/es/Search/hooks/index.js

@@ -73,7 +73,7 @@ export var useHandleColumns = function useHandleColumns(props, terms, options) {
   var initValues = function initValues() {
     var arr = Object.values(columnsMap.value);
     if (!arr.length) return;
-    if (options.mode === 'advanced') {
+    if ((options === null || options === void 0 ? void 0 : options.mode) === 'advanced') {
       //  设置第一位
       terms.terms = [getItemDefaultValue(arr[0], defaultCacheValues.value)];
     } else {

package/es/VirtualTable/data.js

@@ -7,7 +7,11 @@ var _flattenTree = function flattenTree(tree) {
   var parentId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   return tree.flatMap(function (item) {
     var _item$children;
+    var _children = (item.children || []).map(function (i) {
+      return _objectSpread({}, omit(i, 'children'));
+    });
     var flatNode = _objectSpread(_objectSpread({}, omit(item, 'children')), {}, {
+      children: _children,
       level: level,
       parentId: parentId,
       expanded: false,

package/lib/AutoComplete/AutoComplete.js

@@ -1,3 +1,9 @@
+function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) {
+    return lhs;
+}
+else {
+    return rhsFn();
+} }
 function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) {
     const op = ops[i];
     const fn = ops[i + 1];
@@ -20,17 +26,24 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "autoCompleteProps": "setup-maybe-ref",
   "ref": "setup-const",
   "watch": "setup-const",
+  "computed": "setup-const",
+  "omit": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
-  "_options": "setup-ref",
+  "displayText": "setup-ref",
+  "selectedValue": "setup-ref",
+  "keyword": "setup-ref",
+  "filteredOptions": "setup-ref",
   "onSearch": "setup-const",
-  "dropdownVisibleChange": "setup-const"
+  "onSelect": "setup-const",
+  "onChange": "setup-const"
 } */
 import { defineComponent as _defineComponent } from 'vue';
-import { renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, unref as _unref, mergeProps as _mergeProps, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
+import { unref as _unref, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, mergeProps as _mergeProps, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
 import { AutoComplete } from 'ant-design-vue';
 import { autoCompleteProps } from 'ant-design-vue/lib/auto-complete';
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
+import { omit } from "lodash-es";
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JAutoComplete'
@@ -42,38 +55,60 @@ const __sfc_main__ = _defineComponent({
             default: 'label',
         },
     },
-    emits: ["select"],
+    emits: ["select", "change", "update:value"],
     setup(__props, { emit: __emit }) {
         const props = __props;
         const emit = __emit;
-        const _options = ref([]);
+        const displayText = ref();
+        const selectedValue = ref();
+        const keyword = ref('');
+        const filteredOptions = computed(() => {
+            if (!keyword.value)
+                return props.options;
+            return props.options.filter(opt => String(_nullishCoalesce(opt[props.searchKey], () => ('')))
+                .includes(keyword.value));
+        });
         /**
          * 根据关键词提示
          * @param searchText 关键词
          */
         const onSearch = (searchText) => {
-            _options.value = _optionalChain([props, 'access', _2 => _2.options, 'optionalAccess', _3 => _3.filter, 'call', _4 => _4((item) => !!_optionalChain([item, 'access', _5 => _5[props.searchKey], 'optionalAccess', _6 => _6.includes, 'call', _7 => _7(searchText)]))]) || [];
-            if (!_options.value.length) {
-                _options.value.unshift({ label: searchText, value: searchText });
-            }
+            keyword.value = searchText;
+            // _options.value = props.options?.filter(
+            //   (item) => !!item[props.searchKey]?.includes(searchText),
+            // ) || [];
+            // if (!_options.value.length) {
+            //   _options.value.unshift({ label: searchText, value: searchText });
+            // }
         };
-        const dropdownVisibleChange = (open) => {
-            if (!open) {
-                // 关闭还原下拉options
-                setTimeout(() => {
-                    _options.value = props.options || [];
-                });
-            }
+        const onSelect = (val, option) => {
+            displayText.value = option.label;
+            emit('update:value', val);
+            emit('select', val, option);
+        };
+        const onChange = (val) => {
+            displayText.value = val;
+            keyword.value = val;
+            emit('update:value', '');
         };
-        watch(() => JSON.stringify(props.options), // 处理options变化
-        () => {
-            _options.value = props.options || [];
+        watch(() => props.value, (val) => {
+            if (!val) {
+                displayText.value = '';
+            }
+            else {
+                const found = _optionalChain([props, 'access', _2 => _2.options, 'optionalAccess', _3 => _3.find, 'call', _4 => _4((opt) => opt.value === val)]);
+                displayText.value = _nullishCoalesce(_optionalChain([found, 'optionalAccess', _5 => _5.label]), () => (''));
+            }
         }, { immediate: true });
         return (_ctx, _cache) => {
-            return (_openBlock(), _createBlock(_unref(AutoComplete), _mergeProps({ style: { "width": "100%" } }, props, {
-                options: _options.value,
+            return (_openBlock(), _createBlock(_unref(AutoComplete), _mergeProps({ ..._unref(omit)(props, ['onSelect']) }, {
+                style: { "width": "100%" },
+                value: displayText.value,
+                "onUpdate:value": _cache[0] || (_cache[0] = ($event) => ((displayText).value = $event)),
+                options: filteredOptions.value,
                 onSearch: onSearch,
-                onDropdownVisibleChange: dropdownVisibleChange
+                onChange: onChange,
+                onSelect: onSelect
             }), {
                 option: _withCtx(({ value, label }) => [
                     _renderSlot(_ctx.$slots, "option", { value: value }, () => [
@@ -84,7 +119,7 @@ const __sfc_main__ = _defineComponent({
                     _renderSlot(_ctx.$slots, "default")
                 ]),
                 _: 3 /* FORWARDED */
-            }, 16 /* FULL_PROPS */, ["options"]));
+            }, 16 /* FULL_PROPS */, ["value", "options"]));
         };
     }
 });

package/lib/CardSelect/CardSelect.js

@@ -11,12 +11,14 @@
   "ref": "setup-const",
   "watch": "setup-const",
   "genCompoentStyle": "setup-maybe-ref",
+  "Form": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "selectKeys": "setup-ref",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
   "hashId": "setup-maybe-ref",
+  "formItemContext": "setup-maybe-ref",
   "CardSelectStyle": "setup-ref",
   "isMultiple": "setup-ref",
   "handleSelect": "setup-const"
@@ -26,6 +28,7 @@ const _hoisted_1 = ["onClick"];
 import { has } from 'lodash-es';
 import { computed, ref, watch } from 'vue';
 import genCompoentStyle from './style';
+import { Form } from 'ant-design-vue';
 const __sfc_main__ = Object.assign({
     name: 'JCardSelect'
 }, {
@@ -66,6 +69,7 @@ const __sfc_main__ = Object.assign({
         const selectKeys = ref([]);
         const prefixCls = computed(() => 'j-card-select');
         const [wrapSSR, hashId] = genCompoentStyle(prefixCls);
+        const formItemContext = Form.useInjectFormItemContext();
         const CardSelectStyle = computed(() => {
             const _column = props.column > 0 && props.layout === 'horizontal' ? props.column : 1;
             return {
@@ -100,6 +104,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/lib/CheckButton/CheckButton.js

@@ -10,11 +10,13 @@
   "watch": "setup-const",
   "isArray": "setup-maybe-ref",
   "useCheckButtonStyle": "setup-maybe-ref",
+  "Form": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
   "hashId": "setup-maybe-ref",
+  "formItemContext": "setup-maybe-ref",
   "myValue": "setup-ref",
   "optionsMap": "setup-ref",
   "_options": "setup-ref",
@@ -26,6 +28,7 @@ const _hoisted_1 = ["onClick"];
 import { computed, ref, watch } from 'vue';
 import { isArray } from '@jetlinks-web/utils';
 import useCheckButtonStyle from './style';
+import { Form } from "ant-design-vue";
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JCheckButton'
@@ -63,6 +66,7 @@ const __sfc_main__ = _defineComponent({
         // 使用样式
         const prefixCls = computed(() => 'j-check-button');
         const [wrapSSR, hashId] = useCheckButtonStyle(prefixCls);
+        const formItemContext = Form.useInjectFormItemContext();
         const myValue = ref();
         const optionsMap = ref(new Map());
         const _options = computed(() => {
@@ -103,6 +107,7 @@ const __sfc_main__ = _defineComponent({
             emit('update:value', _value);
             emit('change', _value, props.multiple ? optionsItems : optionsItems[0]);
             emit('select', _value, props.multiple ? optionsItems : optionsItems[0]);
+            formItemContext.onFieldChange();
         };
         return (_ctx, _cache) => {
             return (_openBlock(), _createElementBlock("div", {

package/lib/Search/Advanced/index.js

@@ -369,10 +369,7 @@ const __sfc_main__ = _defineComponent({
                                         expandChange: expandChange
                                     }, () => [
                                         _createElementVNode("div", _hoisted_6, [
-                                            _createVNode(_unref(Button), {
-                                                type: "stroke",
-                                                onClick: reset
-                                            }, {
+                                            _createVNode(_unref(Button), { onClick: reset }, {
                                                 default: _withCtx(() => [
                                                     _createTextVNode(_toDisplayString(_unref(contextLocale).advanced.reset), 1 /* TEXT */)
                                                 ]),

package/lib/Search/hooks/index.js

@@ -121,7 +121,7 @@ var useHandleColumns = exports.useHandleColumns = function useHandleColumns(prop
   var initValues = function initValues() {
     var arr = Object.values(columnsMap.value);
     if (!arr.length) return;
-    if (options.mode === 'advanced') {
+    if ((options === null || options === void 0 ? void 0 : options.mode) === 'advanced') {
       //  设置第一位
       terms.terms = [(0, _util.getItemDefaultValue)(arr[0], defaultCacheValues.value)];
     } else {

package/lib/VirtualTable/data.js

@@ -15,7 +15,11 @@ var _flattenTree = exports.flattenTree = function flattenTree(tree) {
   var parentId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   return tree.flatMap(function (item) {
     var _item$children;
+    var _children = (item.children || []).map(function (i) {
+      return (0, _objectSpread2.default)({}, (0, _lodashEs.omit)(i, 'children'));
+    });
     var flatNode = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodashEs.omit)(item, 'children')), {}, {
+      children: _children,
       level: level,
       parentId: parentId,
       expanded: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -155,8 +155,8 @@
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
     "@jetlinks-web/constants": "^1.0.9",
-    "@jetlinks-web/hooks": "^1.1.1",
-    "@jetlinks-web/utils": "^1.2.12"
+    "@jetlinks-web/utils": "^1.2.12",
+    "@jetlinks-web/hooks": "^1.1.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",