@kengic/vue 0.16.6-beta.5 → 0.16.7-beta.0

package/dist/kengic-vue.js

@@ -2919,7 +2919,7 @@ const emptyIcon = {
       ...t.data
     }, r);
   }
-}), version = "0.16.6-beta.5";
+}), version = "0.16.7-beta.0";
 var isVue2 = !1;
 function set(e, t, r) {
   return Array.isArray(e) ? (e.length = Math.max(e.length, t), e.splice(t, 1, r), r) : (e[t] = r, r);
@@ -10579,7 +10579,7 @@ function useKgFormItem(e) {
             break;
         }
     }
-    return o = l, KgUtil.tryParseJSON(o);
+    return KgUtil.tryParseJSON(o);
   });
   return {
     controlType: s,
@@ -10866,25 +10866,34 @@ const KgFormItemCheckboxGroup = defineComponent({
     emit: r,
     attrs: a
   }) {
-    const n = inject("$dayjs", dayjs), s = computed(() => {
-      let o = e.value;
-      if (!!o && !(!isArray$1(o) || o.length !== 2) && ((!n.isDayjs(o[0]) || !n.isDayjs(o[1])) && (o = [n(o[0]), n(o[1])]), !(!n.isDayjs(o[0]) || !n.isDayjs(o[1]))))
-        return o;
+    const n = inject("$dayjs", dayjs), {
+      controlProperties: s
+    } = useKgFormItem(), i = computed(() => {
+      let l = e.value;
+      if (!l || !isArray$1(l) || l.length !== 2)
+        return;
+      const u = [null, null];
+      let c = l[0], d = l[1];
+      return n.isDayjs(c) || (c = n(c)), n.isDayjs(d) || (d = n(d)), c.isValid() && (u[0] = c), d.isValid() && (u[1] = d), u;
     });
-    function i(o) {
-      const l = o ? [n(o[0]), n(o[1])] : void 0;
-      r("update:value", l), r("kgChange", l);
+    function o(l) {
+      const u = l ? [n(l[0]), n(l[1])] : void 0;
+      r("update:value", u), r("kgChange", u);
     }
-    return () => createVNode(DatePicker.RangePicker, {
-      value: s.value,
-      "onUpdate:value": i,
-      id: a.id,
-      disabled: e.kgDisabled,
-      placeholder: [e.kgPlaceholder, e.kgPlaceholder],
-      showTime: e.kgShowTime,
-      picker: e.kgPicker,
-      style: "width: 100%"
-    }, null);
+    return () => {
+      var l;
+      return createVNode(DatePicker.RangePicker, {
+        value: i.value,
+        "onUpdate:value": o,
+        id: a.id,
+        disabled: e.kgDisabled,
+        placeholder: [e.kgPlaceholder, e.kgPlaceholder],
+        showTime: e.kgShowTime,
+        allowEmpty: (l = s.value) == null ? void 0 : l.allowEmpty,
+        picker: e.kgPicker,
+        style: "width: 100%"
+      }, null);
+    };
   }
 }), KgFormItemInput = defineComponent({
   name: "KgFormItemInput",
@@ -13907,7 +13916,7 @@ const getProps$r = () => ({
     async function ee() {
       R.value.kgWidth = fe.value, te.isFullscreen = !1, await l.store.emit(s.formID, "close", null);
     }
-    function de() {
+    async function de() {
       switch (!0) {
         case s.isCreating.value:
           s.store.setIsCreating(s.formID, !1);
@@ -13926,7 +13935,7 @@ const getProps$r = () => ({
     async function ue() {
       var G, Y;
       try {
-        if (await l.store.emit(s.formID, "beforeOk", {
+        if (!l.formRef.value || await l.store.emit(s.formID, "beforeOk", {
           isCreating: s.isCreating.value,
           isUpdating: s.isUpdating.value,
           isCopying: s.isCopying.value,
@@ -14560,7 +14569,7 @@ const KgButtonCreate = defineComponent({
   }) {
     const n = useKg(), s = useKgVar(), i = useKgButton(), o = useKgTable(), l = useKgSubmit(), u = computed(() => s.store.getVarButton(s.formID, e.kgVarName)), c = computed(() => {
       var T, k, M, C, w, A, O, D;
-      return isNil(e.kgDisabled) ? !!(s.isUpdating.value || s.isCopying.value || s.isDeleting.value || o.isRetrieving.value || ((T = u.value) == null ? void 0 : T.dis_no_select_flg) === 1 && ((M = (k = o.selectedRows.value) == null ? void 0 : k.length) != null ? M : 0) === 0 || ((C = u.value) == null ? void 0 : C.dis_mult_select_flg) === 1 && ((A = (w = o.selectedRows.value) == null ? void 0 : w.length) != null ? A : 0) > 1 || KgAuthUtil.getPermissionType((O = u.value) == null ? void 0 : O.permission_code) === 2 && !n.p((D = u.value) == null ? void 0 : D.permission_code)) : e.kgDisabled;
+      return isNil(e.kgDisabled) ? !!(s.isCreating.value || s.isUpdating.value || s.isCopying.value || s.isDeleting.value || o.isRetrieving.value || ((T = u.value) == null ? void 0 : T.dis_no_select_flg) === 1 && ((M = (k = o.selectedRows.value) == null ? void 0 : k.length) != null ? M : 0) === 0 || ((C = u.value) == null ? void 0 : C.dis_mult_select_flg) === 1 && ((A = (w = o.selectedRows.value) == null ? void 0 : w.length) != null ? A : 0) > 1 || KgAuthUtil.getPermissionType((O = u.value) == null ? void 0 : O.permission_code) === 2 && !n.p((D = u.value) == null ? void 0 : D.permission_code)) : e.kgDisabled;
     }), d = computed(() => !!s.isCreatingRequesting.value);
     async function g() {
       e.onKgClick && await e.onKgClick() || s.store.setIsCreating(s.formID, !0);
@@ -14583,7 +14592,7 @@ const KgButtonCreate = defineComponent({
     }
     function m() {
       var T, k, M, C, w, A;
-      return l.displayType.value === KG_VAR_SUBMIT__DISPLAY_TYPE.TABLE && s.isCreating.value ? null : createVNode(Button, {
+      return createVNode(Button, {
         type: "primary",
         disabled: c.value,
         onClick: g,
@@ -15068,7 +15077,7 @@ const KgButtonCreate = defineComponent({
     });
     const u = computed(() => s.store.getVarButton(s.formID, e.kgVarName)), c = computed(() => {
       var T, k, M, C, w, A, O, D;
-      return isNil(e.kgDisabled) ? !!(s.isCreating.value || s.isCopying.value || s.isDeleting.value || i.isRetrieving.value || ((T = u.value) == null ? void 0 : T.dis_no_select_flg) === 1 && ((M = (k = i.selectedRows.value) == null ? void 0 : k.length) != null ? M : 0) === 0 || ((C = u.value) == null ? void 0 : C.dis_mult_select_flg) === 1 && ((A = (w = i.selectedRows.value) == null ? void 0 : w.length) != null ? A : 0) > 1 || KgAuthUtil.getPermissionType((O = u.value) == null ? void 0 : O.permission_code) === 2 && !n.p((D = u.value) == null ? void 0 : D.permission_code)) : e.kgDisabled;
+      return isNil(e.kgDisabled) ? !!(s.isCreating.value || s.isUpdating.value || s.isCopying.value || s.isDeleting.value || i.isRetrieving.value || ((T = u.value) == null ? void 0 : T.dis_no_select_flg) === 1 && ((M = (k = i.selectedRows.value) == null ? void 0 : k.length) != null ? M : 0) === 0 || ((C = u.value) == null ? void 0 : C.dis_mult_select_flg) === 1 && ((A = (w = i.selectedRows.value) == null ? void 0 : w.length) != null ? A : 0) > 1 || KgAuthUtil.getPermissionType((O = u.value) == null ? void 0 : O.permission_code) === 2 && !n.p((D = u.value) == null ? void 0 : D.permission_code)) : e.kgDisabled;
     }), d = computed(() => !!s.isUpdatingRequesting.value);
     async function g() {
       e.onKgClick && await e.onKgClick() || await o.store.emit(s.formID, "updateBeforeClick", {
@@ -15094,7 +15103,7 @@ const KgButtonCreate = defineComponent({
     }
     function m() {
       var T, k, M, C, w, A;
-      return l.displayType.value === KG_VAR_SUBMIT__DISPLAY_TYPE.TABLE && s.isUpdating.value ? null : createVNode(Button, {
+      return createVNode(Button, {
         type: "primary",
         disabled: c.value,
         ghost: !e.kgPrimary && !c.value,
@@ -17927,6 +17936,8 @@ class KgUtil {
       return t;
   }
   static parseParamFromDayJS(t, r, a, n) {
+    if (!r || !r.isValid())
+      return "";
     if (!a)
       return r.format("YYYY-MM-DD HH:mm:ss");
     const s = useKgVar(a), i = useKgTable(a), o = s.store.getVarVariableConfig(a, t);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/vue",
-    "version": "0.16.6-beta.5",
+    "version": "0.16.7-beta.0",
     "scripts": {
         "build": "npm run switch-node-version && rimraf dist && vite build",
         "build:dev": "npm run switch-node-version && rimraf dist && vite build --mode development",