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

package/es/modules/gct-form/controller/form-edit-item/form-edit-item.controller.mjs

@@ -15,6 +15,7 @@ import { cloneDeep } from "lodash-es";
 * @implements {IFormEditItemController}
 */
 var FormEditItemController = class extends FormItemBasicController {
+	_ignoreChangeOnce = false;
 	get key() {
 		return this.model.field ?? this.model.name;
 	}
@@ -22,10 +23,14 @@ var FormEditItemController = class extends FormItemBasicController {
 		return getValue(this.key, this.form.state.data);
 	}
 	set value(value) {
-		const data = this.form.state.data;
-		const oldValue = cloneDeep(getValue(this.key, data));
-		setValue(value, this.key, data);
-		this.form.evt.emit("change", this.key, value, oldValue);
+		if (!this._ignoreChangeOnce) {
+			const oldValue = cloneDeep(getValue(this.key, this.form.state.data));
+			setValue(value, this.key, this.form.state.data);
+			this.form.evt.emit("change", this.key, value, oldValue);
+		} else {
+			setValue(value, this.key, this.form.state.data);
+			this._ignoreChangeOnce = false;
+		}
 		this.state.value = value;
 	}
 	get editorValue() {
@@ -40,6 +45,9 @@ var FormEditItemController = class extends FormItemBasicController {
 		});
 		else this.value = v;
 	}
+	ignoreChangeOnce() {
+		this._ignoreChangeOnce = true;
+	}
 	init() {
 		super.init();
 		if (this.model.type !== "hidden") {

package/es/modules/gct-form/interface/i-controller/form-edit-item/form-edit-item.controller.d.ts

@@ -37,6 +37,13 @@ export interface IFormEditItemController<M extends IFormEditItem = IFormEditItem
      * @type {string}
      */
     key: string;
+    /**
+     * 忽略下一次值变化
+     *
+     * @author zhanghanrui
+     * @date 2024-04-02 20:04:55
+     */
+    ignoreChangeOnce(): void;
     /**
      * 重置表单项值
      *

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/es/modules/global-modal/src/components/ModalClose.vue_vue_type_style_index_0_lang.css

@@ -69,8 +69,6 @@
   margin-left: 27px;
 }
 .gct-basic-modal-close {
-  display: flex;
-  align-items: center;
   height: 95%;
 }
 .gct-basic-modal-close > span {
@@ -86,6 +84,7 @@
 .gct-basic-modal-close span:nth-child(1) {
   display: inline-block;
   padding: 10px;
+  padding-right: 0;
 }
 .gct-basic-modal-close span:nth-child(1):hover {
   color: var(--ant-primary-color);

package/es/modules/global-modal/src/components/ModalWrapper.vue_vue_type_script_lang.mjs

@@ -1,5 +1,5 @@
-import { GctOverlayScrollbars } from "../../../../components/overlay-scrollbars/gct-overlay-scrollbars.mjs";
 import { createModalContext } from "../hooks/useModalContext.mjs";
+import { GctOverlayScrollbars } from "../../../../components/overlay-scrollbars/gct-overlay-scrollbars.mjs";
 import { computed, defineComponent, nextTick, onMounted, onUnmounted, ref, unref, watch, watchEffect } from "vue";
 import { useNamespace } from "@gct-paas/core";
 import { useMutationObserver, useWindowSize } from "@vueuse/core";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core-web",
-  "version": "0.1.6-dev.24",
+  "version": "0.1.6-dev.26",
   "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.26",
+    "@gct-paas/scss": "0.1.6-dev.26",
+    "@gct-paas/core-components": "0.1.6-dev.26",
+    "@gct-paas/v-ben": "0.1.6-dev.26"
   },
   "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/core": "0.1.6-dev.26",
+    "@gct-paas/core-components": "0.1.6-dev.26",
+    "@gct-paas/scss": "0.1.6-dev.26",
+    "@gct-paas/v-ben": "0.1.6-dev.26"
   },
   "devDependencies": {
     "@types/bwip-js": "^3.2.3",