@gct-paas/core-web 0.1.6-dev.24 → 0.1.6-dev.25

package/es/components/serial-number/serial-number-item.vue.mjs

@@ -1,8 +1,8 @@
 import _plugin_vue_export_helper_default from "../../_virtual/_plugin-vue_export-helper.mjs";
 import serial_number_item_vue_vue_type_script_setup_true_lang_default from "./serial-number-item.vue_vue_type_script_setup_true_lang.mjs";
-import './serial-number-item.vue_vue_type_style_index_1_lang.css';import './serial-number-item.vue_vue_type_style_index_0_scoped_f992d0b8_lang.css';/* empty css                                                                         */
+import './serial-number-item.vue_vue_type_style_index_1_lang.css';import './serial-number-item.vue_vue_type_style_index_0_scoped_8083036b_lang.css';/* empty css                                                                         */
 /* empty css                                                         */
 //#region src/components/serial-number/serial-number-item.vue
-var serial_number_item_default = /* @__PURE__ */ _plugin_vue_export_helper_default(serial_number_item_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-f992d0b8"]]);
+var serial_number_item_default = /* @__PURE__ */ _plugin_vue_export_helper_default(serial_number_item_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-8083036b"]]);
 //#endregion
 export { serial_number_item_default as default };

package/es/components/serial-number/serial-number-item.vue_vue_type_script_setup_true_lang.mjs

@@ -1,3 +1,4 @@
+import data_field_cascader_default from "./components/data-field-cascader.vue.mjs";
 import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeClass, normalizeStyle, openBlock, ref, renderList, resolveComponent, toDisplayString, unref, vShow, withCtx, withDirectives } from "vue";
 import { omit } from "lodash-es";
 import { PatternEnum, ResetConditionEnum, TypeEnum, t } from "@gct-paas/core";
@@ -175,7 +176,6 @@ var serial_number_item_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 			const _component_a_tooltip = resolveComponent("a-tooltip");
 			const _component_a_select_option = resolveComponent("a-select-option");
 			const _component_a_select = resolveComponent("a-select");
-			const _component_data_field_cascader = resolveComponent("data-field-cascader");
 			const _component_a_checkbox = resolveComponent("a-checkbox");
 			const _component_a_button = resolveComponent("a-button");
 			return openBlock(), createElementBlock("div", { class: normalizeClass(["series-item-wrapper", { "series-disable": !__props.isShow }]) }, [
@@ -201,7 +201,8 @@ var serial_number_item_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 						createElementVNode("div", { class: normalizeClass(["flex flex-col mr-8px", { "serial-num-no-error": padding.value }]) }, [createElementVNode("div", _hoisted_4, toDisplayString(unref(t)("sys.model.placeholder")), 1), createVNode(_component_a_form_item_rest, null, {
 							default: withCtx(() => [createVNode(_component_a_input, {
 								value: padding.value,
-								"onUpdate:value": _cache[2] || (_cache[2] = ($event) => padding.value = $event)
+								"onUpdate:value": _cache[2] || (_cache[2] = ($event) => padding.value = $event),
+								"allow-clear": ""
 							}, null, 8, ["value"])]),
 							_: 1
 						})], 2),
@@ -279,7 +280,8 @@ var serial_number_item_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 							createElementVNode("div", { class: normalizeClass(["flex flex-col mr-8px", { "serial-num-no-error": padding.value }]) }, [createElementVNode("div", _hoisted_11, toDisplayString(unref(t)("sys.model.placeholder")), 1), createVNode(_component_a_form_item_rest, null, {
 								default: withCtx(() => [createVNode(_component_a_input, {
 									value: padding.value,
-									"onUpdate:value": _cache[8] || (_cache[8] = ($event) => padding.value = $event)
+									"onUpdate:value": _cache[8] || (_cache[8] = ($event) => padding.value = $event),
+									"allow-clear": ""
 								}, null, 8, ["value"])]),
 								_: 1
 							})], 2),
@@ -326,7 +328,7 @@ var serial_number_item_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 							}, null, 8, ["value", "placeholder"])]),
 							_: 1
 						})], 2)) : createCommentVNode("", true),
-						configValue.value.type === unref(TypeEnum).PLACEHOLDER ? (openBlock(), createBlock(_component_data_field_cascader, {
+						configValue.value.type === unref(TypeEnum).PLACEHOLDER ? (openBlock(), createBlock(data_field_cascader_default, {
 							key: 2,
 							ref_key: "fieldCascaderRef",
 							ref: fieldCascaderRef,

package/es/components/serial-number/{serial-number-item.vue_vue_type_style_index_0_scoped_f992d0b8_lang.css → serial-number-item.vue_vue_type_style_index_0_scoped_8083036b_lang.css}

@@ -1,4 +1,4 @@
-.series-item-wrapper[data-v-f992d0b8] {
+.series-item-wrapper[data-v-8083036b] {
   display: flex;
   position: relative;
   align-items: center;
@@ -9,10 +9,10 @@
   background: #f2f4f7;
   user-select: none;
 }
-.series-item-wrapper.series-disable[data-v-f992d0b8] {
+.series-item-wrapper.series-disable[data-v-8083036b] {
   pointer-events: none;
 }
-.series-item-wrapper .mover[data-v-f992d0b8] {
+.series-item-wrapper .mover[data-v-8083036b] {
   position: absolute;
   bottom: 10px;
   left: 6px;
@@ -20,48 +20,48 @@
   font-size: 16px;
   cursor: pointer;
 }
-.series-item-wrapper .field-name[data-v-f992d0b8] {
+.series-item-wrapper .field-name[data-v-8083036b] {
   padding-left: 20px;
   color: #333;
 }
-.series-item-wrapper .serial-item-container[data-v-f992d0b8] {
+.series-item-wrapper .serial-item-container[data-v-8083036b] {
   width: 100%;
   padding-left: 24px;
 }
-.series-item-wrapper .serial-item-container .tit[data-v-f992d0b8] {
+.series-item-wrapper .serial-item-container .tit[data-v-8083036b] {
   padding-left: 6px;
   color: #c3c3c3;
   font-size: 12px;
   line-height: 18px;
 }
-.series-item-wrapper .serial-item-container .tip[data-v-f992d0b8] {
+.series-item-wrapper .serial-item-container .tip[data-v-8083036b] {
   color: #c3c3c3;
 }
-.series-item-wrapper .action[data-v-f992d0b8] {
+.series-item-wrapper .action[data-v-8083036b] {
   margin-right: 2px;
 }
-.series-item-wrapper .action[data-v-f992d0b8] .ant-btn {
+.series-item-wrapper .action[data-v-8083036b] .ant-btn {
   border: none;
   background-color: transparent;
   color: #8b8b8b;
 }
-.series-item-wrapper .action[data-v-f992d0b8] .ant-btn:hover {
+.series-item-wrapper .action[data-v-8083036b] .ant-btn:hover {
   background-color: #e8eaee;
   color: #000;
 }
-.series-item-wrapper[data-v-f992d0b8]:hover {
+.series-item-wrapper[data-v-8083036b]:hover {
   border-color: var(--ant-primary-color);
 }
-.series-item-wrapper:hover .field-name[data-v-f992d0b8],
-.series-item-wrapper:hover .mover[data-v-f992d0b8] {
+.series-item-wrapper:hover .field-name[data-v-8083036b],
+.series-item-wrapper:hover .mover[data-v-8083036b] {
   color: var(--ant-primary-color);
 }
-[data-v-f992d0b8] .ant-input-number {
+[data-v-8083036b] .ant-input-number {
   background: #fff !important;
 }
-[data-v-f992d0b8] .ant-input-affix-wrapper,[data-v-f992d0b8] .ant-input {
+[data-v-8083036b] .ant-input-affix-wrapper,[data-v-8083036b] .ant-input {
   background: #fff !important;
 }
-[data-v-f992d0b8] .ant-select .ant-select-selector {
+[data-v-8083036b] .ant-select .ant-select-selector {
   background: #fff !important;
 }

package/es/index.mjs

@@ -68,7 +68,6 @@ import paas_bpmn_log_default from "./components/paas-bpmn-log/paas-bpmn-log.vue.
 import full_screen_default from "./components/FullScreen/full-screen.vue.mjs";
 import { MonacoEditor as MonacoEditor$1 } from "./components/monaco-editor/monaco-editor.mjs";
 import { BatchSelectList } from "./components/batch-select-list/batch-select-list.mjs";
-import { DataRulesModal } from "./components/data-rules-modal/data-rules-modal.mjs";
 import { DesignSaveTip } from "./components/design-save-tip/design-save-tip.mjs";
 import { DesignStepCheck } from "./components/design-step-check/design-step-check.mjs";
 import { ModalNameEditor } from "./components/modal-name-editor/modal-name-editor.mjs";
@@ -167,6 +166,7 @@ import { Ch_Operator, Ch_Perm_Operator, DataRoleSetTabsEnum, DataTypeOptions, Mo
 import { BoolOptions, Ch_FieldTypeName, Ch_SystemVars, Ch_ValueType, ComponentTypeEnum, DateSystemEnum, DateSystemKeys, MultiOperatorTypes, RangTypeEnum, UserSystemEnum, UserSystemKeys, ValueTypeEnum, getCmpConfig } from "./modules/data-rules-container/src/constant/config.mjs";
 import data_rules_container_default from "./modules/data-rules-container/src/data-rules-container.vue.mjs";
 import field_role_container_default from "./modules/data-rules-container/src/field-role-container.vue.mjs";
+import { DataRulesModal } from "./modules/data-rules-container/src/data-rules-modal.mjs";
 import "./modules/data-rules-container/index.mjs";
 import { coreWebCreateAppVue } from "./create-app-vue.mjs";
 import { coreWebSetupApp } from "./setup-app.mjs";

package/es/modules/data-rules-container/index.d.ts

@@ -1,5 +1,6 @@
 import { default as DataRulesContainer } from './src/data-rules-container.vue';
 import { default as FieldRoleContainer } from './src/field-role-container.vue';
 export { FieldRoleContainer, DataRulesContainer };
+export { DataRulesModal } from './src/data-rules-modal';
 export * from './src/constant/config';
 export * from './src/constant/interface';

package/es/modules/data-rules-container/index.mjs

@@ -2,3 +2,4 @@ import "./src/constant/interface.mjs";
 import "./src/constant/config.mjs";
 import "./src/data-rules-container.vue.mjs";
 import "./src/field-role-container.vue.mjs";
+import "./src/data-rules-modal.mjs";

package/es/{components/data-rules-modal → modules/data-rules-container/src}/data-rules-modal.mjs

@@ -1,6 +1,7 @@
-import { createVNode, defineComponent, provide, ref, resolveComponent } from "vue";
+import data_rules_container_default from "./data-rules-container.vue.mjs";
+import { createVNode, defineComponent, provide, ref } from "vue";
 import { FIELD_TYPE, useNamespace } from "@gct-paas/core";
-//#region src/components/data-rules-modal/data-rules-modal.tsx
+//#region src/modules/data-rules-container/src/data-rules-modal.tsx
 /**
 * 字段条件规则配置模态框
 */
@@ -83,10 +84,11 @@ var DataRulesModal = /* @__PURE__ */ defineComponent({
 		}
 		onInit();
 		return () => {
-			return createVNode("div", { "class": ns.b() }, [createVNode(resolveComponent("data-rules-container"), {
-				"ref": "dataRulesRef",
+			return createVNode("div", { "class": ns.b() }, [createVNode(data_rules_container_default, {
+				"ref": dataRulesRef,
 				"fieldList": list.value,
 				"detail": props.detail,
+				"searchType": {},
 				"isDesign": true,
 				"isPageDesigner": true,
 				"excludeValueType": props.excludeValueType,

package/es/modules/gct-form/components/flex-container/flex-container.d.ts

@@ -1,14 +1,10 @@
 import { PropType } from 'vue';
-import { IFlexContainer, IFormGroup } from '../../interface';
+import { IFlexContainer } from '../../interface';
 /**
  * flex 布局容器
  */
 export declare const FlexContainer: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     layout: PropType<IFlexContainer>;
-}>, {
-    ns: import('@gct-paas/core').Namespace;
-    getStyle: () => IData;
-    getItemStyle: (model: IFormGroup) => IData;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     layout: PropType<IFlexContainer>;
 }>> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;

package/es/modules/gct-form/components/flex-container/flex-container.mjs

@@ -1,18 +1,15 @@
 import { FlexItem } from "../flex-item/flex-item.mjs";
 import './flex-container.css';/* empty css                     */
-import { createVNode, defineComponent, isVNode } from "vue";
+import { Fragment, createVNode, defineComponent } from "vue";
 import { useNamespace } from "@gct-paas/core";
 //#region src/modules/gct-form/components/flex-container/flex-container.tsx
 /**
 * flex 布局容器
 */
-function _isSlot(s) {
-	return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
-}
 var FlexContainer = /* @__PURE__ */ defineComponent({
 	name: "FlexContainer",
 	props: { layout: Object },
-	setup(props) {
+	setup(props, { slots }) {
 		const ns = useNamespace("flex-container");
 		const getStyle = () => {
 			const style = {};
@@ -35,26 +32,24 @@ var FlexContainer = /* @__PURE__ */ defineComponent({
 			}
 			return style;
 		};
-		return {
-			ns,
-			getStyle,
-			getItemStyle
+		return () => {
+			let items = slots.default?.() || [];
+			if (items.length === 1) {
+				const item = items[0];
+				if (item.type == Fragment) items = item.children || [];
+			}
+			return createVNode("div", {
+				"class": ns.b(),
+				"style": getStyle()
+			}, [items.map((item) => {
+				if (!item) return null;
+				const model = item.props.model.flexItem;
+				return createVNode(FlexItem, {
+					"layout": model,
+					"style": getItemStyle(item.props.model)
+				}, { default: () => item });
+			})]);
 		};
-	},
-	render() {
-		let items = this.$slots.default?.() || [];
-		if (items.length > 0) items = items[0].children || [];
-		return createVNode("div", {
-			"class": this.ns.b(),
-			"style": this.getStyle()
-		}, [items.map((item) => {
-			if (!item) return null;
-			const model = item.props.model.flexItem;
-			return createVNode(FlexItem, {
-				"layout": model,
-				"style": this.getItemStyle(item.props.model)
-			}, _isSlot(item) ? item : { default: () => [item] });
-		})]);
 	}
 });
 //#endregion

package/es/modules/gct-form/components/flex-item/flex-item.mjs

@@ -30,7 +30,7 @@ var FlexItem = /* @__PURE__ */ defineComponent({
 		return createVNode("div", {
 			"class": this.ns.b(),
 			"style": this.getStyle()
-		}, { default: () => this.$slots.default?.() });
+		}, { default: this.$slots.default });
 	}
 });
 //#endregion

package/es/modules/gct-form/widgets/gct-form/gct-form-group/gct-form-group.mjs

@@ -28,8 +28,8 @@ var GctFormGroup = /* @__PURE__ */ defineComponent({
 		const ns = useNamespace("form-group");
 		const keys = ref([0]);
 		function renderContainer() {
-			if (props.model.layout === "flex") return createVNode(resolveComponent("flex-container"), { "layout": props.model.flex }, { default: () => slots.default?.() });
-			if (props.model.layout === "grid") return createVNode(resolveComponent("grid-container"), { "layout": props.model.grid }, { default: () => slots.default?.() });
+			if (props.model.layout === "flex") return createVNode(resolveComponent("flex-container"), { "layout": props.model.flex }, { ...slots });
+			if (props.model.layout === "grid") return createVNode(resolveComponent("grid-container"), { "layout": props.model.grid }, { ...slots });
 			console.error("不支持的layout类型" + props.model.layout);
 		}
 		const style = {};

package/es/modules/gct-form/widgets/gct-form/gct-form-tab/gct-form-tab.css

@@ -83,12 +83,12 @@
 .gct-form-tab > .ant-tabs-nav > .ant-tabs-nav-wrap {
   border-bottom: 1px solid #E0E3EA;
 }
-.gct-form-tab > .ant-tabs-nav .ant-tabs-tab + .ant-tabs-tab {
-  margin-left: var(--gct-form-tab-tab-spacing);
-}
 .gct-form-tab > .ant-tabs-nav .ant-tabs-tab {
   padding: 7px 0;
 }
+.gct-form-tab > .ant-tabs-nav .ant-tabs-tab + .ant-tabs-tab {
+  margin-left: var(--gct-form-tab-tab-spacing);
+}
 .gct-form-tab.ant-tabs .ant-tabs-tabpane {
   overflow: hidden auto;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core-web",
-  "version": "0.1.6-dev.24",
+  "version": "0.1.6-dev.25",
   "type": "module",
   "description": "paas 平台网页端核心包",
   "loader": "dist/loader.esm.min.js",
@@ -65,20 +65,20 @@
     "vxe-table": "npm:@gct-paas/vxe-table@4.6.19",
     "wujie": "^1.0.29",
     "wujie-vue3": "^1.0.29",
-    "@gct-paas/core": "0.1.6-dev.24",
-    "@gct-paas/scss": "0.1.6-dev.24",
-    "@gct-paas/core-components": "0.1.6-dev.24",
-    "@gct-paas/v-ben": "0.1.6-dev.24"
+    "@gct-paas/core": "0.1.6-dev.25",
+    "@gct-paas/core-components": "0.1.6-dev.25",
+    "@gct-paas/scss": "0.1.6-dev.25",
+    "@gct-paas/v-ben": "0.1.6-dev.25"
   },
   "peerDependencies": {
     "@gct-paas/api": "^0.1.6-dev.14",
     "@types/sortablejs": "^1.15.1",
     "vant": ">=4",
     "vue": ">=3",
-    "@gct-paas/scss": "0.1.6-dev.24",
-    "@gct-paas/core": "0.1.6-dev.24",
-    "@gct-paas/core-components": "0.1.6-dev.24",
-    "@gct-paas/v-ben": "0.1.6-dev.24"
+    "@gct-paas/scss": "0.1.6-dev.25",
+    "@gct-paas/v-ben": "0.1.6-dev.25",
+    "@gct-paas/core": "0.1.6-dev.25",
+    "@gct-paas/core-components": "0.1.6-dev.25"
   },
   "devDependencies": {
     "@types/bwip-js": "^3.2.3",