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

package/es/locale/sys/webRender.mjs

@@ -0,0 +1,33 @@
+import { __exportAll } from "../../_virtual/_rolldown/runtime.mjs";
+//#region src/locale/sys/webRender.ts
+var webRender_exports = /* @__PURE__ */ __exportAll({ default: () => webRender_default });
+var webRender_default = {
+	to: "至",
+	saveTip: "请将所有规则条件填写完整",
+	date: "日期",
+	time: "时间",
+	dateTime: "日期时间",
+	user: "人员",
+	curDay: "当天",
+	curWeek: "本周",
+	curMonth: "本月",
+	curYear: "本年",
+	curUser: "登录用户",
+	fixed: "固定",
+	fixedAbbr: "固",
+	system: "系统",
+	systemAbbr: "系",
+	field: "字段",
+	fieldAbbr: "字",
+	var: "变量",
+	varAbbr: "变",
+	booleanTrue: "布尔真",
+	booleanFalse: "布尔假",
+	and: "与",
+	or: "或",
+	allCondition: "满足所有条件",
+	anyCondition: "满足任意条件",
+	dragError: "拖拽失败，目录层级超出限制"
+};
+//#endregion
+export { webRender_exports };

package/es/locale/sys.d.ts

@@ -1,17 +1,24 @@
 declare const _default: {
+    printDeviceNotFound: string;
+    labelNotFound: string;
     tooltipExitFull: string;
     tooltipEntryFull: string;
     copySuccess: string;
-    searchText: string;
-    selected: string;
-    okText: string;
+    saveText: string;
+    nextStep: string;
+    cancel: string;
+    ok: string;
+    user: string;
     role: string;
     userGroup: string;
+    selected: string;
+    searchText: string;
+    okText: string;
     preview: string;
-    newCategory: string;
-    delText: string;
     category: string;
     name: string;
+    newCategory: string;
+    delText: string;
     default: string;
     description: string;
     labelTmplPath: string;
@@ -20,23 +27,28 @@ declare const _default: {
     macAddress: string;
     creator: string;
     createTime: string;
-    keywords: string;
-    keywordsPlaceholder: string;
-    queryText: string;
-    new: string;
     edit: string;
+    new: string;
     i18n: string;
     inputText: string;
+    keywords: string;
+    keywordsPlaceholder: string;
+    queryText: string;
+    inputVar: string;
+    simulatedPreview: string;
+    printTest: string;
+    ok2: string;
+    saveSuccess: string;
     collapse: string;
     unfold: string;
-    cancel: string;
     delSuccess: string;
+    cancelText: string;
     add: string;
-    reUpload: string;
-    sureToRecover: string;
     loadingText: string;
+    reUpload: string;
     updatePerson: string;
     updateTime: string;
+    sureToRecover: string;
     noMoreData: string;
     chooseText: string;
     pleaseSelectSth: string;

package/es/locale/sys.mjs

@@ -0,0 +1,63 @@
+import { __exportAll } from "../_virtual/_rolldown/runtime.mjs";
+//#region src/locale/sys.ts
+var sys_exports = /* @__PURE__ */ __exportAll({ default: () => sys_default });
+var sys_default = {
+	printDeviceNotFound: "未找到默认打印设备",
+	labelNotFound: "未找到标签",
+	tooltipExitFull: "退出全屏",
+	tooltipEntryFull: "全屏",
+	copySuccess: "拷贝成功",
+	saveText: "保存",
+	nextStep: "下一步",
+	cancel: "取消",
+	ok: "确定",
+	user: "用户",
+	role: "角色",
+	userGroup: "用户组",
+	selected: "已选择",
+	searchText: "搜索",
+	okText: "确认",
+	preview: "预览",
+	category: "分类",
+	name: "名称",
+	newCategory: "新建分类",
+	delText: "删除",
+	default: "默认",
+	description: "描述",
+	labelTmplPath: "标签模板路径",
+	shared: "共享",
+	local: "本地",
+	macAddress: "MAC地址",
+	creator: "创建人",
+	createTime: "创建时间",
+	edit: "编辑",
+	new: "新建",
+	i18n: "国际化",
+	inputText: "请输入",
+	keywords: "关键字",
+	keywordsPlaceholder: "请输入关键字",
+	queryText: "查询",
+	inputVar: "输入变量",
+	simulatedPreview: "实时模拟预览",
+	printTest: "打印测试",
+	ok2: "确认",
+	saveSuccess: "保存成功",
+	collapse: "收起",
+	unfold: "展开",
+	delSuccess: "删除成功",
+	cancelText: "取消",
+	add: "添加",
+	loadingText: "加载中...",
+	reUpload: "重新上传",
+	updatePerson: "更新人",
+	updateTime: "更新时间",
+	sureToRecover: "你确定要回滚吗?",
+	noMoreData: "没有更多数据了",
+	chooseText: "请选择",
+	pleaseSelectSth: "请选择{sth}",
+	upload: "上传",
+	width: "宽度",
+	height: "高度"
+};
+//#endregion
+export { sys_exports };

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/modules/data-rules-container/src/components/ndo-select-cmp.vue_vue_type_script_setup_true_lang.mjs

@@ -153,9 +153,10 @@ var ndo_select_cmp_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 					pageNo: state.pageNo,
 					pageSize: 20
 				}, { addDisplayLabel: isPermScope.value ? 1 : void 0 });
+				if (isPermScope.value && !displayField.value) await getModelInfo();
 				if (res?.data) {
 					const newOptions = (res?.data ?? []).map((item) => ({
-						label: item.name_ || item.__LABEL__,
+						label: item.name_ || item.__LABEL__ || item[displayField.value],
 						value: item.id_,
 						type: "data"
 					}));

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/es/modules/gct-table/editor/gct-table-date/gct-table-date.mjs

@@ -1,6 +1,6 @@
 import { useGctFormValue } from "../../../gct-form/hooks/use-gct-form-value/use-gct-form-value.mjs";
 import "../../../gct-form/index.mjs";
-import '../gct-table-text/gct-table-text.css';/* empty css                     */
+import './gct-table-date.css';/* empty css                     */
 import { createVNode, defineComponent, mergeProps, resolveComponent } from "vue";
 import { useNamespace } from "@gct-paas/core";
 //#region src/modules/gct-table/editor/gct-table-date/gct-table-date.tsx

package/es/modules/gct-table/editor/gct-table-text/gct-table-text.mjs

@@ -1,6 +1,6 @@
 import { useGctFormValueByText } from "../../../gct-form/hooks/use-gct-form-value/use-gct-form-value.mjs";
 import "../../../gct-form/index.mjs";
-import './gct-table-text.css';/* empty css                     */
+import '../gct-table-date/gct-table-date.css';/* empty css                     */
 import { createVNode, defineComponent, mergeProps, resolveComponent } from "vue";
 import { useNamespace } from "@gct-paas/core";
 //#region src/modules/gct-table/editor/gct-table-text/gct-table-text.tsx

package/es/setup-app.mjs

@@ -1,6 +1,7 @@
+import { registerCoreWebLocale } from "./locale/auto-register.mjs";
 //#region src/setup-app.ts
 async function coreWebSetupApp(_app) {
-	console.log("coreWebSetupApp");
+	registerCoreWebLocale();
 }
 //#endregion
 export { coreWebSetupApp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core-web",
-  "version": "0.1.6-dev.23",
+  "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.23",
-    "@gct-paas/v-ben": "0.1.6-dev.23",
-    "@gct-paas/core-components": "0.1.6-dev.23",
-    "@gct-paas/scss": "0.1.6-dev.23"
+    "@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.23",
-    "@gct-paas/core-components": "0.1.6-dev.23",
-    "@gct-paas/v-ben": "0.1.6-dev.23",
-    "@gct-paas/core": "0.1.6-dev.23"
+    "@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",