jobsys-newbie 2.0.2 → 2.0.3

package/components/form/NewbieForm.jsx

@@ -1,11 +1,12 @@
 import { computed, defineComponent, inject, onMounted, reactive, ref, watch } from "vue"
 import { cloneDeep, every, isEqual, isFunction, isObject, isString, pick } from "lodash-es"
-import { useFetch, useFormFail, useFormFormat, useI18nJoin, useProcessStatusSuccess, useT } from "../../hooks"
+import { useFetch, useFormFail, useFormFormat, useI18nJoin, useProcessStatusSuccess } from "../../hooks"
 import { Button, Card, Form, message, Modal, Skeleton, Space } from "ant-design-vue"
 import createLayout from "./components/Layout.jsx"
 import { NEWBIE_UPLOADER, NEWBIE_FORM } from "../provider/NewbieProvider.jsx"
 import "./index.less"
 import { initItemDefaultValue } from "./utils"
+import { useI18n } from "vue-i18n"
 
 /**
  * 表单组件
@@ -227,6 +228,8 @@ export default defineComponent({
 	},
 	emits: ["success"],
 	setup(props, { expose, slots, emit }) {
+		const { t } = useI18n()
+
 		const editorRef = ref(null) //总的容器
 
 		const state = reactive({
@@ -391,7 +394,7 @@ export default defineComponent({
 							props.afterSubmit(res)
 						} else {
 							useProcessStatusSuccess(res, () => {
-								message.success(useI18nJoin(props.submitButtonText || useT("common.save"), useT("common.success")))
+								message.success(useI18nJoin(props.submitButtonText || t("common.save"), t("common.success")))
 								emit("success", res)
 							})
 						}
@@ -490,7 +493,7 @@ export default defineComponent({
 					}}
 				>
 					{{
-						default: () => `${props.submitButtonText || useT("common.save")}${state.submitFetcher.loading ? "..." : ""}`,
+						default: () => `${props.submitButtonText || t("common.save")}${state.submitFetcher.loading ? "..." : ""}`,
 					}}
 				</Button>
 			)
@@ -504,7 +507,7 @@ export default defineComponent({
 						}
 					}}
 				>
-					{{ default: () => props.closeButtonText || useT("common.close") }}
+					{{ default: () => props.closeButtonText || t("common.close") }}
 				</Button>
 			)
 

package/components/search/components/Date.jsx

@@ -120,7 +120,7 @@ const render = (item, queryForm, context) => {
 				presets={picker === "date" ? presets.value : []}
 				style={{ width: "200px" }}
 				class={`${searchProvider.inputClass || ""}`}
-				placeholder={useI18nJoin(useT("search"), item.title)}
+				placeholder={useI18nJoin(useT("common.search"), item.title)}
 				getPopupContainer={(triggerNode) => triggerNode?.parentNode}
 				{...item.inputProps}
 			></DatePicker>

package/components/table/NewbieTable.jsx

@@ -1095,7 +1095,7 @@ export function useTableActions(actions) {
 		}
 
 		if (action.action) {
-			props.onClick = action.action
+			props.onClick = withModifiers(() => action.action, ["stop"])
 		}
 		if (action.tooltip) {
 			const title = action.tooltip
@@ -1112,10 +1112,10 @@ export function useTableActions(actions) {
 			const menuItems = action.children
 
 			return (
-				<Dropdown placement={"bottom"}>
+				<Dropdown placement={"bottom"} onClick={withModifiers(() => {}, ["stop"])}>
 					{{
 						default: () => (
-							<NewbieButton type={"text"} size={"small"} {...props}>
+							<NewbieButton type={"text"} size={"small"} {...props} onClick={withModifiers(() => {}, ["stop"])}>
 								{() => [<DownOutlined style={{ fontSize: "12px" }}></DownOutlined>, name]}
 							</NewbieButton>
 						),
@@ -1129,7 +1129,7 @@ export function useTableActions(actions) {
 													type={"text"}
 													style={{ textAlign: "left" }}
 													buttonProps={{ block: true }}
-													onClick={item.action}
+													onClick={withModifiers(() => item.action(), ["stop"])}
 													{...item.props}
 												>
 													{() => item.name}