@fecp/designer 5.3.22 → 5.4.2

package/es/packages/vue/src/components/table/Table.vue.mjs

@@ -173,7 +173,93 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
       return localConfig.value.height || 500;
     });
-    const initDataSourceManager = () => {
+    const summaryConfig = computed(() => {
+      return localConfig.value.summaryConfig || {
+        enabled: false,
+        mode: "current",
+        summaryFields: []
+      };
+    });
+    const allSummaryData = ref({});
+    const footerData = computed(() => {
+      const config = summaryConfig.value;
+      const { enabled, mode, summaryFields = [] } = config;
+      if (!enabled) return [];
+      const firstItem = fieldsData.value.find((item) => item.isShow);
+      if (!firstItem) {
+        return [];
+      }
+      const firstSummaryField = firstItem.fieldName;
+      const footerRow = { _isFooter: true };
+      if (firstSummaryField) {
+        footerRow[firstSummaryField] = "合计";
+      }
+      if (mode === "current") {
+        summaryFields.forEach((fieldName) => {
+          const sum = displayData.value.reduce((total, item) => {
+            const value = parseFloat(item[fieldName]);
+            return total + (isNaN(value) ? 0 : value);
+          }, 0);
+          if (isNaN(sum)) {
+            footerRow[fieldName] = "";
+          } else {
+            const field = fieldsData.value.find((f) => f.fieldName === fieldName);
+            footerRow[fieldName] = formatSummaryValue(sum, field);
+          }
+        });
+      } else if (mode === "all") {
+        summaryFields.forEach((fieldName) => {
+          const sum = allSummaryData.value[fieldName];
+          if (sum !== void 0 && sum !== null) {
+            const field = fieldsData.value.find((f) => f.fieldName === fieldName);
+            footerRow[fieldName] = formatSummaryValue(sum, field);
+          } else {
+            footerRow[fieldName] = "加载中...";
+          }
+        });
+      }
+      return [footerRow];
+    });
+    function formatSummaryValue(value, field) {
+      if (!field) {
+        return value;
+      }
+      const format = field.format;
+      field.hasDecimalPlaces;
+      field.decimalPlaces ?? 2;
+      let result = value;
+      switch (format) {
+        case "yuan":
+          result = value;
+          break;
+        case "wan":
+          result = value / 1e4;
+          break;
+        case "million":
+          result = value / 1e6;
+          break;
+        case "percentage":
+          result = value * 100;
+          break;
+        case "permillage":
+          result = value * 1e3;
+          break;
+        case "permillion":
+          result = value * 1e4;
+          break;
+        default:
+          result = value;
+      }
+      if (field.format == "yuan" || field.format == "wan" || field.format == "million") {
+        const formatted = result.toLocaleString("en-US", {
+          minimumFractionDigits: field.hasDecimalPlaces && field.decimalPlaces !== void 0 ? field.decimalPlaces : 0,
+          maximumFractionDigits: field.hasDecimalPlaces && field.decimalPlaces !== void 0 ? field.decimalPlaces : 20
+        });
+        return formatted;
+      }
+      return result;
+    }
+    const initDataSourceManager = async () => {
       var _a, _b;
       if (!((_a = localConfig.value.dataSources) == null ? void 0 : _a.length)) return;
       dataSourceManager.value = createDataSource({
@@ -197,7 +283,36 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         emit("data-error", err);
       });
       if (!props.tableData || props.tableData.length === 0) {
-        dataSourceManager.value.fetch();
+        tableDataFetch();
+        if (localConfig.value.summaryConfig.enabled && localConfig.value.summaryConfig.mode == "all") {
+          const summaryAllDataManager = createDataSource({
+            http: ctx.$http,
+            initSearchData: searchData.value,
+            dataSources: localConfig.value.dataSources,
+            currentDataSourceId: localConfig.value.dataSourceId,
+            pagination: {
+              pageNo: 1,
+              pageSize: 0
+              // 获取全部数据
+            },
+            data: hiddenFormData.value,
+            fields: fieldsData.value,
+            sortRules: localConfig.value.sortRules,
+            templateId: localConfig.value.templateKey
+          });
+          const data = await summaryAllDataManager.fetch();
+          const summaryFields = localConfig.value.summaryConfig.summaryFields || [];
+          const allList = (data == null ? void 0 : data.list) || [];
+          const summaryResult = {};
+          summaryFields.forEach((fieldName) => {
+            const sum = allList.reduce((total, item) => {
+              const value = parseFloat(item[fieldName]);
+              return total + (isNaN(value) ? 0 : value);
+            }, 0);
+            summaryResult[fieldName] = sum;
+          });
+          allSummaryData.value = summaryResult;
+        }
       }
       loadFieldDataSources();
     };
@@ -329,14 +444,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const orderValue = order ? order.replace("ending", "") : "";
       if (dataSourceManager.value) {
         dataSourceManager.value.updateSort(property, orderValue);
-        dataSourceManager.value.fetch();
+        tableDataFetch();
       }
       emit("sort-change", { field: property, order: orderValue });
     };
     const handlePageChange = ({ pageNo, pageSize }) => {
       if (dataSourceManager.value) {
         dataSourceManager.value.updatePagination(pageNo, pageSize);
-        dataSourceManager.value.fetch();
+        tableDataFetch();
       }
       emit("page-change", { pageNo, pageSize });
     };
@@ -352,7 +467,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const handleFilterSearch = (filters) => {
       if (dataSourceManager.value) {
         dataSourceManager.value.updateParams(filters);
-        dataSourceManager.value.fetch();
+        tableDataFetch();
         clearSelection();
       } else {
         searchData.value = filters;
@@ -361,7 +476,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const handleFilterReset = () => {
       if (dataSourceManager.value) {
         dataSourceManager.value.clearParams();
-        dataSourceManager.value.fetch();
+        tableDataFetch();
         clearSelection();
       }
     };
@@ -392,7 +507,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             $table.clearFilter();
           }
         }
-        dataSourceManager.value.fetch();
+        tableDataFetch();
       }
     };
     const reset = () => {
@@ -407,9 +522,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           $table.clearSort();
         }
         dataSourceManager.value.clearSort();
-        dataSourceManager.value.fetch();
+        tableDataFetch();
       }
     };
+    async function tableDataFetch() {
+      await dataSourceManager.value.fetch();
+    }
     const exportConfig = reactive({
       modes: ["current", "selected", "all", "empty"],
       original: false
@@ -619,6 +737,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   "row-config": rowConfig.value,
                   "radio-config": unref(radioConfig),
                   "checkbox-config": unref(checkboxConfig),
+                  "show-footer": summaryConfig.value.enabled,
+                  "footer-data": footerData.value,
                   onSortChange: handleSortChange,
                   onCheckboxChange: handleCheckboxChange,
                   onCheckboxAll: handleCheckboxAll,
@@ -657,7 +777,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                     ];
                   }),
                   _: 3
-                }, 8, ["data", "auto-resize", "height", "export-config", "row-config", "radio-config", "checkbox-config"])
+                }, 8, ["data", "auto-resize", "height", "export-config", "row-config", "radio-config", "checkbox-config", "show-footer", "footer-data"])
               ]),
               isPagination.value ? (openBlock(), createBlock(Pagination, {
                 key: 2,
@@ -673,7 +793,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-03f3150c"]]);
+const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-aa3130aa"]]);
 export {
   _Table as default
 };

package/es/packages/vue/src/components/table/TableColumn.vue.mjs

@@ -399,7 +399,7 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1fac212e"]]);
+const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3e5372d4"]]);
 export {
   TableColumn as default
 };

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.3.21";
+const version = "5.4.2";
 const packageJson = {
   version
 };

package/lib/designer/src/components/ParamsConfig.vue2.js

@@ -6,7 +6,7 @@ require("../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                            */
 const vue = require("vue");
 const index$1 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
-const ValueSelector = require("./ValueSelector.vue2.js");
+const ValueSelector = require("./ValueSelector.vue.js");
 ;/* empty css                  */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../node_modules/element-plus/es/components/button/index.js");

package/lib/designer/src/components/ValueSelector.vue.js

@@ -0,0 +1,191 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const vue = require("vue");
+require("../../../node_modules/element-plus/es/index.js");
+const ValueSelectorPopover = require("./ValueSelectorPopover.vue2.js");
+const common = require("../packages/utils/common.js");
+;/* empty css                    */
+const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
+const index = require("../../../node_modules/element-plus/es/components/input-tag/index.js");
+const index$1 = require("../../../node_modules/element-plus/es/components/input/index.js");
+const _sfc_main = {
+  __name: "ValueSelector",
+  props: {
+    // modelValue 的格式：
+    // 单选：{ type: 'field', value: '字段ID' }
+    // 多选：[{ type: 'field', value: '字段ID1' }, { type: 'field', value: '字段ID2' }]
+    modelValue: {
+      default: () => null
+    },
+    placeholder: {
+      type: String,
+      default: "请输入或选择值"
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    size: {
+      type: String,
+      default: "small"
+    }
+    // // 可选的字段列表（从父组件传入）
+    // availableFields: {
+    //   type: Array,
+    //   default: () => [],
+    //   validator: (value) => Array.isArray(value),
+    // },
+  },
+  emits: ["update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const inputComponent = vue.computed(() => {
+      return props.multiple ? index.ElInputTag : index$1.ElInput;
+    });
+    const hiddenFieldsData = vue.computed(() => {
+      const editConfigData = common.getEditConfigData();
+      return (editConfigData == null ? void 0 : editConfigData.hiddenFields) || [];
+    });
+    const availableFields = vue.computed(() => {
+      const fields = common.getEditConfigDataFields() || [];
+      return fields.map((item) => ({
+        id: item.id,
+        label: item.label,
+        fieldName: item.fieldName,
+        fieldType: item.fieldType
+      }));
+    });
+    const displayText = vue.computed(() => {
+      if (!props.modelValue) return "";
+      if (!props.multiple && typeof props.modelValue === "object" && !Array.isArray(props.modelValue)) {
+        const val = props.modelValue;
+        if (val.label) return val.label;
+        const field = availableFields.value.find((f) => f.id === val.value);
+        return (field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || val.value;
+      } else if (!props.multiple && typeof props.modelValue === "string") {
+        return props.modelValue;
+      }
+      return "";
+    });
+    const tags = vue.computed({
+      get() {
+        if (!props.multiple || !Array.isArray(props.modelValue)) {
+          return [];
+        }
+        return props.modelValue.map((item) => {
+          if (item.label) return item.label;
+          const field = availableFields.value.find((f) => f.id === item.value);
+          return (field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || item.value;
+        }).filter(Boolean);
+      },
+      set(val) {
+        if (Array.isArray(props.modelValue)) {
+          const newModelValue = props.modelValue.filter((item) => {
+            const itemLabel = item.label || (() => {
+              const field = [
+                ...availableFields.value,
+                ...hiddenFieldsData.value
+              ].find((f) => f.id === item.value);
+              return (field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || item.value;
+            })();
+            return val.includes(itemLabel);
+          });
+          emit("update:modelValue", newModelValue);
+        }
+      }
+    });
+    const unifiedInputValue = vue.computed({
+      get() {
+        return props.multiple ? tags.value : displayText.value;
+      },
+      set(val) {
+        if (props.multiple && Array.isArray(val)) {
+          tags.value = val;
+        } else if (!props.multiple && typeof val === "string") {
+          emit("update:modelValue", val);
+        }
+      }
+    });
+    const handleConfirm = (selected) => {
+      let result = null;
+      if (selected.type === "field") {
+        const field = [...availableFields.value, ...hiddenFieldsData.value].find(
+          (f) => f.id === selected.value
+        );
+        result = {
+          label: `\${${(field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || selected.value}}`,
+          type: "field",
+          value: selected.value
+        };
+      } else if (selected.type === "userInfo") {
+        result = {
+          label: `\${用户信息: ${getUserInfoLabel(selected.value)}}`,
+          type: "userInfo",
+          value: selected.value
+        };
+      } else if (selected.type === "urlParam") {
+        result = {
+          label: `\${路由参数: ${selected.value}}`,
+          type: "urlParam",
+          value: selected.value
+        };
+      }
+      if (!result) return;
+      if (props.multiple) {
+        const currentValue = Array.isArray(props.modelValue) ? props.modelValue : [];
+        const exists = currentValue.some((item) => item.value === result.value);
+        if (!exists) {
+          emit("update:modelValue", [...currentValue, result]);
+        }
+      } else {
+        emit("update:modelValue", result);
+      }
+    };
+    const getUserInfoLabel = (key) => {
+      const labels = {
+        userCode: "用户编号",
+        userName: "用户名称",
+        roleCode: "角色编号",
+        roleName: "角色名称",
+        orgCode: "机构编号",
+        orgName: "机构名称"
+      };
+      return labels[key] || key;
+    };
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(inputComponent.value), {
+        modelValue: unifiedInputValue.value,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unifiedInputValue.value = $event),
+        placeholder: __props.placeholder,
+        disabled: __props.disabled,
+        readonly: __props.readOnly,
+        trigger: __props.multiple ? "Space" : void 0,
+        "collapse-tags": "",
+        "collapse-tags-tooltip": "",
+        "max-collapse-tags": 1,
+        class: "value-selector-input",
+        size: __props.size
+      }, {
+        suffix: vue.withCtx(() => [
+          vue.createVNode(ValueSelectorPopover.default, {
+            "available-fields": availableFields.value,
+            disabled: __props.disabled,
+            onConfirm: handleConfirm
+          }, null, 8, ["available-fields", "disabled"])
+        ]),
+        _: 1
+      }, 8, ["modelValue", "placeholder", "disabled", "readonly", "trigger", "size"]);
+    };
+  }
+};
+const ValueSelector = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e5b87efa"]]);
+exports.default = ValueSelector;

package/lib/designer/src/layout/aside/HiddenFieldDialog.vue.js

@@ -18,7 +18,7 @@ const index$2 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 const common = require("../../packages/utils/common.js");
 const index$5 = require("../../packages/form/aside/index.js");
 const index$6 = require("../../packages/table/aside/index.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 ;/* empty css                        */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../node_modules/element-plus/es/components/dialog/index.js");

package/lib/designer/src/packages/advancedFilter/ValueInput.vue2.js

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js");
 const vue = require("vue");
 const index = require("../../../../node_modules/@vueuse/core/dist/index.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 const index$1 = require("../../api/index.js");
 const common = require("../utils/common.js");
 const datasource = require("../utils/datasource.js");

package/lib/designer/src/packages/dataLinkage/index.vue.js

@@ -32,7 +32,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js
 ;/* empty css                                                              */
 ;/* empty css                                         */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
-;/* empty css                                  */
+;/* empty css                                   */
 require("../../axios/config.js");
 require("../../../../_virtual/FileSaver.min.js");
 require("../../../../_virtual/index.js");

package/lib/designer/src/packages/dialogGlobal/index.vue.js

@@ -81,7 +81,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js
 require("../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.js");
 ;/* empty css                                                              */
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 require("../../axios/config.js");
 ;/* empty css                                                              */
 ;/* empty css                                                                */

package/lib/designer/src/packages/form/property/approvalHistory.vue.js

@@ -13,7 +13,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 const vue = require("vue");
 const common = require("../../utils/common.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$2 = require("../../../../../node_modules/element-plus/es/components/input/index.js");

package/lib/designer/src/packages/form/property/subForm.vue.js

@@ -15,7 +15,7 @@ const vue = require("vue");
 const common = require("../../utils/common.js");
 const TemplateSelector = require("../../../components/TemplateSelector.vue.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$2 = require("../../../../../node_modules/element-plus/es/components/input/index.js");

package/lib/designer/src/packages/prod/index.vue.js

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/es/index.js");
 const vue = require("vue");
 const index$6 = require("../../../../node_modules/@element-plus/icons-vue/dist/index.js");
 const common = require("../utils/common.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 const index = require("../../api/index.js");
 ;/* empty css            */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");

package/lib/designer/src/packages/table/aside/index.js

@@ -12,7 +12,8 @@ const defaultProperty = {
   headerAlign: "center",
   align: "center",
   isOverflowWrap: true,
-  isShow: true
+  isShow: true,
+  canSort: true
 };
 const components = [
   {

package/lib/designer/src/packages/table/default.js

@@ -1,28 +1,28 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const defaultTableConfig = {
-  "fieldsData": [
+  fieldsData: [
     {
-      "fieldType": "text",
-      "label": "文本",
-      "fieldName": "fieldName",
-      "format": "number",
-      "hasDecimalPlaces": true,
-      "decimalPlaces": 2,
-      "optionStyle": "default",
-      "dateType": "date",
-      "widthMode": "auto",
-      "minWidth": 80,
-      "headerAlign": "center",
-      "align": "center",
-      "isShow": true,
-      "id": 1770347203793,
-      "type": "widgets"
+      fieldType: "text",
+      label: "文本",
+      fieldName: "fieldName",
+      format: "number",
+      hasDecimalPlaces: true,
+      decimalPlaces: 2,
+      optionStyle: "default",
+      dateType: "date",
+      widthMode: "auto",
+      minWidth: 80,
+      headerAlign: "center",
+      align: "center",
+      isShow: true,
+      id: 1770347203793,
+      type: "widgets"
     }
   ],
-  "showTitle": true,
-  "isOptBtns": true,
-  "optBtns": [
+  showTitle: true,
+  isOptBtns: true,
+  optBtns: [
     // {
     //     "id": 1770347228880,
     //     "label": "修改",
@@ -36,8 +36,8 @@ const defaultTableConfig = {
     //     "btnStyle": "default"
     // }
   ],
-  "customBtns": {
-    "left": [
+  customBtns: {
+    left: [
       // {
       //     "id": 1770347217788,
       //     "label": "新增",
@@ -46,40 +46,38 @@ const defaultTableConfig = {
       //     "btnStyle": "default"
       // }
     ],
-    "right": []
+    right: []
   },
-  "selectMode": "none",
-  "showIndex": false,
-  "heightMode": "auto",
-  "height": 500,
-  "editable": false,
-  "events": {},
-  "dataSourceId": "",
-  "sortRules": [],
-  "paginationConfig": {
-    "enabled": true,
-    "pageSize": 10,
-    "pageSizes": [
-      10,
-      20,
-      50,
-      100,
-      200,
-      500
-    ],
-    "layout": "full",
-    "background": true,
-    "size": "small"
+  selectMode: "none",
+  showIndex: false,
+  heightMode: "auto",
+  height: 500,
+  editable: false,
+  events: {},
+  dataSourceId: "",
+  sortRules: [],
+  paginationConfig: {
+    enabled: true,
+    pageSize: 10,
+    pageSizes: [10, 20, 50, 100, 200, 500],
+    layout: "full",
+    background: true,
+    size: "small"
+  },
+  mode: [],
+  dataSources: [],
+  dialogs: [],
+  queryConfig: {
+    enabled: true,
+    mode: "fixed",
+    columnCount: 4,
+    collapseRows: 2,
+    filterFields: []
   },
-  "mode": [],
-  "dataSources": [],
-  "dialogs": [],
-  "queryConfig": {
-    "enabled": true,
-    "mode": "fixed",
-    "columnCount": 4,
-    "collapseRows": 2,
-    "filterFields": []
+  summaryConfig: {
+    enabled: false,
+    mode: "current",
+    summaryFields: []
   }
 };
 const defaultCustomBtn = {

package/lib/designer/src/packages/table/headerBtn.vue.js

@@ -47,7 +47,7 @@ const index$1 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 ;/* empty css                                                              */
 require("../../store/index.js");
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 ;/* empty css                                 */
 ;/* empty css                                                            */
 ;/* empty css                                                               */