kouxiangtang 0.0.27-beta.1 → 0.0.27-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kouxiangtang",
   "private": false,
-  "version": "0.0.27-beta.1",
+  "version": "0.0.27-beta.2",
   "type": "module",
   "main": "./src/framework/index.js",
   "module": "./src/framework/index.js",

package/src/framework/DomainEdit.vue

@@ -67,13 +67,14 @@ const removable = ref(props.operations?.removable);
 async function editItem() {
   const formHook = props.settings.formHook;
   const formBtnVisible = props.settings.btnVisible;
+  const restRepeat = props.settings.restRepeat;
   const restApi = props.settings.rest;
 
   const { data } = await restApi.getOne({
     ...props.row,
     ...routeQuery,
   });
-  form.value = data;
+  form.value = { ...data, idempotentToken: await restRepeat() };
   if (formHook.setupUpdate) {
     form.value = formHook.setupUpdate(form.value);
   }
@@ -81,6 +82,7 @@ async function editItem() {
   if (formBtnVisible.showRemove) {
     removable.value = formBtnVisible.showRemove(form.value);
   }
+
   showEditor.value = true;
 }
 
@@ -102,22 +104,23 @@ function onSubmit(formData, callBack) {
       dataTableStore.fireUpdated();
       callBack();
     })
-    .catch(() => {
+    .catch(async () => {
+      const restRepeat = props.settings.restRepeat;
+      form.value = { ...form.value, idempotentToken: await restRepeat() };
       callBack();
     });
   return;
 }
 
 function onRemove() {
+  let formData = {
+    ...form.value,
+  };
   props.settings.rest
-    .remove({
-      ...props.row,
-      ...routeQuery,
-    })
+    .remove(formData)
     .then(() => {
       alert.show({ type: "success", message: "删除成功" });
       showEditor.value = false;
-      console.log(props.isDetail);
       if (props.isDetail) {
         const routeList = routeHistoryStore.history;
         routeList.forEach((item) => {
@@ -128,6 +131,10 @@ function onRemove() {
         });
       }
       dataTableStore.fireRemoved();
+    })
+    .catch(async () => {
+      const restRepeat = props.settings.restRepeat;
+      form.value = { ...form.value, idempotentToken: await restRepeat() };
     });
 }
 </script>

package/src/framework/DomainNew.vue

@@ -45,7 +45,7 @@ const creatable = computed(() => {
 
 async function newItem() {
   const formHook = props.settings.formHook;
-
+  const restRepeat = props.settings.restRepeat;
   const defaultValues = props.settings.fields.reduce((cum, current) => {
     cum[current.code] = current.default;
     return cum;
@@ -54,7 +54,7 @@ async function newItem() {
   if (formHook.setupCreate) {
     form.value = formHook.setupCreate(form.value);
   }
-
+  form.value = { ...form.value, idempotentToken: await restRepeat() };
   showEditor.value = true;
 }
 
@@ -77,7 +77,9 @@ function onSubmit(formData, callBack) {
       dataTableStore.fireCreated();
       callBack();
     })
-    .catch(() => {
+    .catch(async () => {
+      const restRepeat = props.settings.restRepeat;
+      form.value = { ...form.value, idempotentToken: await restRepeat() };
       callBack();
     });
 }

package/src/framework/PageActions.vue

@@ -11,6 +11,7 @@
     <el-button
       v-else
       :type="item.type"
+      :loading="isloading"
       :disabled="!item.enable && !hasSelectedData"
       @click="pageAction(item)"
     >
@@ -40,9 +41,15 @@ const pageActions = shallowRef([]);
 const hasSelectedData = computed(() => {
   return props.tableDataSelect?.data?.length > 0;
 });
+const isloading = ref(false);
 
 async function pageAction(item) {
-  await item.action(props.tableDataSelect);
+  isloading.value = true;
+  await item.action({
+    ...props.tableDataSelect,
+    idempotentToken: await props.settings.restRepeat(),
+  });
+  isloading.value = false;
   dataTableStore.fireUpdated();
 }
 

package/src/framework/RowActionFormEditor.vue

@@ -6,7 +6,7 @@
       v-model="showEditor"
       :title="props.text"
       :config="config"
-      :data="props.row"
+      :data="formData"
       width="600px"
       @submit="onFormSubmit"
     />
@@ -38,7 +38,12 @@ const props = defineProps({
     type: String,
     default: "primary",
   },
+  restRepeat: {
+    type: Function,
+    default: () => "",
+  },
 });
+const formData = ref(props.row);
 const showEditor = ref(false);
 const config = defineDomain("simple", {
   simple: true,
@@ -46,7 +51,8 @@ const config = defineDomain("simple", {
   fields: props.fields,
 });
 
-function show() {
+async function show() {
+  formData.value = { ...props.row, idempotentToken: await props.restRepeat() };
   showEditor.value = true;
 }
 

package/src/framework/RowActions.vue

@@ -9,6 +9,7 @@
       <el-button
         v-else
         :type="rowAction.type ? rowAction.type : 'primary'"
+        :loading="isloading"
         @click="triggerRowAction(rowAction, props.row)"
       >
         {{ rowAction.name }}
@@ -37,14 +38,21 @@ const props = defineProps({
   },
 });
 const rowActions = shallowRef([]);
+const isloading = ref(false);
 
 async function triggerRowAction(rowAction, row) {
+  isloading.value = true;
   if (rowAction.path) {
+    isloading.value = false;
     routeToRowLinkPath(rowAction, row);
     return;
   }
-
-  await rowAction.action({ ...row, ...props.query });
+  await rowAction.action({
+    ...row,
+    ...props.query,
+    idempotentToken: await props.settings.restRepeat(),
+  });
+  isloading.value = false;
   dataTableStore.fireUpdated();
 }
 

package/src/framework/config-loader.js

@@ -10,9 +10,13 @@ let domainConfigs = {};
 export function setupAppConfig(_config) {
   config = { ...config, ..._config };
   domainConfigs = _config.domainConfigs;
+  console.log("setupAppConfig");
+  console.log(config);
 }
 
 export function setupDomainConfigLoader(domainConfigLoader) {
+  console.log("setupDomainConfigLoader");
+  console.log(domainConfigs);
   Object.keys(domainConfigs).forEach((side) => {
     const sideDomainConfigs = domainConfigs[side];
 
@@ -24,10 +28,20 @@ export function setupDomainConfigLoader(domainConfigLoader) {
 }
 
 export function getConfig() {
+  console.log("getConfig");
+  console.log(config);
+  return config;
+}
+
+export function getAppConfig() {
+  console.log("getAppConfig");
+  console.log(config);
   return config;
 }
 
 export function getDomainConfigs() {
+  console.log("getDomainConfigs");
+  console.log(domainConfigs);
   return domainConfigs;
 }
 

package/src/framework/domain-config.js

@@ -21,7 +21,6 @@ class DomainConfig {
     this.showSubmit = _config.showSubmit || true;
     this.removeConfirm = _config.removeConfirm;
     this.showCreate = this.setupShowCreate(_config.showCreate);
-
     this.hasMany = rawConfig.hasMany || [];
     this.hasOne = rawConfig.hasOne || [];
     this.formatName = this.createFormatName(rawConfig.formatName);
@@ -31,6 +30,7 @@ class DomainConfig {
     this.actionsWidth = rawConfig.actionsWidth || 150;
     this.formHook = rawConfig.form || {};
     this.filterHook = rawConfig.filterForm || {};
+    this.restRepeat = this.restRepeat(rawConfig.restRepeat);
     this.btnVisible = rawConfig.btnVisible || {};
     this.operations = this.setupOperations();
   }
@@ -119,6 +119,13 @@ class DomainConfig {
 
     return () => true;
   }
+  restRepeat(restRepeat) {
+    if (typeof restRepeat == "function") {
+      return (query) => restRepeat();
+    }
+
+    return () => "";
+  }
 
   setupOperations(query) {
     const ops = {

package/src/framework/field/editor/FieldDisplay.vue

@@ -17,7 +17,7 @@ const props = defineProps({
 .editor-field {
   width: 100%;
 
-  img {
+  :deep(img) {
     width: 100%;
     max-width: 100%;
   }

package/src/framework/field/tree-select/FieldEditor.vue

@@ -8,7 +8,7 @@
     :multiple="props.field.multiple"
     :render-after-expand="false"
     show-checkbox
-    check-on-click-node
+    :check-on-click-node="false"
     :expand-on-click-node="false"
     default-expand-all
     highlight-current
@@ -17,7 +17,7 @@
     remote
     filterable
     :remote-method="remoteSearch"
-    @change="change"
+    @check="change"
   />
 </template>
 

package/src/framework/rest-client.js

@@ -66,7 +66,7 @@ export class Client {
       return;
     }
 
-    return http.remove(`${this.side}/${this.resources}/${data.id}`);
+    return http.remove(`${this.side}/${this.resources}/${data.id}`, data);
   }
 
   _restore(data) {
@@ -75,7 +75,7 @@ export class Client {
       return;
     }
 
-    return http.put(`${this.side}/${this.resources}/${data.id}/restore`);
+    return http.put(`${this.side}/${this.resources}/${data.id}/restore`, data);
   }
   _enable(data) {
     if (!this.operations.includes(REMOVE)) {
@@ -108,7 +108,6 @@ export class ReadOnlyClient {
     return http.get(`${this.side}/${this.resources}/${data.id}`);
   }
 }
-
 export default {
   Client,
   ReadOnlyClient,