@yelingfeng/pandora2 1.0.2 → 1.0.4

package/dist/packages/components/PdForm/src/hooks/useFormValues.d.ts

@@ -1,5 +1,5 @@
+import { ComputedRef, Ref } from 'vue';
 import { IFormProps, IFormSchema } from '../types';
-import { Ref, ComputedRef } from 'vue';
 interface UseFormValuesContext {
     defaultValueRef: Ref<any>;
     getSchema: ComputedRef<IFormSchema[]>;

package/dist/packages/components/PdForm/src/types/index.d.ts

@@ -37,6 +37,7 @@ export type IFormProps = {
     resetButtonOptions?: Partial<ButtonProps>;
     submitButtonOptions?: Partial<ButtonProps>;
     actionColOptions?: Partial<ColProps>;
+    actionColStyle?: CSSProperties;
     showResetButton?: boolean;
     showSubmitButton?: boolean;
     hideRequiredAsterisk?: boolean;

package/dist/pandora2.es.js

@@ -1,4 +1,4 @@
-import { isRef, unref, inject, computed, watchEffect, watch, ref, onUnmounted, nextTick, defineComponent, createVNode as createVNode$1, shallowRef, onMounted, onBeforeUnmount, getCurrentInstance, reactive, readonly, provide, resolveComponent, createElementBlock, openBlock, normalizeClass, normalizeStyle as normalizeStyle$1, createBlock, createCommentVNode, normalizeProps, mergeProps, withCtx, createElementVNode, renderSlot, createTextVNode, toDisplayString, toRaw, createSlots, Fragment, renderList, toRefs, withDirectives, h as h$1, vShow, withKeys, guardReactiveProps, createStaticVNode, isVNode } from "vue";
+import { isRef, unref, inject, computed, watchEffect, watch, ref, onUnmounted, nextTick, defineComponent, createVNode as createVNode$1, shallowRef, onMounted, onBeforeUnmount, getCurrentInstance, reactive, readonly, provide, resolveComponent, createElementBlock, openBlock, normalizeClass, normalizeStyle as normalizeStyle$1, createBlock, createCommentVNode, normalizeProps, mergeProps, withCtx, createElementVNode, renderSlot, createTextVNode, toDisplayString, toRaw, createSlots, Fragment, renderList, toRefs, withDirectives, vShow, isVNode, withKeys, guardReactiveProps, createStaticVNode, h as h$1 } from "vue";
 import { ElButton, ElCol, ElSelect, ElAutocomplete, ElCheckbox, ElCheckboxGroup, ElCascader, ElDatePicker, ElInput, ElInputNumber, ElTimePicker, ElTimeSelect, ElSlider, ElOption, ElSwitch, ElRadio, ElRadioGroup, ElRate, ElDivider, ElTooltip, ElFormItem, ElRow, ElForm, ElIcon, ElTableColumn, ElTable } from "element-plus";
 const withInstall = (G, Q) => {
   if (G.install = (H) => {
@@ -50569,9 +50569,14 @@ const prefixCls = "pandora-basic-arrow", _sfc_main$b = /* @__PURE__ */ defineCom
       };
     }), K = computed(() => {
       const { actionColStyle: te } = G;
-      return {
+      return te.textAlign === "left" ? {
+        width: "100%",
+        marginLeft: "10px",
+        marginTop: "1px",
+        textAlign: "left"
+      } : {
         width: "100%",
-        "text-align": te.textAlign ? te.textAlign : "right"
+        textAlign: te.textAlign ? te.textAlign : "right"
       };
     }), W = computed(() => Object.assign(
       {
@@ -50627,7 +50632,7 @@ function _sfc_render$4(G, Q, H, K, W, X) {
         renderSlot(G.$slots, "advanceBefore"),
         G.showAdvancedButton && !G.hideAdvanceBtn ? (openBlock(), createBlock(ee, {
           key: 2,
-          type: "text",
+          link: "",
           size: "small",
           onClick: G.toggleAdvanced
         }, {
@@ -50973,7 +50978,11 @@ const props = {
       }, [getSlot(Q) || createVNode$1(warning_default, null, null)])]
     });
   }
-}), _sfc_main$7 = defineComponent({
+});
+function _isSlot$2(G) {
+  return typeof G == "function" || Object.prototype.toString.call(G) === "[object Object]" && !isVNode(G);
+}
+const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   name: "PandoraBasicFormItem",
   inheritAttrs: !1,
   props: {
@@ -51004,12 +51013,34 @@ const props = {
       type: Object
     }
   },
-  setup(G, { slots: Q }) {
-    const { schema: H } = toRefs(G), K = computed(() => {
-      const { schema: ie, tableAction: oe, formModel: se, formActionType: Ae } = G, { componentProps: le = {} } = ie;
-      return isFunction$2(le) ? le({ schema: ie, tableAction: oe, formModel: se, formActionType: Ae }) ?? {} : le;
+  setup(G, {
+    slots: Q
+  }) {
+    const {
+      schema: H
+    } = toRefs(G), K = computed(() => {
+      const {
+        schema: ie,
+        tableAction: oe,
+        formModel: se,
+        formActionType: Ae
+      } = G, {
+        componentProps: le = {}
+      } = ie;
+      return isFunction$2(le) ? le({
+        schema: ie,
+        tableAction: oe,
+        formModel: se,
+        formActionType: Ae
+      }) ?? {} : le;
     }), W = computed(() => {
-      const { allDefaultValues: ie, formModel: oe, schema: se } = G, { mergeDynamicData: Ae } = G.formProps;
+      const {
+        allDefaultValues: ie,
+        formModel: oe,
+        schema: se
+      } = G, {
+        mergeDynamicData: Ae
+      } = G.formProps;
       return {
         field: se.field,
         model: oe,
@@ -51021,18 +51052,39 @@ const props = {
         schema: se
       };
     }), X = computed(() => {
-      const { disabled: ie } = G.formProps, { dynamicDisabled: oe } = G.schema, { disabled: se = !1 } = unref(K);
+      const {
+        disabled: ie
+      } = G.formProps, {
+        dynamicDisabled: oe
+      } = G.schema, {
+        disabled: se = !1
+      } = unref(K);
       let Ae = !!ie || se;
       return isBoolean(oe) && (Ae = oe), isFunction$2(oe) && (Ae = oe(unref(W))), Ae;
     });
     function ee() {
-      const { show: ie, ifShow: oe } = G.schema, { showAdvancedButton: se } = G.formProps, Ae = se && isBoolean(G.schema.isAdvanced) ? G.schema.isAdvanced : !0;
+      const {
+        show: ie,
+        ifShow: oe
+      } = G.schema, {
+        showAdvancedButton: se
+      } = G.formProps, Ae = se && isBoolean(G.schema.isAdvanced) ? G.schema.isAdvanced : !0;
       let le = !0, ue = !0;
-      return isBoolean(ie) && (le = ie), isBoolean(oe) && (ue = oe), isFunction$2(ie) && (le = ie(unref(W))), isFunction$2(oe) && (ue = oe(unref(W))), le = le && Ae, { isShow: le, isIfShow: ue };
+      return isBoolean(ie) && (le = ie), isBoolean(oe) && (ue = oe), isFunction$2(ie) && (le = ie(unref(W))), isFunction$2(oe) && (ue = oe(unref(W))), le = le && Ae, {
+        isShow: le,
+        isIfShow: ue
+      };
     }
     const te = (ie) => {
-      const { schema: oe, tableAction: se, formModel: Ae, formActionType: le } = G;
-      let { componentProps: ue = {} } = unref(oe) || {};
+      const {
+        schema: oe,
+        tableAction: se,
+        formModel: Ae,
+        formActionType: le
+      } = G;
+      let {
+        componentProps: ue = {}
+      } = unref(oe) || {};
       isFunction$2(ue) && (ue = ue({
         schema: oe,
         tableAction: se,
@@ -51043,21 +51095,40 @@ const props = {
       if (Array.isArray(ce)) {
         if (ie === "CheckboxGroup") {
           const fe = componentMap.get("Checkbox");
-          return ce.map(
-            ({ label: he, value: de }) => h$1(fe, { label: de, key: de }, () => he)
-          );
+          return ce.map(({
+            label: he,
+            value: de
+          }) => createVNode$1(fe, {
+            label: de,
+            key: de
+          }, _isSlot$2(he) ? he : {
+            default: () => [he]
+          }));
         }
         if (ie === "Select") {
           const fe = componentMap.get("SelectOption");
-          return ce.map(
-            ({ label: he, value: de }) => h$1(fe, { label: he, value: de, key: de }, () => he)
-          );
+          return ce.map(({
+            label: he,
+            value: de
+          }) => createVNode$1(fe, {
+            label: he,
+            value: de,
+            key: de
+          }, _isSlot$2(he) ? he : {
+            default: () => [he]
+          }));
         }
         if (ie === "RadioGroup") {
           const fe = componentMap.get("Radio");
-          return ce.map(
-            ({ label: he, value: de }) => h$1(fe, { label: de, key: de }, () => he)
-          );
+          return ce.map(({
+            label: he,
+            value: de
+          }) => createVNode$1(fe, {
+            label: de,
+            key: de
+          }, _isSlot$2(he) ? he : {
+            default: () => [he]
+          }));
         }
       }
     }, re = () => {
@@ -51067,97 +51138,129 @@ const props = {
         field: se,
         changeEvent: Ae = "change",
         valueField: le
-      } = G.schema, ue = oe && ["Switch", "Checkbox"].includes(oe), ce = `on${upperFirst(Ae)}`, fe = {
-        [ce]: (...ye) => {
-          const [_e] = ye;
-          de[ce] && de[ce](...ye);
-          const Se = _e ? _e.target : null, we = Se ? ue ? Se.checked : Se.value : _e;
-          G.setFormModel(se, we);
-        }
-      }, he = componentMap.get(oe), de = {
+      } = G.schema, ue = oe && ["Switch", "Checkbox"].includes(oe), ce = `on${upperFirst(Ae)}`, fe = componentMap.get(oe);
+      if (!fe) return null;
+      const he = {
         getPopupContainer: (ye) => ye.parentNode,
         ...unref(K),
         disabled: unref(X)
-      }, { autoSetPlaceHolder: pe } = G.formProps;
-      !de.disabled && pe && oe && (de.placeholder = unref(K)?.placeholder || createPlaceholderMessage(oe)), de.placeholder = unref(K)?.placeholder, de.codeField = se, de.formValues = unref(W);
-      const ge = {
-        [le || (ue ? "checked" : "value")]: G.formModel[se]
+      }, {
+        autoSetPlaceHolder: de
+      } = G.formProps;
+      !he.disabled && de && oe && (he.placeholder = unref(K)?.placeholder || createPlaceholderMessage(oe)), he.placeholder = unref(K)?.placeholder, he.codeField = se, he.formValues = unref(W);
+      const ve = {
+        [le || (ue ? "checked" : "modelValue")]: G.formModel[se]
       }, me = {
-        ...de,
-        ...fe,
-        ...ge
+        ...he,
+        ...{
+          "onUpdate:modelValue": (...ye) => {
+            const [_e] = ye;
+            he[ce] && he[ce](...ye);
+            const Se = _e ? _e.target : null, we = Se ? ue ? Se.checked : Se.value : _e;
+            G.setFormModel(se, we);
+          }
+        },
+        ...ve
       };
-      if (!he) return null;
       if (!ie) {
         const ye = te(oe);
-        return h$1(he, me, () => ye);
+        return createVNode$1(fe, me, _isSlot$2(ye) ? ye : {
+          default: () => [ye]
+        });
       }
       if (isFunction$2(ie)) {
         const ye = ie(unref(W)) || {};
-        return ye && typeof ye == "object" ? h$1(he, me, ye) : h$1(he, me, { default: () => ye });
+        return ye && typeof ye == "object" ? createVNode$1(fe, me, _isSlot$2(ye) ? ye : {
+          default: () => [ye]
+        }) : createVNode$1(fe, me, {
+          default: () => ye
+        });
       }
-      return h$1(he, me, { default: () => ie });
+      return createVNode$1(fe, me, _isSlot$2(ie) ? ie : {
+        default: () => [ie]
+      });
     }, ae = () => {
-      const { label: ie, helpMessage: oe, helpComponentProps: se, subLabel: Ae } = G.schema, le = Ae ? h$1("span", null, [
-        ie,
-        " ",
-        h$1("span", { class: "text-secondary" }, Ae)
-      ]) : h$1("span", null, ie), ue = isFunction$2(oe) ? oe(unref(W)) : oe;
-      return ue !== void 0 || Array.isArray(ue) && ue.length > 0 ? h$1("span", null, [
-        le,
-        h$1(_sfc_main$8, {
-          placement: "top",
-          content: ue,
-          ...se || {}
-        })
-      ]) : h$1("span", null, [le]);
+      const {
+        label: ie,
+        helpMessage: oe,
+        helpComponentProps: se,
+        subLabel: Ae
+      } = G.schema, le = Ae ? createVNode$1("span", null, [ie, " ", createVNode$1("span", {
+        class: "text-secondary"
+      }, [Ae])]) : createVNode$1("span", null, [ie]), ue = isFunction$2(oe) ? oe(unref(W)) : oe;
+      return ue !== void 0 || Array.isArray(ue) && ue.length > 0 ? createVNode$1("span", null, [le, createVNode$1(_sfc_main$8, mergeProps({
+        placement: "top",
+        content: ue
+      }, se || {}), null)]) : createVNode$1("span", null, [le]);
     }, ne = () => {
-      const { label: ie, slot: oe, rules: se, render: Ae, field: le, suffix: ue, itemProps: ce, component: fe } = G.schema;
+      const {
+        label: ie,
+        slot: oe,
+        rules: se,
+        render: Ae,
+        field: le,
+        suffix: ue,
+        itemProps: ce,
+        component: fe
+      } = G.schema;
       if (fe === "Divider") {
-        const he = deepMerge({ contentPosition: "left" }, { ...unref(K) });
-        return h$1(
-          ElCol,
-          { span: 24 },
-          () => h$1(ElDivider, he, () => ae())
-        );
-      } else {
-        const he = unref(W), de = () => oe ? getSlot(Q, oe, he) : Ae ? Ae(he) : re(), pe = !!ue, ve = isFunction$2(ue) ? ue(unref(W)) : ue, ge = {
-          default: () => h$1(
-            "div",
-            { style: "display:flex;width:100%;" },
-            [
-              h$1("div", { style: "flex:1;" }, [de()]),
-              pe ? h$1("span", { class: "suffix" }, String(ve)) : null
-            ]
-          ),
-          label: () => ae()
-        };
-        return h$1(
-          ElFormItem,
-          {
-            prop: le,
-            label: ie,
-            rules: se,
-            ...ce || {}
-          },
-          ge
-        );
+        let ge;
+        const me = deepMerge({
+          contentPosition: "left"
+        }, {
+          ...unref(K)
+        });
+        return createVNode$1(ElCol, {
+          span: 24
+        }, {
+          default: () => [createVNode$1(ElDivider, me, _isSlot$2(ge = ae()) ? ge : {
+            default: () => [ge]
+          })]
+        });
       }
+      const he = unref(W), de = () => oe ? getSlot(Q, oe, he) : Ae ? Ae(he) : re(), pe = !!ue, ve = isFunction$2(ue) ? ue(unref(W)) : ue;
+      return createVNode$1(ElFormItem, mergeProps({
+        prop: le,
+        label: ie,
+        rules: se
+      }, ce || {}), {
+        default: () => createVNode$1("div", {
+          style: "display:flex;width:100%;"
+        }, [createVNode$1("div", {
+          style: "flex:1;"
+        }, [de()]), pe ? createVNode$1("span", {
+          class: "suffix"
+        }, [String(ve)]) : null]),
+        label: () => ae()
+      });
     };
     return onMounted(() => {
-      const { field: ie, defaultValue: oe = "" } = unref(H) || {};
+      const {
+        field: ie,
+        defaultValue: oe = ""
+      } = unref(H) || {};
       ie && G.setFormModel(ie, oe);
     }), () => {
-      const { colProps: ie = {}, colSlot: oe, renderColContent: se, component: Ae } = G.schema;
-      if (!componentMap.has(Ae))
-        return console.error(
-          `FormItem component:${Ae} is an unregistered component Key`
-        ), null;
-      const { baseColProps: le = {} } = G.formProps, ue = { ...le, ...ie }, { isShow: ce } = ee(), fe = unref(W), he = () => oe ? getSlot(Q, oe, fe) : se ? se(fe) : ne();
-      return withDirectives(
-        h$1(ElCol, { ...ue }, () => he()),
-        [[vShow, ce]]
-      );
+      let ie;
+      const {
+        colProps: oe = {},
+        colSlot: se,
+        renderColContent: Ae,
+        component: le
+      } = G.schema;
+      if (!componentMap.has(le))
+        return console.error(`FormItem component:${le} is an unregistered component Key`), null;
+      const {
+        baseColProps: ue = {}
+      } = G.formProps, ce = {
+        ...ue,
+        ...oe
+      }, {
+        isShow: fe
+      } = ee(), he = unref(W);
+      return withDirectives(createVNode$1(ElCol, ce, _isSlot$2(ie = se ? getSlot(Q, se, he) : Ae ? Ae(he) : ne()) ? ie : {
+        default: () => [ie]
+      }), [[vShow, fe]]);
     };
   }
 });
@@ -51527,7 +51630,7 @@ function useFormValues({
     te.forEach((ae) => {
       const { defaultValue: ne } = ae;
       isNullOrUnDef(ne) || (re[ae.field] = ne, K[ae.field] = ne, K[ae.field] === void 0 && (K[ae.field] = ne));
-    }), G.value = cloneDeep(re);
+    }), console.log("initDefault formModel", K), G.value = cloneDeep(re);
   }
   return { handleFormValues: W, initDefault: ee };
 }