plain-design 1.0.0-beta.114 → 1.0.0-beta.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.114",
+  "version": "1.0.0-beta.116",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@peryl/icon": "0.0.8",
-    "@peryl/utils": "^0.1.69",
+    "@peryl/utils": "^0.1.71",
     "@types/color": "3.0.6",
     "@types/react-transition-group": "4.4.10",
     "color": "4.2.3",
@@ -40,12 +40,12 @@
     "react-transition-group": "4.4.5"
   },
   "devDependencies": {
+    "@peryl/react-compose": "0.0.215",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-transform-class-properties": "7.23.3",
     "@babel/preset-env": "7.23.7",
     "@babel/preset-react": "7.23.3",
     "@babel/preset-typescript": "7.23.3",
-    "@peryl/react-compose": "0.0.205",
     "@types/classnames": "^2.2.11",
     "@types/react": "18.2.4",
     "@types/react-dom": "18.2.4",

package/src/packages/components/Table/plc/useTablePlc.tsx

@@ -47,6 +47,8 @@ export function useTablePlc(
     getPlcTypeArr: null as null | (() => tPlcType[]),
   });
 
+  onBeforeUnmount(()=>{state.getTableEl = null})
+
   hooks.onPlcTypes.use(list => {state.getPlcTypeArr = () => list;});
 
   (() => {

package/src/packages/components/TreeCore/createTreeProps.ts

@@ -32,7 +32,7 @@ export const TreePropsOptions = {
   customDraggier: { type: Boolean as PropType<iTreeProps["customDraggier"]> },
   isAllowDraggable: { type: Function as PropType<iTreeProps["isAllowDraggable"]> },
   isAllowDroppable: { type: Function as PropType<iTreeProps["isAllowDroppable"]> },
-  leafIcon: { type: String as PropType<iTreeProps["leafIcon"]>, default: 'pi-drive-file' as string },
+  leafIcon: { type: [String, Function] as PropType<iTreeProps["leafIcon"]>, default: 'pi-drive-file' as string },
   folderCollapseIcon: { type: String as PropType<iTreeProps["folderCollapseIcon"]>, default: 'pi-caret-right' as string },
   folderExpandIcon: { type: String as PropType<iTreeProps["folderExpandIcon"]>, default: 'pi-down' as string },
   expanderCover: { type: Boolean as PropType<iTreeProps["expanderCover"]>, default: true },

package/src/packages/components/useDialog/DialogService.tsx

@@ -119,16 +119,16 @@ export const DialogService = createApplicationServiceComponent<iDialogServiceOpt
       },
       render: () => {
         /*---------------------------------------head-------------------------------------------*/
-        const head = () => (
+        const head = targetOption.value.customOption.renderHead || (() => (
           <div className="dialog-service-head">
             {!!targetOption.value.customOption.status && <Icon icon={ThemeStatusIcons[targetOption.value.customOption.status]}/>}
             <span>{targetOption.value.dialogProps.title || i18n.$it('base.defaultTitle').d('提示')}</span>
           </div>
-        );
+        ));
         /*---------------------------------------foot-------------------------------------------*/
-        const foot = () => !targetOption.value.dialogProps.confirmButton && !targetOption.value.dialogProps.cancelButton && (
+        const foot = targetOption.value.customOption.renderFoot || (() => !targetOption.value.dialogProps.confirmButton && !targetOption.value.dialogProps.cancelButton && (
           <Button mode="fill" label={i18n.$it('base.close').d('关闭')} onClick={hide} status={targetOption.value.customOption.status || undefined}/>
-        );
+        ));
         /*---------------------------------------default-------------------------------------------*/
         let defaultSlot = null as any;
         const dialogProps = { ...targetOption.value.dialogProps };
@@ -213,13 +213,13 @@ export const DialogService = createApplicationServiceComponent<iDialogServiceOpt
           <Dialog
             {...dialogProps}
             v-model={isShow.value}
-            v-model:open={isOpen.value}>
-            {{
+            v-model:open={isOpen.value}
+            v-slots={{
               head,
               foot,
               default: () => defaultSlot,
             }}
-          </Dialog>
+          />
         );
       }
     };

package/src/packages/components/usePopup/PopupItem.tsx

@@ -39,7 +39,12 @@ export const PopupItem = designComponent({
 
     const manager = PopupManager.inject()!;
 
-    const state = reactive({
+    const state: {
+      option: iPopupOption,
+      isShow: boolean,
+      isAnimationReady: boolean,
+      zIndex: number,
+    } = reactive({
       /**
        * 当前popup item对应的option对象，不可以通过props.option来更新，必须调用manager.methods.update手动更新
        * @author  韦胜健