@gct-paas/word 0.1.74-beta.19 → 0.1.74-beta.20

package/dist/domain/constants/enum/view.d.ts

@@ -89,3 +89,18 @@ export declare const FieldSysVarDefaultValueConst: {
     /** 当前登录用户主部门 */
     CURRENT_ORG: string;
 };
+/** 批次类型 */
+export declare const ContainerRoleConst: {
+    /** 普通批次 */
+    NORMAL: string;
+    /** 关联批父节点 */
+    RELATED_PARENT: string;
+    /** 关联批子批次 */
+    RELATED_CHILD: string;
+    /** 合并批父节点 */
+    MERGE_PARENT: string;
+    /** 共线批父节点 */
+    COLLINEAR_PARENT: string;
+    /** 共线批子节点 */
+    COLLINEAR_CHILD: string;
+};

package/dist/domain/field/form-value.d.ts

@@ -8,6 +8,11 @@ export declare function setValue(value: any, valuePath: string, payload?: {
     [valuePath]: any;
 };
 export declare function toBoolean(value: any): boolean | null;
+/** 布尔选项默认别名 */
+export declare const BOOLEAN_TRUE_LABEL = "\u771F";
+export declare const BOOLEAN_FALSE_LABEL = "\u5047";
+/** 别名为空时回退到默认「真 / 假」 */
+export declare function resolveBooleanOptionLabel(label: unknown, value: unknown): string;
 export declare function toFormatValue(fieldType: FIELD_TYPE, value: any): any;
 export declare function toDictValue(field: string, value: any, row: any): any;
 export declare function getSelectOptions(payload: any): {

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.19 */
+/*! @gct-paas/word v0.1.74-beta.20 */
 import { Fragment, Suspense, Teleport, Transition, TransitionGroup, cloneVNode, computed, createApp, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, getCurrentInstance, getCurrentScope, guardReactiveProps, h, inject, isRef, isVNode, markRaw, mergeModels, mergeProps, nextTick, normalizeClass, normalizeProps, normalizeStyle, onBeforeMount, onBeforeUnmount, onMounted, onScopeDispose, onUnmounted, openBlock, provide, reactive, readonly, ref, render, renderList, renderSlot, resolveComponent, resolveDynamicComponent, shallowRef, toDisplayString, toRaw, toRef, toValue, unref, useCssVars, useModel, useSlots, vModelRadio, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import FloatingVue, { PopperWrapper } from "floating-vue";
 import VueKonva from "vue-konva";
@@ -13591,7 +13591,7 @@ var init_calculate_formula = __esmMin((() => {
 }));
 //#endregion
 //#region src/domain/constants/enum/view.ts
-var EmptySymbolTypeConst, ViewStateTypeConst, RenderCompTypeConst, BooleanShowModeTypeConst, LabelPositionTypeConst, DecimalDisplayModeTypeConst, RangeValidateModeTypeConst, RangeCompareOpTypeConst, FieldSysVarDefaultValueConst;
+var EmptySymbolTypeConst, ViewStateTypeConst, RenderCompTypeConst, BooleanShowModeTypeConst, LabelPositionTypeConst, DecimalDisplayModeTypeConst, RangeValidateModeTypeConst, RangeCompareOpTypeConst, FieldSysVarDefaultValueConst, ContainerRoleConst;
 var init_view = __esmMin((() => {
 	EmptySymbolTypeConst = {
 		"/": "/",
@@ -13667,6 +13667,20 @@ var init_view = __esmMin((() => {
 		/** 当前登录用户主部门 */
 		CURRENT_ORG: "CURRENT_ORG"
 	};
+	ContainerRoleConst = {
+		/** 普通批次 */
+		NORMAL: "normal",
+		/** 关联批父节点 */
+		RELATED_PARENT: "related_parent",
+		/** 关联批子批次 */
+		RELATED_CHILD: "related_child",
+		/** 合并批父节点 */
+		MERGE_PARENT: "merge_parent",
+		/** 共线批父节点 */
+		COLLINEAR_PARENT: "collinear_parent",
+		/** 共线批子节点 */
+		COLLINEAR_CHILD: "collinear_child"
+	};
 }));
 //#endregion
 //#region src/domain/constants/enum/form.ts
@@ -13855,6 +13869,11 @@ function toBoolean(value) {
 	if (isNaN(parseInt(value))) return Boolean(value);
 	return Boolean(parseInt(value));
 }
+/** 别名为空时回退到默认「真 / 假」 */
+function resolveBooleanOptionLabel(label, value) {
+	if (typeof label === "string" && label.trim() !== "") return label;
+	return toBoolean(value) ? "真" : "假";
+}
 function toFormatValue(fieldType, value) {
 	if ([
 		FIELD_TYPE.INTEGER,
@@ -13878,7 +13897,8 @@ function toDictValue(field, value, row) {
 function getSelectOptions(payload) {
 	const { value, multiple, options = [], key } = payload || {};
 	const values = (Array.isArray(value) ? value : multiple ? (value === null || value === void 0 ? void 0 : value.split(",")) ?? [] : [value]).filter((i) => !isNil(i));
-	const selected = options.filter((item) => values.includes(item.value));
+	const optionMap = new Map(options.map((item) => [item.value, item]));
+	const selected = values.map((v) => optionMap.get(v)).filter((item) => item != null);
 	const labels = selected.map((item) => item[key]);
 	return {
 		selectOptions: selected,
@@ -94990,7 +95010,10 @@ function resolveMap(rule, props) {
 	}));
 	if (!rule.filter) return JSON.stringify(options);
 	switch (rule.filter) {
-		case "bool": return resolveBoolFilter(options, props);
+		case "bool": return resolveBoolFilter(options.map((item) => ({
+			...item,
+			label: resolveBooleanOptionLabel(item.label, item.value)
+		})), props);
 		case "enum": {
 			const filtered = options.filter((item) => !has(item, "display") || item.display);
 			return filtered.length ? JSON.stringify(filtered) : void 0;
@@ -95167,7 +95190,9 @@ var init_computed = __esmMin((() => {
 			const valueKey = rule.valueKey ?? "value";
 			const returnKey = rule.returnKey ?? "value";
 			const match = source.find((o) => o[valueKey] === toBoolean(props[rule.valueField]));
-			return match === null || match === void 0 ? void 0 : match[returnKey];
+			if (!match) return;
+			if (returnKey === "label") return resolveBooleanOptionLabel(match.label, match[valueKey]);
+			return match[returnKey];
 		},
 		enum(rule, props) {
 			const source = safeParseJson(props[rule.from || ""]);
@@ -95374,7 +95399,8 @@ function readBoolOptionsLabel(value, widgetProps) {
 	if (!Array.isArray(source)) return void 0;
 	const valueKey = "value";
 	const match = source.find((item) => item[valueKey] === toBoolean(value));
-	return (match === null || match === void 0 ? void 0 : match.label) ?? void 0;
+	if (!match) return void 0;
+	return resolveBooleanOptionLabel(match.label, match[valueKey]);
 }
 async function readApiLabel(strategy, value, fieldBinding, loadFieldByKey) {
 	if (value == null || value === "") return void 0;
@@ -95389,8 +95415,11 @@ async function readApiLabel(strategy, value, fieldBinding, loadFieldByKey) {
 		refModelKey: fieldInfo === null || fieldInfo === void 0 ? void 0 : fieldInfo.bindInfo
 	};
 	try {
-		const result = strategy.fetcher === "rdo2ref" ? await fetcher.getOptionById(String(value), params) : await fetcher.getOptionByIds(getValue$1(value, true), params);
-		const labels = (Array.isArray(result) ? result : result ? [result] : []).map((item) => item === null || item === void 0 ? void 0 : item.label).filter(Boolean);
+		const isSingle = strategy.fetcher === "rdo2ref";
+		const idList = isSingle ? [String(value)] : getValue$1(value, true);
+		const result = isSingle ? await fetcher.getOptionById(idList[0], params) : await fetcher.getOptionByIds(idList, params);
+		const labelByValue = new Map((Array.isArray(result) ? result : result ? [result] : []).filter((item) => (item === null || item === void 0 ? void 0 : item.value) != null && (item === null || item === void 0 ? void 0 : item.label) != null).map((item) => [String(item.value), String(item.label)]));
+		const labels = idList.map((id) => labelByValue.get(String(id))).filter(Boolean);
 		if (labels.length) return labels.join(",");
 		return strategy.fallback;
 	} catch {
@@ -133116,7 +133145,8 @@ var init_assoc_filter = __esmMin((() => {
 	init_fetchers();
 	init_api$1();
 	init_core$1();
-	PARENT_ROLES = /* @__PURE__ */ new Set(["related_parent", "collinear_parent"]);
+	init_enum();
+	PARENT_ROLES = /* @__PURE__ */ new Set([ContainerRoleConst.RELATED_PARENT, ContainerRoleConst.COLLINEAR_PARENT]);
 }));
 //#endregion
 //#region src/runtime/renderer/dropdowns/components/tables/composables/useTableDropdown.ts
@@ -148221,6 +148251,7 @@ var FieldProviderRuntime = class {
 var boolean_manifest_exports = /* @__PURE__ */ __exportAll({ manifest: () => manifest$74 });
 init_field_type();
 init_enum();
+init_form_value();
 init_basic();
 var optionsJson = JSON.stringify([{
 	label: "真",
@@ -159960,6 +159991,7 @@ var FieldPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			return openBlock(), createElementBlock("div", _hoisted_1$57, [
 				createVNode(unref(collapse_default), {
 					title: "字段属性",
+					visible: false,
 					class: "panel-collapse is-first"
 				}, {
 					expandIcon: withCtx(({ open }) => [createVNode(field_panel_chevron_default, { expanded: open }, null, 8, ["expanded"])]),
@@ -160124,7 +160156,7 @@ var schema$3 = {
 			value: (attachFieldTarget === null || attachFieldTarget === void 0 ? void 0 : attachFieldTarget.attachFieldLabel) ?? "引用字段"
 		}];
 	},
-	render: /* @__PURE__ */ _plugin_vue_export_helper_default(FieldPanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-334e23f7"]])
+	render: /* @__PURE__ */ _plugin_vue_export_helper_default(FieldPanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-a9a74705"]])
 };
 //#endregion
 //#region src/suites/edhr/panel-schema/paper-widget/PaperWidgetPanel.vue?vue&type=script&setup=true&lang.ts
@@ -161059,6 +161091,7 @@ var bool_opt_editor_default = /*#__PURE__*/ _plugin_vue_export_helper_default(bo
 //#endregion
 //#region src/suites/edhr/panel-config/field/boolean/field-boolean-config.vue?vue&type=script&setup=true&lang.ts
 init_enum();
+init_form_value();
 var _hoisted_1$47 = { class: "panel-field-boolean-config" };
 var field_boolean_config_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	__name: "field-boolean-config",
@@ -161207,7 +161240,7 @@ var field_boolean_config_vue_vue_type_script_setup_true_lang_default = /*@__PURE
 //#region src/suites/edhr/panel-config/field/boolean/field-boolean-config.vue
 var field_boolean_config_exports = /* @__PURE__ */ __exportAll({ default: () => field_boolean_config_default });
 init__plugin_vue_export_helper();
-var field_boolean_config_default = /*#__PURE__*/ _plugin_vue_export_helper_default(field_boolean_config_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-b0cd3e0d"]]);
+var field_boolean_config_default = /*#__PURE__*/ _plugin_vue_export_helper_default(field_boolean_config_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-059669fc"]]);
 //#endregion
 //#region src/suites/edhr/panel-config/field/boolean/field-boolean-style.vue?vue&type=script&setup=true&lang.ts
 init_enum();

package/dist/word.css

@@ -12935,13 +12935,13 @@ svg.portrait-icon[data-v-8bdb451e] {
   display: block;
   flex: none;
 }
-.panel-field[data-v-334e23f7] {
+.panel-field[data-v-a9a74705] {
   position: relative;
 }
-.panel-field .container[data-v-334e23f7] {
+.panel-field .container[data-v-a9a74705] {
   padding: 15px 16px 16px;
 }
-.panel-field[data-v-334e23f7] .container > .form-item {
+.panel-field[data-v-a9a74705] .container > .form-item {
   align-items: flex-start;
   min-height: 18px;
   margin-top: 10px !important;
@@ -12951,10 +12951,10 @@ svg.portrait-icon[data-v-8bdb451e] {
   font-weight: 400;
   line-height: 18px;
 }
-.panel-field[data-v-334e23f7] .container > .form-item:first-child {
+.panel-field[data-v-a9a74705] .container > .form-item:first-child {
   margin-top: 0 !important;
 }
-.panel-field[data-v-334e23f7] .container > .form-item > .form-item__label {
+.panel-field[data-v-a9a74705] .container > .form-item > .form-item__label {
   flex: 0 0 96px;
   width: 96px;
   overflow: hidden;
@@ -12966,7 +12966,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.panel-field[data-v-334e23f7] .container > .form-item > .form-item__content {
+.panel-field[data-v-a9a74705] .container > .form-item > .form-item__content {
   min-width: 0;
   overflow: hidden;
   color: #1a1d23;
@@ -12975,7 +12975,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   font-weight: 400;
   line-height: 18px;
 }
-.panel-field[data-v-334e23f7] .collapse.panel-collapse > .collapse-header {
+.panel-field[data-v-a9a74705] .collapse.panel-collapse > .collapse-header {
   box-sizing: border-box;
   align-items: center;
   height: 36px;
@@ -12988,11 +12988,11 @@ svg.portrait-icon[data-v-8bdb451e] {
   line-height: 18px;
   background: #f9fafb;
 }
-.panel-field[data-v-334e23f7] .collapse.panel-collapse.is-first > .collapse-header {
+.panel-field[data-v-a9a74705] .collapse.panel-collapse.is-first > .collapse-header {
   height: 35px;
   min-height: 35px;
 }
-.panel-field[data-v-334e23f7] .collapse.panel-collapse .expand-icon {
+.panel-field[data-v-a9a74705] .collapse.panel-collapse .expand-icon {
   display: flex;
   align-items: center;
   height: 16px;
@@ -13222,7 +13222,7 @@ svg.portrait-icon[data-v-8bdb451e] {
 .option-container .option__attach-field[data-v-647b5798] {
   margin-top: 0;
 }
-.panel-field-boolean-config[data-v-b0cd3e0d] {
+.panel-field-boolean-config[data-v-059669fc] {
   padding: 16px;
 }
 .panel-field-boolean-style[data-v-bc440683] {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.74-beta.19",
+  "version": "0.1.74-beta.20",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",