[feature]{CustomFunction}: 表单设计器加入远端方法

src/components/CrudTable/CrudTable.vue

@@ -56,6 +56,7 @@
     @afterSave="Refresh"
     :jsonData="jsonData"
     :entity.sync="models"
+    :remoteFunctions="remoteFunctions"
     >
     </GenerateFormDialog>
   </div>

src/components/CrudTable/components/GenerateFormDialog.vue

@@ -20,6 +20,7 @@
         :value="formValues"
         :entity.sync="models"
         :disabled="disabled"
+        :remote="remoteFunctions"
       />
       <div slot="footer" class="dialog-footer">
         <template v-if="dialogStatus === 'detail'">
@@ -82,7 +83,10 @@ export default {
       type: Object,
       default: () => ({}),
     },
-
+    remoteFunctions: {
+      type: Object,
+      default: () => ({}),
+    },
   },
 
   methods: {

src/components/CrudTable/components/props.js

@@ -41,4 +41,8 @@ export default {
     type: Object,
     default: () => ({}),
   },
+  remoteFunctions: {
+    type: Object,
+    default: () => ({}),
+  },
 };

src/components/FormDesigner/GenerateFormItem.vue

@@ -219,15 +219,16 @@ export default {
   created() {
     if (this.widget.options.remote && this.widget.options.remoteOptions) {
       if (this.widget.options.remoteFunc !== '') {
-        this.axios({
-          url: this.widget.options.remoteFunc,
-          method: 'post',
-        }).then((res) => {
-          this.widget.options.remoteOptions = res.data.map(item => ({
-            value: item[this.widget.options.props.value],
-            label: item[this.widget.options.props.label],
-          }))
-        })
+        const remoteReq = this.remote[this.widget.options.remoteFunc]
+        if (remoteReq) {
+          remoteReq().then((res) => {
+            const response = res.data.list === null ? res.data : res.data.list
+            this.widget.options.remoteOptions = response.map(item => ({
+              value: item[this.widget.options.props.value],
+              label: item[this.widget.options.props.label],
+            }))
+          })
+        }
       } else {
         this.axios({
           url: '/dict/getDictByKey',

src/components/FormDesigner/WidgetConfig.vue

@@ -116,10 +116,11 @@
           v-model="data.options.remote"
           size="mini"
           style="margin-bottom:10px;">
-          <el-radio-button :label="false">静态数据</el-radio-button>
-          <el-radio-button :label="true">远端数据</el-radio-button>
+          <el-radio-button label="dict">数据字典</el-radio-button>
+          <el-radio-button label="static">静态数据</el-radio-button>
+          <el-radio-button label="custom">自定义方法</el-radio-button>
         </el-radio-group>
-        <template v-if="data.options.remote">
+        <template v-if="data.options.remote=='custom'">
           <div>
             <el-input
               v-model="data.options.remoteFunc"
@@ -139,8 +140,10 @@
               style="">
               <template slot="prepend">标签</template>
             </el-input>
-
-            <el-select
+          </div>
+        </template>
+        <template v-else-if="data.options.remote=='dict'">
+           <el-select
               v-model="data.options.dictID"
               filterable>
                 <el-option
@@ -150,7 +153,6 @@
                 :value="item.id">
                 </el-option>
             </el-select>
-          </div>
         </template>
         <template v-else>
           <template v-if="data.type=='radio' || (data.type=='select'&&!data.options.multiple)">

src/views/SIX/Notice.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <crud-table
+    <CrudTable
       tableName="six_notice"
       toolbarButton="add,clear,search"
       handleButton="edit,delete"
-    ></crud-table>
+    ></CrudTable>
   </div>
 </template>
 <script>

src/views/SIX/RewardOrPunish.vue

@@ -1,14 +1,25 @@
 <template>
   <div>
-    <crud-table
+    <CrudTable
       tableName="six_rewardorpunish"
       toolbarButton="add,clear,search"
       handleButton="edit,delete"
-    ></crud-table>
+    ></CrudTable>
   </div>
 </template>
 <script>
+import crud from '@/api/Public/crud.js'
+
 export default {
   name: 'RewardOrPunish',
+  data() {
+    return {
+      remoteFunctions: {
+        funcGetStaff() {
+          return crud('list', 'six_staff', { pageSize: 100 })
+        },
+      },
+    }
+  },
 };
 </script>

src/views/SIX/Salary.vue

@@ -1,14 +1,26 @@
 <template>
   <div>
-    <crud-table
+    <CrudTable
       tableName="six_salary"
       toolbarButton="add,clear,search"
       handleButton="edit,delete"
-    ></crud-table>
+      :remoteFunctions="remoteFunctions"
+    ></CrudTable>
   </div>
 </template>
 <script>
+import crud from '@/api/Public/crud.js'
+
 export default {
   name: 'Salary',
+  data() {
+    return {
+      remoteFunctions: {
+        funcGetStaff() {
+          return crud('list', 'six_staff', { pageSize: 100 })
+        },
+      },
+    }
+  },
 };
 </script>

src/views/SIX/Staff.vue

@@ -1,14 +1,24 @@
 <template>
   <div>
-    <crud-table
+    <CrudTable
       tableName="six_staff"
       toolbarButton="add,clear,search"
       handleButton="edit,delete"
-    ></crud-table>
+      :remoteFunctinos="remoteFunctinos"
+    ></CrudTable>
   </div>
 </template>
 <script>
 export default {
   name: 'Staff',
+  data() {
+    return {
+      remoteFunctinos: {
+        funcGetStaff() {
+          return this.crud('list', 'six_staff', { pageSize: 100 })
+        },
+      },
+    }
+  },
 };
 </script>

src/views/system/role.vue

@@ -124,14 +124,12 @@ export default {
     this.fetchData(this.listQuery);
     const arr = [...asyncRouterMap]
     arr.filter((item) => {
-      console.log(item)
       if (item.children) {
         const obj = item.children;
         obj.forEach((k) => {
           k.title = k.meta.title;
         });
       }
-
       if (item.hidden) {
         return false;
       }