@tmagic/form 1.3.0-beta.2 → 1.3.0-beta.3

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0-beta.2",
+  "version": "1.3.0-beta.3",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/design": "1.3.0-beta.2",
-    "@tmagic/utils": "1.3.0-beta.2",
+    "@tmagic/design": "1.3.0-beta.3",
+    "@tmagic/utils": "1.3.0-beta.3",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.14.0",
     "vue": "^3.3.4"

package/src/containers/Table.vue

@@ -120,41 +120,46 @@
       </TMagicTable>
     </TMagicTooltip>
     <slot></slot>
-    <TMagicButton v-if="addable" size="small" type="primary" :disabled="disabled" plain @click="newHandler()"
-      >新增一行</TMagicButton
-    >
-    &nbsp;
-    <TMagicButton
-      :icon="Grid"
-      size="small"
-      type="primary"
-      @click="toggleMode"
-      v-if="enableToggleMode && config.enableToggleMode !== false && !isFullscreen"
-      >展开配置</TMagicButton
-    >
-    <TMagicButton
-      :icon="FullScreen"
-      size="small"
-      type="primary"
-      @click="toggleFullscreen"
-      v-if="config.enableFullscreen !== false"
-    >
-      {{ isFullscreen ? '退出全屏' : '全屏编辑' }}
-    </TMagicButton>
-    <TMagicUpload
-      v-if="importable"
-      style="display: inline-block"
-      ref="excelBtn"
-      action="/noop"
-      :disabled="disabled"
-      :on-change="excelHandler"
-      :auto-upload="false"
-    >
-      <TMagicButton size="small" type="success" :disabled="disabled" plain>导入EXCEL</TMagicButton> </TMagicUpload
-    >&nbsp;
-    <TMagicButton v-if="importable" size="small" type="warning" :disabled="disabled" plain @click="clearHandler()"
-      >清空</TMagicButton
-    >
+
+    <div style="display: flex; justify-content: space-between; margin: 10px 0">
+      <TMagicButton v-if="addable" size="small" type="primary" :disabled="disabled" plain @click="newHandler()"
+        >新增一行</TMagicButton
+      >
+
+      <div style="display: flex">
+        <TMagicButton
+          :icon="Grid"
+          size="small"
+          type="primary"
+          @click="toggleMode"
+          v-if="enableToggleMode && config.enableToggleMode !== false && !isFullscreen"
+          >展开配置</TMagicButton
+        >
+        <TMagicButton
+          :icon="FullScreen"
+          size="small"
+          type="primary"
+          @click="toggleFullscreen"
+          v-if="config.enableFullscreen !== false"
+        >
+          {{ isFullscreen ? '退出全屏' : '全屏编辑' }}
+        </TMagicButton>
+        <TMagicUpload
+          v-if="importable"
+          style="display: inline-block"
+          ref="excelBtn"
+          action="/noop"
+          :disabled="disabled"
+          :on-change="excelHandler"
+          :auto-upload="false"
+        >
+          <TMagicButton size="small" type="success" :disabled="disabled" plain>导入EXCEL</TMagicButton>
+        </TMagicUpload>
+        <TMagicButton v-if="importable" size="small" type="warning" :disabled="disabled" plain @click="clearHandler()"
+          >清空</TMagicButton
+        >
+      </div>
+    </div>
 
     <div class="bottom" style="text-align: right" v-if="config.pagination">
       <TMagicPagination
@@ -244,7 +249,7 @@ const modelName = computed(() => props.name || props.config.name || '');
 
 const data = computed(() =>
   props.config.pagination
-    ? props.model[modelName.value].filter(
+    ? (props.model[modelName.value] || []).filter(
         (item: any, index: number) =>
           index >= pagecontext.value * pagesize.value && index + 1 <= (pagecontext.value + 1) * pagesize.value,
       )
@@ -253,11 +258,11 @@ const data = computed(() =>
 
 const lastData = computed(() =>
   props.config.pagination
-    ? props.lastValues[modelName.value].filter(
+    ? (props.lastValues[modelName.value] || []).filter(
         (item: any, index: number) =>
           index >= pagecontext.value * pagesize.value && index + 1 <= (pagecontext.value + 1) * pagesize.value,
       )
-    : props.lastValues[modelName.value] || {},
+    : props.lastValues[modelName.value] || [],
 );
 
 const sortChange = ({ prop, order }: SortProp) => {
@@ -371,10 +376,6 @@ const newHandler = async (row?: any) => {
   emit('change', props.model[modelName.value]);
 };
 
-if (!(globalThis as any).XLSX) {
-  asyncLoadJs('https://cdn.bootcdn.net/ajax/libs/xlsx/0.17.0/xlsx.full.min.js');
-}
-
 onMounted(() => {
   if (props.config.defautSort) {
     sortChange(props.config.defautSort);
@@ -535,10 +536,15 @@ const clearHandler = () => {
   mForm?.$emit('field-change', props.prop, props.model[modelName.value]);
 };
 
-const excelHandler = (file: any) => {
+const excelHandler = async (file: any) => {
   if (!file?.raw) {
     return false;
   }
+
+  if (!(globalThis as any).XLSX) {
+    await asyncLoadJs('https://cdn.bootcdn.net/ajax/libs/xlsx/0.17.0/xlsx.full.min.js');
+  }
+
   const reader = new FileReader();
   reader.onload = () => {
     const data = reader.result;

package/src/fields/Cascader.vue

@@ -9,7 +9,11 @@
     :placeholder="config.placeholder"
     :disabled="disabled"
     :options="options"
-    :props="{ multiple: config.multiple }"
+    :props="{
+      multiple: config.multiple ?? false,
+      emitPath: config.emitPath ?? true,
+      checkStrictly: config.checkStrictly ?? false,
+    }"
     @change="changeHandler"
   ></TMagicCascader>
 </template>

package/src/schema.ts

@@ -527,7 +527,12 @@ export interface LinkConfig extends FormItem {
 export interface CascaderConfig extends FormItem, Input {
   type: 'cascader';
   remote?: boolean;
+  /** 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值，默认 true */
+  emitPath?: boolean;
+  /** 是否多选，默认 false */
   multiple?: boolean;
+  /** 是否严格的遵守父子节点不互相关联，默认 false */
+  checkStrictly?: boolean;
   options?:
     | ((
         mForm: FormState | undefined,
@@ -545,12 +550,6 @@ export interface CascaderConfig extends FormItem, Input {
     root: 'string';
     item: (optionsData: Record<string, any>) => CascaderOption[];
   };
-  add?: {
-    action: {
-      method: 'post' | 'get';
-      body?: Record<string, any>;
-    };
-  };
 }
 
 export interface DynamicFieldConfig extends FormItem {

package/types/schema.d.ts

@@ -427,7 +427,12 @@ export interface LinkConfig extends FormItem {
 export interface CascaderConfig extends FormItem, Input {
     type: 'cascader';
     remote?: boolean;
+    /** 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值，默认 true */
+    emitPath?: boolean;
+    /** 是否多选，默认 false */
     multiple?: boolean;
+    /** 是否严格的遵守父子节点不互相关联，默认 false */
+    checkStrictly?: boolean;
     options?: ((mForm: FormState | undefined, data: {
         model: Record<any, any>;
         formValues: Record<any, any>;
@@ -440,12 +445,6 @@ export interface CascaderConfig extends FormItem, Input {
         root: 'string';
         item: (optionsData: Record<string, any>) => CascaderOption[];
     };
-    add?: {
-        action: {
-            method: 'post' | 'get';
-            body?: Record<string, any>;
-        };
-    };
 }
 export interface DynamicFieldConfig extends FormItem {
     type: 'dynamic-field';