@fangzhongya/fang-ui 0.1.35 → 0.1.36

package/dist/components/page/src/index2.js

@@ -10,7 +10,7 @@ import { MessageBox } from "../../message-box/index.js";
 import { name, dataProps, dataEmits } from "./data.js";
 import "./set-column.js";
 import { comHandle } from "../../common/urls.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { useLocale } from "../../../hooks/locale/index.js";
 import _sfc_main$1 from "./set-column2.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -21,7 +21,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { getLocale, getLocaleAdd } = useLocale();
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const emit = __emit;
     const cs = useCssName(name);
     const slots = useSlots();
@@ -30,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const getListObj = () => {
       const value = {};
       const filtration = (arr, listobj) => {
-        arr.forEach((obj) => {
+        for (const obj of arr) {
           if (listobj) {
             obj.father = obj.father ?? listobj;
           }
@@ -40,14 +39,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (obj.children) {
             filtration(obj.children, obj);
           }
-        });
+        }
       };
       filtration(props.list);
       return value;
     };
     const getColumnList = (array, callback) => {
       const filtration = (value2, arr) => {
-        arr.forEach((item) => {
+        for (const item of arr) {
           let obj = {};
           if (typeof item === "string") {
             const v = listObj[item] || {
@@ -65,12 +64,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               filtration(children, obj.children);
               obj.children = children;
             }
-            if (obj.prop) {
-              obj = Object.assign({}, listObj[obj.prop] || {}, obj);
+            if (obj.prop && listObj[obj.prop]) {
+              obj = { ...listObj[obj.prop], ...obj };
             }
             value2.push(obj);
           }
-        });
+        }
       };
       const value = [];
       filtration(value, array);
@@ -97,7 +96,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const list2 = getListQuery();
       if ((_a = props.config.query) == null ? void 0 : _a.senior) {
         let i = 0;
-        list2.forEach((obj) => {
+        for (const obj of list2) {
           if (obj.querybasis) {
             i++;
           } else {
@@ -105,7 +104,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               return !isSenior.value;
             };
           }
-        });
+        }
         if (i == 0) {
           list2[0].hide = void 0;
         }
@@ -258,9 +257,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const label = ((_a = props.config.delete) == null ? void 0 : _a.label) || "name";
       const prop = ((_b = props.config.delete) == null ? void 0 : _b.prop) || "id";
       const name2 = ((_c = listObj[label]) == null ? void 0 : _c.label) || "内容";
-      array.forEach((obj) => {
+      for (const obj of array) {
         ts.push(name2 + "：" + (obj[label] ?? ""));
-      });
+      }
       MessageBox.confirm(ts.join("<br>"), "提示", {
         confirmButtonText: "确认",
         cancelButtonText: "取消",
@@ -374,7 +373,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const querySlots = [];
     const setSlots = () => {
       const ds = Object.values(dataSlot);
-      Object.keys(slots || {}).forEach((key) => {
+      for (const key of Object.keys(slots || {})) {
         if (!ds.includes(key)) {
           if (key.startsWith("query-")) {
             querySlots.push(key.replace(/^query-/, ""));
@@ -391,7 +390,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             tableSlots.push(key);
           }
         }
-      });
+      }
     };
     setSlots();
     const dialog = reactive({
@@ -401,83 +400,61 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       value: {}
     });
     const onConfirm = () => {
-      if (formRef.value) {
-        formRef.value.validate().then((data) => {
-          var _a, _b;
-          if (dialog.type === "add") {
-            console.log("添加", data);
-            const ajax = (_a = props.config.add) == null ? void 0 : _a.ajax;
-            if (ajax) {
-              const param = {
-                param: props.value
-              };
-              if (typeof ajax === "object") {
-                param.onRequestBefore = ajax == null ? void 0 : ajax.onRequestBefore;
-                param.onRequestAfter = ajax == null ? void 0 : ajax.onRequestAfter;
-                param.ajax = ajax == null ? void 0 : ajax.url;
-                param.ajaxConfig = ajax == null ? void 0 : ajax.config;
-              } else {
-                param.ajax = ajax;
-              }
-              comHandle(param, data).then((res) => {
-                if (res.result) {
-                  Message.success(
-                    res.info || "添加成功"
-                  );
-                  dialog.visible = false;
-                  onRefresh();
-                } else {
-                  Message.error(res.info || "添加失败");
-                }
-              }).catch((err) => {
-                console.error("添加失败", err);
-              });
-            } else {
-              emit("add", data, () => {
-                dialog.visible = false;
-                onRefresh();
-              });
-            }
-          } else if (dialog.type === "edit") {
-            console.log("编辑", data);
-            const ajax = (_b = props.config.edit) == null ? void 0 : _b.ajax;
-            if (ajax) {
-              const param = {
-                param: props.value
-              };
-              if (typeof ajax === "object") {
-                param.onRequestBefore = ajax == null ? void 0 : ajax.onRequestBefore;
-                param.onRequestAfter = ajax == null ? void 0 : ajax.onRequestAfter;
-                param.ajax = ajax == null ? void 0 : ajax.url;
-                param.ajaxConfig = ajax == null ? void 0 : ajax.config;
-              } else {
-                param.ajax = ajax;
-              }
-              comHandle(param, data).then((res) => {
-                if (res.result) {
-                  Message.success(
-                    res.info || "编辑成功"
-                  );
-                  dialog.visible = false;
-                  onRefresh();
-                } else {
-                  Message.error(res.info || "编辑失败");
-                }
-              }).catch((err) => {
-                console.error("编辑失败", err);
-              });
-            } else {
-              emit("edit", data, () => {
-                dialog.visible = false;
-                onRefresh();
-              });
-            }
-          }
-        }).catch((err) => {
-          console.error("表单验证失败", err);
-        });
+      if (!formRef.value) return;
+      formRef.value.validate().then((data) => {
+        handleFormValidationSuccess(data);
+      }).catch((err) => {
+        console.error("表单验证失败", err);
+      });
+    };
+    const handleFormValidationSuccess = (data) => {
+      if (dialog.type === "add") {
+        handleOperation("add", data, "添加");
+      } else if (dialog.type === "edit") {
+        handleOperation("edit", data, "编辑");
+      }
+    };
+    const handleOperation = (type, data, operationName) => {
+      console.log(operationName, data);
+      const operationConfig = type === "add" ? props.config.add : props.config.edit;
+      const ajax = operationConfig == null ? void 0 : operationConfig.ajax;
+      if (ajax) {
+        handleAjaxOperation(ajax, data, operationName);
+      } else {
+        handleEmitOperation(type, data, operationName);
       }
     };
+    const handleAjaxOperation = (ajax, data, operationName) => {
+      const param = {
+        param: props.value
+      };
+      if (typeof ajax === "object") {
+        param.onRequestBefore = ajax == null ? void 0 : ajax.onRequestBefore;
+        param.onRequestAfter = ajax == null ? void 0 : ajax.onRequestAfter;
+        param.ajax = ajax == null ? void 0 : ajax.url;
+        param.ajaxConfig = ajax == null ? void 0 : ajax.config;
+      } else {
+        param.ajax = ajax;
+      }
+      comHandle(param, data).then((res) => {
+        if (res.result) {
+          Message.success(res.info || `${operationName}成功`);
+          dialog.visible = false;
+          onRefresh();
+        } else {
+          Message.error(res.info || `${operationName}失败`);
+        }
+      }).catch((err) => {
+        console.error(`${operationName}失败`, err);
+      });
+    };
+    const handleEmitOperation = (type, data, operationName) => {
+      const emitEvent = type === "add" ? "add" : "edit";
+      emit(emitEvent, data, () => {
+        dialog.visible = false;
+        onRefresh();
+      });
+    };
     const getListForm = () => {
       var _a, _b;
       if (dialog.type === "edit") {

package/dist/components/pagination/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const Pagination: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Pagination, Pagination as default };
+export { Pagination };
+export default Pagination;

package/dist/components/pagination/index.scss

@@ -2,4 +2,5 @@
 
 $pagination: 'pagination';
 @include b($pagination) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/paging/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;

package/dist/components/paging/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Paging: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Paging, Paging as default };
+export { Paging };
+export default Paging;

package/dist/components/paging/src/index2.cjs

@@ -3,12 +3,11 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const index$5 = require("../../pagination/index.cjs");
 const index$4 = require("../../../hooks/expose/index.cjs");
-require("../../../hooks/index.cjs");
-const data = require("./data.cjs");
-const index = require("../../../hooks/locale/index.cjs");
-const index$3 = require("../../../hooks/props-default/index.cjs");
 const index$1 = require("../../../hooks/cssname/index.cjs");
 const index$2 = require("../../../hooks/inherit/index.cjs");
+const index = require("../../../hooks/locale/index.cjs");
+const data = require("./data.cjs");
+const index$3 = require("../../../hooks/props-default/index.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ inheritAttrs: false },
   __name: "index",
@@ -22,7 +21,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const attrs = index$2.useInherit(vue.useAttrs(), data.name);
     const prs = __props;
     const props = index$3.usePropsDefault(data.name, prs, data.dataProps);
-    index$3.viewProps(props, data.name);
     const emit = __emit;
     const layout = vue.computed(() => {
       const layout2 = props.layout || attrs.assem.layout;

package/dist/components/paging/src/index2.js

@@ -1,12 +1,11 @@
 import { defineComponent, ref, useAttrs, computed, createElementBlock, openBlock, mergeProps, unref, createVNode, withCtx, createElementVNode, normalizeClass, toDisplayString } from "vue";
 import { Pagination } from "../../pagination/index.js";
 import { useExpose } from "../../../hooks/expose/index.js";
-import "../../../hooks/index.js";
-import { name, dataProps, dataEmits } from "./data.js";
-import { useLocale } from "../../../hooks/locale/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useInherit } from "../../../hooks/inherit/index.js";
+import { useLocale } from "../../../hooks/locale/index.js";
+import { name, dataProps, dataEmits } from "./data.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ inheritAttrs: false },
   __name: "index",
@@ -20,7 +19,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const attrs = useInherit(useAttrs(), name);
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const emit = __emit;
     const layout = computed(() => {
       const layout2 = props.layout || attrs.assem.layout;

package/dist/components/players/common/util.cjs

@@ -12,11 +12,11 @@ function getListValue(list) {
     } else {
       if (o.url) {
         const obj = getUrlCatalogueObj.getUrlCatalogueObj(o.url);
-        Object.keys(obj).forEach((k) => {
+        for (const k of Object.keys(obj)) {
           if (!o[k]) {
             o[k] = obj[k];
           }
-        });
+        }
       }
       return o;
     }

package/dist/components/players/common/util.js

@@ -10,11 +10,11 @@ function getListValue(list) {
     } else {
       if (o.url) {
         const obj = getUrlCatalogueObj(o.url);
-        Object.keys(obj).forEach((k) => {
+        for (const k of Object.keys(obj)) {
           if (!o[k]) {
             o[k] = obj[k];
           }
-        });
+        }
       }
       return o;
     }

package/dist/components/popconfirm/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const Popconfirm: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Popconfirm, Popconfirm as default };
+export { Popconfirm };
+export default Popconfirm;

package/dist/components/popconfirm/index.scss

@@ -2,4 +2,5 @@
 
 $popconfirm: 'popconfirm';
 @include b($popconfirm) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/popover/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const Popover: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Popover, Popover as default };
+export { Popover };
+export default Popover;

package/dist/components/popover/index.scss

@@ -2,4 +2,5 @@
 
 $popover: 'popover';
 @include b($popover) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/popup/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;
@@ -62,7 +62,7 @@
   padding: 10px;
   position: relative;
   background-color: #467ddc;
-  color: #fff;
+  color: #ffffff;
   align-items: center;
   display: flex;
 }
@@ -96,7 +96,7 @@
   top: 30%;
   left: 30%;
   z-index: 100;
-  background: #fff;
+  background: #ffffff;
   width: 40%;
   height: 40%;
   display: flex;

package/dist/components/popup/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Popup: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Popup, Popup as default };
+export { Popup };
+export default Popup;

package/dist/components/popup/index.scss

@@ -20,7 +20,7 @@ $popup: 'popup';
 		top: 30%;
 		left: 30%;
 		z-index: 100;
-		background: #fff;
+		background: #ffffff;
 		width: 40%;
 		height: 40%;
 		display: flex;

package/dist/components/popup/src/data.cjs

@@ -6,11 +6,11 @@ const name = "popup";
 const dataProps = buildProps.buildProps({
   ...data.dataProps,
   /**
-   * @props { String } drag='.box-title-name' ( )
+   * @props { String, Boolean } drag='.box-title-name' ( )
    * 可拖拽的元素样式 为空字符串就不拖拽
    */
   drag: {
-    type: String
+    type: [String, Boolean]
   },
   /**
    * @props { Boolean } drag= ( )

package/dist/components/popup/src/data.d.ts

@@ -6,11 +6,11 @@ import { FunctConfig } from '../../../utils/enums';
 export declare const name = "popup";
 export declare const dataProps: {
     /**
-     * @props { String } drag='.box-title-name' ( )
+     * @props { String, Boolean } drag='.box-title-name' ( )
      * 可拖拽的元素样式 为空字符串就不拖拽
      */
     drag: {
-        type: StringConstructor;
+        type: (BooleanConstructor | StringConstructor)[];
     };
     /**
      * @props { Boolean } drag= ( )

package/dist/components/popup/src/data.js

@@ -4,11 +4,11 @@ const name = "popup";
 const dataProps = buildProps({
   ...dataProps$1,
   /**
-   * @props { String } drag='.box-title-name' ( )
+   * @props { String, Boolean } drag='.box-title-name' ( )
    * 可拖拽的元素样式 为空字符串就不拖拽
    */
   drag: {
-    type: String
+    type: [String, Boolean]
   },
   /**
    * @props { Boolean } drag= ( )

package/dist/components/popup/src/index2.cjs

@@ -25,9 +25,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return "." + cs.cn(data$1.name, "name");
       }
     });
-    index$2.viewProps(props, data.name);
     const emit = __emit;
-    const drag = { dom: props.self ? false : props.drag };
+    const dragObj = { dom: props.self ? false : props.drag };
     const adjust = !props.self && props.adjust ? {
       often: props.often,
       all: { position: true }
@@ -90,7 +89,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               ], 2),
               vue.renderSlot(_ctx.$slots, vue.unref(data.dataSlot).footer)
             ], 2)), [
-              [vue.unref(index$6.default), drag],
+              [vue.unref(index$6.default), dragObj],
               [vue.unref(index$7.default), vue.unref(adjust)]
             ])
           ], 2)), [

package/dist/components/popup/src/index2.js

@@ -8,7 +8,7 @@ import { BoxTeleport } from "../../box-teleport/index.js";
 import vAdjust from "../../../directives/adjust/index.js";
 import vDrag from "../../../directives/drag/index.js";
 import { name as name$1 } from "../../box-title/src/data.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: getProps(dataProps),
@@ -23,9 +23,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return "." + cs.cn(name$1, "name");
       }
     });
-    viewProps(props, name);
     const emit = __emit;
-    const drag = { dom: props.self ? false : props.drag };
+    const dragObj = { dom: props.self ? false : props.drag };
     const adjust = !props.self && props.adjust ? {
       often: props.often,
       all: { position: true }
@@ -88,7 +87,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ], 2),
               renderSlot(_ctx.$slots, unref(dataSlot).footer)
             ], 2)), [
-              [unref(vDrag), drag],
+              [unref(vDrag), dragObj],
               [unref(vAdjust), unref(adjust)]
             ])
           ], 2)), [

package/dist/components/radio/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const Radio: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Radio, Radio as default };
+export { Radio };
+export default Radio;

package/dist/components/radio/index.scss

@@ -2,4 +2,5 @@
 
 $radio: 'radio';
 @include b($radio) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/radio-button/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const RadioButton: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { RadioButton, RadioButton as default };
+export { RadioButton };
+export default RadioButton;

package/dist/components/radio-button/index.scss

@@ -2,4 +2,5 @@
 
 $radio-button: 'radio-button';
 @include b($radio-button) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/radio-group/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const RadioGroup: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { RadioGroup, RadioGroup as default };
+export { RadioGroup };
+export default RadioGroup;

package/dist/components/radio-group/index.scss

@@ -2,4 +2,5 @@
 
 $radio-group: 'radio-group';
 @include b($radio-group) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/retract/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;
@@ -27,6 +27,7 @@
 }
 .retract .retract-but {
   position: absolute;
+  background-color: rgba(201, 201, 201, 0.5);
 }
 .retract .retract-but .retract-icon {
   width: 100%;
@@ -42,9 +43,6 @@
 .retract .retract-but .retract-icon.is-reverse {
   transform: rotate(-180deg);
 }
-.retract .retract-but {
-  background-color: rgba(201, 201, 201, 0.5);
-}
 .retract .retract-but.is-left {
   top: 50%;
   width: 20px;

package/dist/components/retract/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Retract: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Retract, Retract as default };
+export { Retract };
+export default Retract;

package/dist/components/retract/index.scss

@@ -5,6 +5,7 @@ $retract: 'retract';
 	position: relative;
 	.#{$retract}-but {
 		position: absolute;
+		background-color: rgba(201, 201, 201, 0.5);
 		.#{$retract}-icon {
 			width: 100%;
 			height: 100%;
@@ -19,7 +20,6 @@ $retract: 'retract';
 				transform: rotate(-180deg);
 			}
 		}
-		background-color: rgba(201, 201, 201, 0.5);
 		&.is-left {
 			top: 50%;
 			width: 20px;

package/dist/components/retract/src/data.cjs

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../../utils/index.cjs");
 const buildProps = require("../../../utils/vues/buildProps.cjs");
 const name = "retract";
 const dataProps = buildProps.buildProps({

package/dist/components/retract/src/data.js

@@ -1,4 +1,3 @@
-import "../../../utils/index.js";
 import { buildProps } from "../../../utils/vues/buildProps.js";
 const name = "retract";
 const dataProps = buildProps({