cosey 0.4.24 → 0.4.26

package/components/form/form-item.vue.js

@@ -12,7 +12,10 @@ import { reactiveOmit } from '@vueuse/core';
 import { useToken } from '../theme/util/useToken.js';
 import { omitUndefined } from '../../utils/object.js';
 import { useComponentConfig } from '../config-provider/config-provider.js';
+import { useLocale } from '../../hooks/useLocale.js';
 import { createMergedExpose, defineTemplate } from '../../utils/vue.js';
+import { toArray } from '../../utils/array.js';
+import { isString, isNumber } from '../../utils/is.js';
 
 var stdin_default = /* @__PURE__ */defineComponent({
   ...{
@@ -132,6 +135,9 @@ var stdin_default = /* @__PURE__ */defineComponent({
     const {
       hashId
     } = useToken();
+    const {
+      t
+    } = useLocale();
     const formItemProps = reactiveOmit(props, "colProps", "width", "fieldType", "fieldProps", "fieldRef", "modelValue", "placeholder", "disabled", "readonly");
     const attrs = useAttrs();
     const slots = useSlots();
@@ -155,10 +161,42 @@ var stdin_default = /* @__PURE__ */defineComponent({
       });
     });
     const fixedWidthStyle = useFormItemWidth(props, formContext);
+    const mergedRules = computed(() => {
+      const {
+        required
+      } = props;
+      const rules = toArray(props.rules || []);
+      if (required !== void 0) {
+        const requiredRules = rules.map((rule, i) => [rule, i]).filter(([rule]) => Object.keys(rule).includes("required"));
+        if (requiredRules.length > 0) {
+          for (const [rule, i] of requiredRules) {
+            if (rule.required === required) continue;
+            rules[i] = {
+              ...rule,
+              required
+            };
+          }
+        } else {
+          rules.push({
+            required
+          });
+        }
+      }
+      const requiredMsg = isString(props.label) || isNumber(props.label) ? t("co.form.isRequired", {
+        label: props.label
+      }) : t("co.form.required");
+      rules.forEach(rule => {
+        if (rule.required && !rule.message) {
+          rule.message = requiredMsg;
+        }
+      });
+      return rules;
+    });
     const mergedFormItemProps = computed(() => {
       return {
         ...(formContext?.grid ? null : attrs),
-        ...formItemProps
+        ...formItemProps,
+        rules: mergedRules.value
       };
     });
     const mergedFieldProps = computed(() => {

package/components/upload/upload.d.ts

@@ -27,6 +27,7 @@ export interface UploadProps {
     size?: MediaCardBaseProps['size'];
     request?: UploadContext['request'];
     requestConfig?: AxiosRequestConfig;
+    requestExtra?: Record<PropertyKey, any>;
 }
 export declare const defaultUploadProps: {
     accept: string;

package/components/upload/upload.vue.js

@@ -68,6 +68,10 @@ var stdin_default = /* @__PURE__ */defineComponent({
     requestConfig: {
       type: Object,
       required: false
+    },
+    requestExtra: {
+      type: Object,
+      required: false
     }
   }, defaultUploadProps),
   emits: ["exceed", "update:modelValue", "change"],
@@ -201,7 +205,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
           }
           props.requestConfig?.onUploadProgress?.(event);
         }
-      }).then(url => {
+      }, props.requestExtra).then(url => {
         options.onSuccess(url);
       }).catch(() => {
         options.onError();

package/components/upload-context.d.ts

@@ -1,6 +1,6 @@
 import type { AxiosRequestConfig } from 'axios';
 export interface UploadContext {
-    request?: (data: Blob, config?: AxiosRequestConfig) => Promise<string>;
+    request?: (data: Blob, config?: AxiosRequestConfig, extra?: Record<PropertyKey, any>) => Promise<string>;
 }
 export declare const useUploadProvide: (context: UploadContext) => void;
 export declare const useUpload: () => UploadContext | null;

package/locale/lang/ar.d.ts

@@ -27,6 +27,8 @@ declare const _default: {
             submit: string;
             reset: string;
             search: string;
+            required: string;
+            isRequired: string;
         };
         colorPicker: {
             preset: string;

package/locale/lang/ar.js

@@ -29,7 +29,9 @@ var stdin_default = {
       weekOfYear: "\u0627\u0644\u0623\u0633\u0628\u0648\u0639 w \u0645\u0646 \u0633\u0646\u0629 YYYY",
       submit: "\u0625\u0631\u0633\u0627\u0644",
       reset: "\u0625\u0639\u0627\u062F\u0629 \u062A\u0639\u064A\u064A\u0646",
-      search: "\u0628\u062D\u062B"
+      search: "\u0628\u062D\u062B",
+      required: "\u0645\u0637\u0644\u0648\u0628",
+      isRequired: "\u0645\u0637\u0644\u0648\u0628"
     },
     colorPicker: {
       preset: "\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0645\u0633\u0628\u0642\u0629",

package/locale/lang/en.d.ts

@@ -27,6 +27,8 @@ declare const _default: {
             submit: string;
             reset: string;
             search: string;
+            required: string;
+            isRequired: string;
         };
         colorPicker: {
             preset: string;

package/locale/lang/en.js

@@ -29,7 +29,9 @@ var stdin_default = {
       weekOfYear: "Week w, YYYY",
       submit: "Submit",
       reset: "Reset",
-      search: "Search"
+      search: "Search",
+      required: "required",
+      isRequired: "{label} is required"
     },
     colorPicker: {
       preset: "Preset",

package/locale/lang/zh-cn.d.ts

@@ -27,6 +27,8 @@ declare const _default: {
             submit: string;
             reset: string;
             search: string;
+            required: string;
+            isRequired: string;
         };
         colorPicker: {
             preset: string;

package/locale/lang/zh-cn.js

@@ -29,7 +29,9 @@ var stdin_default = {
       weekOfYear: "YYYY-\u7B2Cw\u5468",
       submit: "\u63D0\u4EA4",
       reset: "\u91CD\u7F6E",
-      search: "\u67E5\u8BE2"
+      search: "\u67E5\u8BE2",
+      required: "\u5FC5\u586B",
+      isRequired: "{label}\u662F\u5FC5\u586B\u9879"
     },
     colorPicker: {
       preset: "\u9884\u8BBE",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.4.24",
+  "version": "0.4.26",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",

package/utils/array.d.ts

@@ -10,3 +10,7 @@ export declare function toArray(target: unknown): any[];
  * 判断两数组元素是否一致
  */
 export declare function isShallowEqual(arr1: unknown[], arr2: unknown[]): boolean;
+/**
+ * 移除数组对象中的唯一键
+ */
+export declare function omitUniqueKey<T extends object>(arr: T[], key?: string): Pick<T, Exclude<keyof T, string>>[];

package/utils/array.js

@@ -1,3 +1,5 @@
+import { omit } from 'lodash-es';
+
 function arrayMove(arr, fromIndex, toIndex) {
   if (fromIndex === toIndex) {
     return arr;
@@ -13,5 +15,10 @@ function toArray(target) {
 function isShallowEqual(arr1, arr2) {
   return arr1.length === arr2.length && arr1.every((item, i) => item === arr2[i]);
 }
+function omitUniqueKey(arr, key = "_uniqid") {
+  return arr.map((item) => {
+    return omit(item, key);
+  });
+}
 
-export { arrayMove, isShallowEqual, toArray };
+export { arrayMove, isShallowEqual, omitUniqueKey, toArray };

package/utils/index.js

@@ -1,4 +1,4 @@
-export { arrayMove, isShallowEqual, toArray } from './array.js';
+export { arrayMove, isShallowEqual, omitUniqueKey, toArray } from './array.js';
 export { getCssVarProp } from './bem.js';
 export { getControlKey } from './browser.js';
 export { getLabelByValue, getTreeLabelByValue } from './collection.js';