plain-design 1.0.0-beta.159 → 1.0.0-beta.160

package/src/packages/components/AutoTable/setting/useTableOption.setting.tsx

@@ -1,109 +1,109 @@
-import {classnames, computed, getComponentCls, reactive, SimpleFunction} from "@peryl/react-compose";
-import {iTableOptionSettingConfig, iTableOptionSettingInnerUser} from "./useTableOption.setting.utils";
-import {$dialog} from "../../$dialog";
-import {Scroll} from "../../Scroll";
-import '../utils/TableOption.space';
-import i18n from "../../i18n";
-import {AutoModule} from "../utils/AutoModule";
-
-declare module '../utils/TableOption.space' {
-  namespace TableOptionSpace {
-    interface iTableOption {
-      setting: ReturnType<typeof useTableOptionSetting>;
-    }
-  }
-}
-
-export const useTableOptionSetting = AutoModule.createRegistration((
-  {
-    config,
-  }
-) => {
-
-  const state = reactive({
-    settingConfigs: [] as iTableOptionSettingConfig[],
-    activeKey: null as null | string,
-    closeSetting: null as null | SimpleFunction,
-  });
-
-  const isOpen = computed(() => !!state.closeSetting);
-
-  const useTableOptionSettingInner: iTableOptionSettingInnerUser = (config) => {
-    state.settingConfigs.push(config);
-    return { isOpen: () => isOpen.value && state.activeKey === config.key };
-  };
-
-  const openSetting = async (key: string) => {
-
-    const settingConfigs = state.settingConfigs.sort((a, b) => a.seq - b.seq);
-    const showConfig = state.settingConfigs.find(i => i.key === key);
-    !!showConfig && showConfig.beforeOpen && (await showConfig.beforeOpen());
-    state.activeKey = key;
-
-    /*已经打开就不用在打开一个dialog了，直接切换activeKey*/
-    if (isOpen.value) {return state.closeSetting;}
-
-    state.closeSetting = $dialog({
-      status: null,
-      size: config.size,
-      position: 'right',
-      width: null as any,
-      destroyOnClose: false,
-      footAlign: 'left',
-      noContentPadding: true,
-      externalClass: getComponentCls('auto-table-setting-dialog'),
-      title: i18n.$it('base.setting').d('设置'),
-      cancelButton: true,
-      cancelButtonText: i18n.$it('base.close').d('关闭'),
-      onHide: () => {state.closeSetting = null;},
-      render: () => {
-        return (
-          <div className={'auto-table-setting-wrapper'}>
-            <div className="auto-table-setting-nav">
-              {[null, ...settingConfigs, null].map((item, index) => (
-                <div key={index} className={classnames([
-                  'auto-table-setting-nav-item',
-                  {
-                    'auto-table-setting-nav-item-active': !!item && item.key === state.activeKey,
-                    'auto-table-setting-nav-item-prev': !!settingConfigs[index] && settingConfigs[index].key === state.activeKey,
-                    'auto-table-setting-nav-item-next': !!settingConfigs[index - 2] && settingConfigs[index - 2].key === state.activeKey,
-                  }
-                ])} onClick={async () => {
-                  if (!item) {return;}
-                  !!item.beforeOpen && (await item.beforeOpen());
-                  state.activeKey = item.key;
-                }}>
-                  <div className="auto-table-setting-nav-item-inner">
-                    {item?.title}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="auto-table-setting-body">
-              <Scroll>
-                <div className="auto-table-setting-body-inner">
-                  {(() => {
-                    const r = settingConfigs.find(i => i.key === state.activeKey);
-                    if (!r) {return null;}
-                    const content = !!r.render && r.render();
-                    return (
-                      <div className={classnames(['auto-table-setting-content', { 'auto-table-setting-content-pending': !!r && r.contentPending !== false }])}>
-                        {content}
-                      </div>
-                    );
-                  })()}
-                </div>
-              </Scroll>
-            </div>
-          </div>
-        );
-      },
-    });
-
-    return closeSetting;
-  };
-
-  const closeSetting = () => state.closeSetting?.();
-
-  return { openSetting, closeSetting, useTableOptionSettingInner };
-});
+import {classnames, computed, getComponentCls, reactive, SimpleFunction} from "@peryl/react-compose";
+import {iTableOptionSettingConfig, iTableOptionSettingInnerUser} from "./useTableOption.setting.utils";
+import {$dialog} from "../../$dialog";
+import {Scroll} from "../../Scroll";
+import '../utils/TableOption.space';
+import i18n from "../../i18n";
+import {AutoModule} from "../utils/AutoModule";
+
+declare module '../utils/TableOption.space' {
+  namespace TableOptionSpace {
+    interface iTableOption {
+      setting: ReturnType<typeof useTableOptionSetting>;
+    }
+  }
+}
+
+export const useTableOptionSetting = AutoModule.createRegistration((
+  {
+    config,
+  }
+) => {
+
+  const state = reactive({
+    settingConfigs: [] as iTableOptionSettingConfig[],
+    activeKey: null as null | string,
+    closeSetting: null as null | SimpleFunction,
+  });
+
+  const isOpen = () => !!state.closeSetting;
+
+  const useTableOptionSettingInner: iTableOptionSettingInnerUser = (config) => {
+    state.settingConfigs.push(config);
+    return { isOpen: () => isOpen() && state.activeKey === config.key };
+  };
+
+  const openSetting = async (key: string) => {
+
+    const settingConfigs = state.settingConfigs.sort((a, b) => a.seq - b.seq);
+    const showConfig = state.settingConfigs.find(i => i.key === key);
+    !!showConfig && showConfig.beforeOpen && (await showConfig.beforeOpen());
+    state.activeKey = key;
+
+    /*已经打开就不用在打开一个dialog了，直接切换activeKey*/
+    if (isOpen()) {return state.closeSetting;}
+
+    state.closeSetting = $dialog({
+      status: null,
+      size: config.size,
+      position: 'right',
+      width: null as any,
+      destroyOnClose: false,
+      footAlign: 'left',
+      noContentPadding: true,
+      externalClass: getComponentCls('auto-table-setting-dialog'),
+      title: i18n.$it('base.setting').d('设置'),
+      cancelButton: true,
+      cancelButtonText: i18n.$it('base.close').d('关闭'),
+      onHide: () => {state.closeSetting = null;},
+      render: () => {
+        return (
+          <div className={'auto-table-setting-wrapper'}>
+            <div className="auto-table-setting-nav">
+              {[null, ...settingConfigs, null].map((item, index) => (
+                <div key={index} className={classnames([
+                  'auto-table-setting-nav-item',
+                  {
+                    'auto-table-setting-nav-item-active': !!item && item.key === state.activeKey,
+                    'auto-table-setting-nav-item-prev': !!settingConfigs[index] && settingConfigs[index].key === state.activeKey,
+                    'auto-table-setting-nav-item-next': !!settingConfigs[index - 2] && settingConfigs[index - 2].key === state.activeKey,
+                  }
+                ])} onClick={async () => {
+                  if (!item) {return;}
+                  !!item.beforeOpen && (await item.beforeOpen());
+                  state.activeKey = item.key;
+                }}>
+                  <div className="auto-table-setting-nav-item-inner">
+                    {item?.title}
+                  </div>
+                </div>
+              ))}
+            </div>
+            <div className="auto-table-setting-body">
+              <Scroll>
+                <div className="auto-table-setting-body-inner">
+                  {(() => {
+                    const r = settingConfigs.find(i => i.key === state.activeKey);
+                    if (!r) {return null;}
+                    const content = !!r.render && r.render();
+                    return (
+                      <div className={classnames(['auto-table-setting-content', { 'auto-table-setting-content-pending': !!r && r.contentPending !== false }])}>
+                        {content}
+                      </div>
+                    );
+                  })()}
+                </div>
+              </Scroll>
+            </div>
+          </div>
+        );
+      },
+    });
+
+    return closeSetting;
+  };
+
+  const closeSetting = () => state.closeSetting?.();
+
+  return { openSetting, closeSetting, useTableOptionSettingInner };
+});

package/src/packages/components/Checkbox/index.tsx

@@ -125,12 +125,10 @@ export const Checkbox = designComponent({
           onKeyDown={handler.keydown}
           ref={onRef.el}>
           <span className="plain-click-node">
-            <Transition switch name={getComponentCls("transition-fade")} mode="out-in">
-              <CheckboxInner
-                checkStatus={checkStatus.value}
-                key={checkStatus.value}
-                disabled={editComputed.value.disabled!}/>
-            </Transition>
+            <CheckboxInner
+              checkStatus={checkStatus.value}
+              key={checkStatus.value}
+              disabled={editComputed.value.disabled!}/>
           </span>
           {(slots.labelContent.isExist() || props.label || props.checkboxForAll) && slots.labelContent(<span className="checkbox-label">{props.label || (props.checkboxForAll ? i18n.$it('base.select.all').d('全选') : '')}</span>)}
         </div>))