@jetlinks-web/components 2.3.9 → 2.3.10

package/es/ConfigProvider/context.js

@@ -7,6 +7,9 @@ export var configProps = function configProps() {
     },
     MapConfig: {
       type: Object
+    },
+    SearchConfig: {
+      type: Object
     }
   });
 };

package/es/ConfigProvider/index.js

@@ -2,7 +2,7 @@ import { createVNode as _createVNode } from "vue";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { defineComponent, provide, reactive, h } from 'vue';
 import { configProps } from './context';
-import { ComponentsEnum, MAPConfig } from '@jetlinks-web/constants';
+import { ComponentsEnum, MAPConfig, SearchConfig } from '@jetlinks-web/constants';
 import { ConfigProvider } from 'ant-design-vue';
 import { omit } from 'lodash-es';
 import Empty from '../Empty';
@@ -14,10 +14,13 @@ var JConfigProvider = defineComponent({
     var slots = _ref.slots;
     var _iconConfig = reactive(props.IconConfig || {});
     var _mapConfig = reactive(props.MapConfig || {});
+    var _searchConfig = reactive(props.SearchConfig || {});
+    console.log('_searchConfig', _searchConfig);
     provide(ComponentsEnum.Icon, _iconConfig); // 全局Icon 配置
     provide(MAPConfig, _mapConfig); // 全局地图配置
+    provide(SearchConfig, _searchConfig); // 全局搜索配置
     return function () {
-      return h(ConfigProvider, _objectSpread({}, omit(props, ['IconConfig', 'MapConfig'])), {
+      return h(ConfigProvider, _objectSpread({}, omit(props, ['IconConfig', 'MapConfig', 'SearchConfig'])), {
         default: slots.default,
         renderEmpty: function renderEmpty() {
           var _slots$renderEmpty;

package/es/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970194654"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045323521"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/es/FullPage/FullPage.js

@@ -6,7 +6,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970195230"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045323657"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/es/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970196627"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045324183"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/es/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970197062"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045325366"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970196437"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045324800"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,
@@ -277,7 +277,6 @@ const __sfc_main__ = _defineComponent({
                     value: item.column,
                 };
             });
-            console.log(props.onlyValue);
             if (!props.onlyValue) {
                 // 获取第一个值
                 const sortColumn = cloneDeep(props.columns);
@@ -317,7 +316,6 @@ const __sfc_main__ = _defineComponent({
             termsModel.value = undefined;
         };
         watch(() => props.columns, () => {
-            console.log(props.columns);
             if (props.columns) {
                 handleItem();
             }

package/es/Search/Search.js

@@ -7,6 +7,7 @@
   "labelWidth": "props",
   "resetText": "props",
   "submitText": "props",
+  "align": "props",
   "JColumnsProps": "setup-maybe-ref",
   "SearchItemData": "setup-maybe-ref",
   "SearchProps": "setup-maybe-ref",
@@ -20,14 +21,20 @@
   "reactive": "setup-const",
   "ref": "setup-const",
   "provide": "setup-const",
+  "watch": "setup-const",
+  "computed": "setup-const",
+  "inject": "setup-const",
   "termsParamsFormat": "setup-maybe-ref",
   "SearchItem": "setup-const",
   "optionsMapKey": "setup-maybe-ref",
+  "SearchConfig": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "columnOptionMap": "setup-ref",
   "emit": "setup-const",
   "terms": "setup-reactive-const",
   "searchItems": "setup-ref",
+  "context": "setup-maybe-ref",
+  "footerStyles": "setup-ref",
   "itemValueChange": "setup-const",
   "handleItems": "setup-const",
   "searchSubmit": "setup-const",
@@ -36,15 +43,16 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970196539"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045324908"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';
 import { set } from 'lodash-es';
-import { reactive, ref, provide } from 'vue';
+import { reactive, ref, provide, watch, computed, inject } from 'vue';
 import { termsParamsFormat } from './util';
 import SearchItem from './Item.js';
 import { optionsMapKey } from './setting';
+import { SearchConfig } from '@jetlinks-web/constants';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JSearch',
@@ -84,6 +92,10 @@ const __sfc_main__ = _defineComponent({
             type: String,
             default: '搜索',
         },
+        align: {
+            type: String,
+            default: 'value'
+        }
     },
     emits: ["search"],
     setup(__props, { emit: __emit }) {
@@ -93,6 +105,14 @@ const __sfc_main__ = _defineComponent({
         // 当前查询条件
         const terms = reactive({ terms: [] });
         const searchItems = ref([]); // 当前查询条件列表
+        const context = inject(SearchConfig, { align: props.align });
+        const footerStyles = computed(() => {
+            const align = context.align || props.align;
+            if (align === 'value') {
+                return { paddingLeft: `${props.labelWidth + 8}px` };
+            }
+            return {};
+        });
         provide(optionsMapKey, columnOptionMap);
         const itemValueChange = (value, index) => {
             set(terms.terms, [index], value);
@@ -159,7 +179,9 @@ const __sfc_main__ = _defineComponent({
                 emit('search', []);
             }
         };
-        handleItems();
+        watch(() => props.columns, () => {
+            handleItems();
+        }, { immediate: true, deep: true });
         return (_ctx, _cache) => {
             return (_openBlock(), _createBlock(_unref(Form), {
                 model: terms,
@@ -205,9 +227,7 @@ const __sfc_main__ = _defineComponent({
                                                 }, () => [
                                                     _createElementVNode("div", {
                                                         class: "JSearch-footer--btns",
-                                                        style: _normalizeStyle({
-                                                            paddingLeft: `${__props.labelWidth + 8}px`,
-                                                        })
+                                                        style: _normalizeStyle(footerStyles.value)
                                                     }, [
                                                         _createVNode(_unref(Button), {
                                                             type: "stroke",

package/lib/ConfigProvider/context.js

@@ -14,6 +14,9 @@ var configProps = exports.configProps = function configProps() {
     },
     MapConfig: {
       type: Object
+    },
+    SearchConfig: {
+      type: Object
     }
   });
 };

package/lib/ConfigProvider/index.js

@@ -20,10 +20,13 @@ var JConfigProvider = (0, _vue.defineComponent)({
     var slots = _ref.slots;
     var _iconConfig = (0, _vue.reactive)(props.IconConfig || {});
     var _mapConfig = (0, _vue.reactive)(props.MapConfig || {});
+    var _searchConfig = (0, _vue.reactive)(props.SearchConfig || {});
+    console.log('_searchConfig', _searchConfig);
     (0, _vue.provide)(_constants.ComponentsEnum.Icon, _iconConfig); // 全局Icon 配置
     (0, _vue.provide)(_constants.MAPConfig, _mapConfig); // 全局地图配置
+    (0, _vue.provide)(_constants.SearchConfig, _searchConfig); // 全局搜索配置
     return function () {
-      return (0, _vue.h)(_antDesignVue.ConfigProvider, (0, _objectSpread2.default)({}, (0, _lodashEs.omit)(props, ['IconConfig', 'MapConfig'])), {
+      return (0, _vue.h)(_antDesignVue.ConfigProvider, (0, _objectSpread2.default)({}, (0, _lodashEs.omit)(props, ['IconConfig', 'MapConfig', 'SearchConfig'])), {
         default: slots.default,
         renderEmpty: function renderEmpty() {
           var _slots$renderEmpty;

package/lib/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970194627"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045323499"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/lib/FullPage/FullPage.js

@@ -6,7 +6,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970195223"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045323646"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/lib/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970196617"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045324194"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/lib/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970197074"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045325353"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970196374"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045324741"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,
@@ -277,7 +277,6 @@ const __sfc_main__ = _defineComponent({
                     value: item.column,
                 };
             });
-            console.log(props.onlyValue);
             if (!props.onlyValue) {
                 // 获取第一个值
                 const sortColumn = cloneDeep(props.columns);
@@ -317,7 +316,6 @@ const __sfc_main__ = _defineComponent({
             termsModel.value = undefined;
         };
         watch(() => props.columns, () => {
-            console.log(props.columns);
             if (props.columns) {
                 handleItem();
             }

package/lib/Search/Search.js

@@ -7,6 +7,7 @@
   "labelWidth": "props",
   "resetText": "props",
   "submitText": "props",
+  "align": "props",
   "JColumnsProps": "setup-maybe-ref",
   "SearchItemData": "setup-maybe-ref",
   "SearchProps": "setup-maybe-ref",
@@ -20,14 +21,20 @@
   "reactive": "setup-const",
   "ref": "setup-const",
   "provide": "setup-const",
+  "watch": "setup-const",
+  "computed": "setup-const",
+  "inject": "setup-const",
   "termsParamsFormat": "setup-maybe-ref",
   "SearchItem": "setup-const",
   "optionsMapKey": "setup-maybe-ref",
+  "SearchConfig": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "columnOptionMap": "setup-ref",
   "emit": "setup-const",
   "terms": "setup-reactive-const",
   "searchItems": "setup-ref",
+  "context": "setup-maybe-ref",
+  "footerStyles": "setup-ref",
   "itemValueChange": "setup-const",
   "handleItems": "setup-const",
   "searchSubmit": "setup-const",
@@ -36,15 +43,16 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1725970196510"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726045324883"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';
 import { set } from 'lodash-es';
-import { reactive, ref, provide } from 'vue';
+import { reactive, ref, provide, watch, computed, inject } from 'vue';
 import { termsParamsFormat } from './util';
 import SearchItem from './Item.js';
 import { optionsMapKey } from './setting';
+import { SearchConfig } from '@jetlinks-web/constants';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JSearch',
@@ -84,6 +92,10 @@ const __sfc_main__ = _defineComponent({
             type: String,
             default: '搜索',
         },
+        align: {
+            type: String,
+            default: 'value'
+        }
     },
     emits: ["search"],
     setup(__props, { emit: __emit }) {
@@ -93,6 +105,14 @@ const __sfc_main__ = _defineComponent({
         // 当前查询条件
         const terms = reactive({ terms: [] });
         const searchItems = ref([]); // 当前查询条件列表
+        const context = inject(SearchConfig, { align: props.align });
+        const footerStyles = computed(() => {
+            const align = context.align || props.align;
+            if (align === 'value') {
+                return { paddingLeft: `${props.labelWidth + 8}px` };
+            }
+            return {};
+        });
         provide(optionsMapKey, columnOptionMap);
         const itemValueChange = (value, index) => {
             set(terms.terms, [index], value);
@@ -159,7 +179,9 @@ const __sfc_main__ = _defineComponent({
                 emit('search', []);
             }
         };
-        handleItems();
+        watch(() => props.columns, () => {
+            handleItems();
+        }, { immediate: true, deep: true });
         return (_ctx, _cache) => {
             return (_openBlock(), _createBlock(_unref(Form), {
                 model: terms,
@@ -205,9 +227,7 @@ const __sfc_main__ = _defineComponent({
                                                 }, () => [
                                                     _createElementVNode("div", {
                                                         class: "JSearch-footer--btns",
-                                                        style: _normalizeStyle({
-                                                            paddingLeft: `${__props.labelWidth + 8}px`,
-                                                        })
+                                                        style: _normalizeStyle(footerStyles.value)
                                                     }, [
                                                         _createVNode(_unref(Button), {
                                                             type: "stroke",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -152,7 +152,7 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
-    "@jetlinks-web/constants": "^1.0.3",
+    "@jetlinks-web/constants": "^1.0.4",
     "@jetlinks-web/utils": "^1.2.1",
     "@jetlinks-web/hooks": "^1.0.16"
   },